summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-08-26 18:38:42 +0100
committerIain Merrick <husky@google.com>2010-08-26 18:38:42 +0100
commit664ef7f459bd32d4a01255f64dcd963cd5c7b67d (patch)
treedf97acda1a68df44e9ebb0071e02e2e6c11aaca1 /WebKit
parenta3ba65729b8a9815a313ca3e4333e7e047b9b79d (diff)
downloadexternal_webkit-664ef7f459bd32d4a01255f64dcd963cd5c7b67d.zip
external_webkit-664ef7f459bd32d4a01255f64dcd963cd5c7b67d.tar.gz
external_webkit-664ef7f459bd32d4a01255f64dcd963cd5c7b67d.tar.bz2
Create HttpAuthHandlerFactory to fix HTTP auth crashes.
We still need to hook in the necessary callbacks to present the user with a login prompt. Change-Id: Id4ccb8209d2ffdfcc35f9104a2e448ed552e6390
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/WebCoreSupport/WebRequestContext.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/WebRequestContext.cpp b/WebKit/android/WebCoreSupport/WebRequestContext.cpp
index 1b7a5ee..9a8c9a0 100644
--- a/WebKit/android/WebCoreSupport/WebRequestContext.cpp
+++ b/WebKit/android/WebCoreSupport/WebRequestContext.cpp
@@ -35,6 +35,7 @@
#include <net/base/ssl_config_service.h>
#include <net/http/http_cache.h>
#include <net/http/http_network_layer.h>
+#include <net/http/http_auth_handler_factory.h>
#include <net/proxy/proxy_service.h>
#include <wtf/text/CString.h>
@@ -117,7 +118,7 @@ WebRequestContext* WebRequestContext::GetAndroidContextForPath(const char* cooki
scoped_refptr<base::MessageLoopProxy> cacheMessageLoopProxy = base::MessageLoopProxy::CreateForCurrentThread();
// Todo: check if the context takes ownership of the cache
net::HttpCache::DefaultBackend* defaultBackend = new net::HttpCache::DefaultBackend(net::DISK_CACHE, cachePath, 20 * 1024 * 1024, cacheMessageLoopProxy);
- androidContext->http_transaction_factory_ = new net::HttpCache(androidContext->host_resolver(), net::ProxyService::CreateNull(), net::SSLConfigService::CreateSystemSSLConfigService(), 0, 0, 0, defaultBackend);
+ androidContext->http_transaction_factory_ = new net::HttpCache(androidContext->host_resolver(), net::ProxyService::CreateNull(), net::SSLConfigService::CreateSystemSSLConfigService(), net::HttpAuthHandlerFactory::CreateDefault(), 0, 0, defaultBackend);
scoped_refptr<SQLitePersistentCookieStore> cookieDb = new SQLitePersistentCookieStore(cookiePath);