Diff
Modified: trunk/Source/WebKit2/ChangeLog (160354 => 160355)
--- trunk/Source/WebKit2/ChangeLog 2013-12-10 10:19:06 UTC (rev 160354)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-10 12:21:03 UTC (rev 160355)
@@ -1,3 +1,29 @@
+2013-12-10 Brian Holt <brian.h...@samsung.com>
+
+ [WK2][SOUP] initialise the Network Process with ignoreTLSErrors
+ https://bugs.webkit.org/show_bug.cgi?id=125490
+
+ ResourceHandleSoup in the Network Process and is not initialised with
+ a policy on ignoring TLS errors. This simply requires that the
+ appropriate message is created for the Network Process and the
+ parameter created for initialisation.
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+ (WebKit::NetworkProcess::setIgnoreTLSErrors):
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::platformInitializeWebProcess):
+ * UIProcess/soup/WebContextSoup.cpp:
+ (WebKit::WebContext::platformInitializeNetworkProcess):
+
2013-12-09 Anders Carlsson <ander...@apple.com>
Begin working on a UserData class intended to replace UserMessageCoders
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (160354 => 160355)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2013-12-10 10:19:06 UTC (rev 160354)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2013-12-10 12:21:03 UTC (rev 160355)
@@ -108,6 +108,10 @@
void getNetworkProcessStatistics(uint64_t callbackID);
void clearCacheForAllOrigins(uint32_t cachesToClear);
+#if USE(SOUP)
+ void setIgnoreTLSErrors(bool);
+#endif
+
// Platform Helpers
void platformSetCacheModel(CacheModel);
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (160354 => 160355)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2013-12-10 10:19:06 UTC (rev 160354)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2013-12-10 12:21:03 UTC (rev 160355)
@@ -29,6 +29,10 @@
# Creates a connection for communication with a WebProcess
CreateNetworkConnectionToWebProcess()
+#if USE(SOUP)
+ SetIgnoreTLSErrors(bool ignoreTLSErrors)
+#endif
+
EnsurePrivateBrowsingSession()
DestroyPrivateBrowsingSession()
Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (160354 => 160355)
--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2013-12-10 10:19:06 UTC (rev 160354)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2013-12-10 12:21:03 UTC (rev 160355)
@@ -78,6 +78,8 @@
GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(parameters.diskCacheDirectory.utf8().data(), SOUP_CACHE_SINGLE_USER));
soup_session_add_feature(WebCore::ResourceHandle::defaultSession(), SOUP_SESSION_FEATURE(soupCache.get()));
soup_cache_load(soupCache.get());
+
+ setIgnoreTLSErrors(parameters.ignoreTLSErrors);
}
void NetworkProcess::platformSetCacheModel(CacheModel cacheModel)
@@ -104,6 +106,11 @@
soup_cache_set_max_size(cache, urlCacheDiskCapacity);
}
+void NetworkProcess::setIgnoreTLSErrors(bool ignoreTLSErrors)
+{
+ ResourceHandle::setIgnoreSSLErrors(ignoreTLSErrors);
+}
+
void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String&)
{
notImplemented();
Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (160354 => 160355)
--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2013-12-10 10:19:06 UTC (rev 160354)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2013-12-10 12:21:03 UTC (rev 160355)
@@ -54,6 +54,9 @@
encoder << httpProxy;
encoder << httpsProxy;
#endif
+#if USE(SOUP)
+ encoder << ignoreTLSErrors;
+#endif
}
bool NetworkProcessCreationParameters::decode(CoreIPC::ArgumentDecoder& decoder, NetworkProcessCreationParameters& result)
@@ -87,6 +90,11 @@
return false;
#endif
+#if USE(SOUP)
+ if (!decoder.decode(result.ignoreTLSErrors))
+ return false;
+#endif
+
return true;
}
Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (160354 => 160355)
--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2013-12-10 10:19:06 UTC (rev 160354)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2013-12-10 12:21:03 UTC (rev 160355)
@@ -67,6 +67,10 @@
String httpProxy;
String httpsProxy;
#endif
+
+#if USE(SOUP)
+ bool ignoreTLSErrors;
+#endif
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (160354 => 160355)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2013-12-10 10:19:06 UTC (rev 160354)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2013-12-10 12:21:03 UTC (rev 160355)
@@ -97,10 +97,11 @@
parameters.urlSchemesRegistered = supplement<WebSoupRequestManagerProxy>()->registeredURISchemes();
supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
- parameters.ignoreTLSErrors = m_ignoreTLSErrors;
parameters.shouldTrackVisitedLinks = true;
#if ENABLE(NETWORK_PROCESS)
parameters.usesNetworkProcess = true;
+#else
+ parameters.ignoreTLSErrors = m_ignoreTLSErrors;
#endif
}
Modified: trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp (160354 => 160355)
--- trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp 2013-12-10 10:19:06 UTC (rev 160354)
+++ trunk/Source/WebKit2/UIProcess/soup/WebContextSoup.cpp 2013-12-10 12:21:03 UTC (rev 160355)
@@ -31,8 +31,9 @@
namespace WebKit {
-void WebContext::platformInitializeNetworkProcess(NetworkProcessCreationParameters&)
+void WebContext::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
{
+ parameters.ignoreTLSErrors = m_ignoreTLSErrors;
}
}
