Changeset 138273 in webkit
- Timestamp:
- Dec 20, 2012 10:42:13 AM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 25 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r138270 r138273 1 2012-12-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Add API to set a TLS errors policy to WebKit2 GTK+ API 4 https://bugs.webkit.org/show_bug.cgi?id=104482 5 6 Reviewed by Martin Robinson. 7 8 * platform/network/soup/ResourceError.h: 9 (WebCore::ResourceError::setTLSErrors): Set the TLS error flags. 10 (WebCore::ResourceError::setCertificate): Set the certificate. 11 * platform/network/soup/ResourceErrorSoup.cpp: 12 (WebCore::ResourceError::tlsError): Set the given TLS errors and 13 certificate to the ResourceError. 14 (WebCore::ResourceError::platformCopy): Copy also the TLS errors 15 and the certificate. 16 (WebCore::ResourceError::platformCompare): Compare also the TLS 17 errors. 18 1 19 2012-12-20 Antoine Quint <graouts@apple.com> 2 20 -
trunk/Source/WebCore/platform/network/soup/ResourceError.h
r132286 r138273 57 57 58 58 unsigned tlsErrors() const { return m_tlsErrors; } 59 void setTLSErrors(unsigned tlsErrors) { m_tlsErrors = tlsErrors; } 59 60 GTlsCertificate* certificate() const { return m_certificate.get(); } 61 void setCertificate(GTlsCertificate* certificate) { m_certificate = certificate; } 60 62 61 63 private: 64 void platformCopy(ResourceError&) const; 65 static bool platformCompare(const ResourceError& a, const ResourceError& b); 66 62 67 unsigned m_tlsErrors; 63 68 GRefPtr<GTlsCertificate> m_certificate; -
trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp
r132286 r138273 70 70 } 71 71 72 ResourceError ResourceError::tlsError(SoupRequest* request, unsigned /* tlsErrors */, GTlsCertificate*)72 ResourceError ResourceError::tlsError(SoupRequest* request, unsigned tlsErrors, GTlsCertificate* certificate) 73 73 { 74 return ResourceError(g_quark_to_string(SOUP_HTTP_ERROR), SOUP_STATUS_SSL_FAILED,74 ResourceError resourceError(g_quark_to_string(SOUP_HTTP_ERROR), SOUP_STATUS_SSL_FAILED, 75 75 failingURI(request), unacceptableTLSCertificate()); 76 resourceError.setTLSErrors(tlsErrors); 77 resourceError.setCertificate(certificate); 78 return resourceError; 76 79 } 77 80 … … 89 92 } 90 93 94 void ResourceError::platformCopy(ResourceError& errorCopy) const 95 { 96 errorCopy.m_certificate = m_certificate; 97 errorCopy.m_tlsErrors = m_tlsErrors; 98 } 99 100 bool ResourceError::platformCompare(const ResourceError& a, const ResourceError& b) 101 { 102 return a.tlsErrors() == b.tlsErrors(); 103 } 104 91 105 } // namespace WebCore -
trunk/Source/WebKit2/ChangeLog
r138248 r138273 1 2012-12-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Add API to set a TLS errors policy to WebKit2 GTK+ API 4 https://bugs.webkit.org/show_bug.cgi?id=104482 5 6 Reviewed by Martin Robinson. 7 8 Add an emum for TLS errors policy with values IGNORE and FAIL and 9 API to WebKitWebContext to set/get the policy. 10 11 * Shared/WebProcessCreationParameters.cpp: 12 (WebKit::WebProcessCreationParameters::encode): Encode ignoreTLSErrors. 13 (WebKit::WebProcessCreationParameters::decode): Decode ignoreTLSErrors. 14 * Shared/WebProcessCreationParameters.h: 15 (WebProcessCreationParameters): Add ignoreTLSErrors when building 16 with soup network backend. 17 * Shared/soup/PlatformCertificateInfo.cpp: 18 (WebKit::PlatformCertificateInfo::PlatformCertificateInfo): Add a 19 constructor that receives a ResourceError. 20 * Shared/soup/PlatformCertificateInfo.h: 21 * Shared/soup/WebCoreArgumentCodersSoup.cpp: 22 (CoreIPC::::encodePlatformData): Encode the 23 PlatformCertificateInfo as part for the ResourceError. 24 (CoreIPC::::decodePlatformData): Decode the 25 PlatformCertificateInfo and set certificate and TLS errors in the 26 ResourceError. 27 * UIProcess/API/gtk/WebKitLoaderClient.cpp: 28 (didFailProvisionalLoadWithErrorForFrame): Call 29 webkitWebViewLoadFailedWithTLSErrors() if the load failed due to 30 TLS errors. 31 * UIProcess/API/gtk/WebKitWebContext.cpp: 32 (_WebKitWebContextPrivate): Add tlsErrorsPolicy member. 33 (createDefaultWebContext): Initiales tlsErrorsPolicy. 34 (webkit_web_context_set_tls_errors_policy): Set the TLS errors 35 policy notify WebContext to ignore TLS errors or not. 36 (webkit_web_context_get_tls_errors_policy): Return the current TLS 37 errors policy. 38 * UIProcess/API/gtk/WebKitWebContext.h: 39 * UIProcess/API/gtk/WebKitWebView.cpp: 40 (webkitWebViewLoadFailedWithTLSErrors): Finish the load with an 41 error if the TLS errors policy is FAIL. 42 * UIProcess/API/gtk/WebKitWebViewPrivate.h: 43 * UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new symbols. 44 * UIProcess/API/gtk/tests/TestSSL.cpp: 45 (testTLSErrorsPolicy): 46 (beforeAll): 47 * UIProcess/WebContext.cpp: 48 (WebKit::WebContext::WebContext): Initialize m_ignoreTLSErrors. 49 * UIProcess/WebContext.h: 50 (WebContext): Add m_ignoreTLSErrors member. 51 (WebKit::WebContext::ignoreTLSErrors): Return m_ignoreTLSErrors. 52 * UIProcess/efl/WebContextEfl.cpp: 53 (WebKit::WebContext::platformInitializeWebProcess): Set 54 ignoreTLSErrors parameter. 55 (WebKit::WebContext::setIgnoreTLSErrors): Send SetIgnoreTLSErrors 56 message to the web process. 57 * UIProcess/gtk/WebContextGtk.cpp: 58 (WebKit::WebContext::platformInitializeWebProcess): Set 59 ignoreTLSErrors parameter. 60 (WebKit::WebContext::setIgnoreTLSErrors): Send SetIgnoreTLSErrors 61 message to the web process. 62 (WebKit): 63 * WebProcess/WebProcess.h: 64 * WebProcess/WebProcess.messages.in: 65 * WebProcess/efl/WebProcessMainEfl.cpp: 66 (WebKit::WebProcessMainEfl): Remove the call to 67 ResourceHandle::setIgnoreSSLErrors(). 68 * WebProcess/gtk/WebProcessMainGtk.cpp: 69 (WebKit::WebProcessMainGtk): Remove the call to 70 ResourceHandle::setIgnoreSSLErrors(). 71 * WebProcess/soup/WebProcessSoup.cpp: 72 (WebKit::WebProcess::platformInitializeWebProcess): 73 (WebKit::WebProcess::setIgnoreTLSErrors): Call 74 ResourceHandle::setIgnoreSSLErrors(). 75 (WebKit): 76 1 77 2012-12-20 Dominik Röttsches <dominik.rottsches@intel.com> 2 78 -
trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
r137432 r138273 82 82 encoder << cookiePersistentStorageType; 83 83 encoder.encodeEnum(cookieAcceptPolicy); 84 encoder << ignoreTLSErrors; 84 85 #endif 85 86 encoder.encodeEnum(cacheModel); … … 180 181 if (!decoder->decode(parameters.cookiePersistentStorageType)) 181 182 return false; 182 if (!decoder->decode(parameters.cookieAcceptPolicy)) 183 if (!decoder->decodeEnum(parameters.cookieAcceptPolicy)) 184 return false; 185 if (!decoder->decode(parameters.ignoreTLSErrors)) 183 186 return false; 184 187 #endif -
trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h
r137432 r138273 85 85 uint32_t cookiePersistentStorageType; 86 86 HTTPCookieAcceptPolicy cookieAcceptPolicy; 87 bool ignoreTLSErrors; 87 88 #endif 88 89 -
trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.cpp
r132361 r138273 30 30 #include "ArgumentEncoder.h" 31 31 #include "DataReference.h" 32 #include <WebCore/ResourceError.h> 32 33 #include <WebCore/ResourceResponse.h> 33 34 #include <libsoup/soup.h> … … 45 46 : m_certificate(response.soupMessageCertificate()) 46 47 , m_tlsErrors(response.soupMessageTLSErrors()) 48 { 49 } 50 51 PlatformCertificateInfo::PlatformCertificateInfo(const ResourceError& resourceError) 52 : m_certificate(resourceError.certificate()) 53 , m_tlsErrors(static_cast<GTlsCertificateFlags>(resourceError.tlsErrors())) 47 54 { 48 55 } -
trunk/Source/WebKit2/Shared/soup/PlatformCertificateInfo.h
r132361 r138273 37 37 38 38 namespace WebCore { 39 class ResourceError; 39 40 class ResourceResponse; 40 41 } … … 46 47 PlatformCertificateInfo(); 47 48 explicit PlatformCertificateInfo(const WebCore::ResourceResponse&); 49 explicit PlatformCertificateInfo(const WebCore::ResourceError&); 48 50 ~PlatformCertificateInfo(); 49 51 -
trunk/Source/WebKit2/Shared/soup/WebCoreArgumentCodersSoup.cpp
r133075 r138273 28 28 #include "WebCoreArgumentCoders.h" 29 29 30 #include "PlatformCertificateInfo.h" 30 31 #include <WebCore/ResourceError.h> 31 32 #include <WebCore/ResourceRequest.h> … … 34 35 35 36 using namespace WebCore; 37 using namespace WebKit; 36 38 37 39 namespace CoreIPC { … … 67 69 68 70 69 void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& , const ResourceError&)71 void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError) 70 72 { 73 encoder << PlatformCertificateInfo(resourceError); 71 74 } 72 75 73 bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder* , ResourceError&)76 bool ArgumentCoder<ResourceError>::decodePlatformData(ArgumentDecoder* decoder, ResourceError& resourceError) 74 77 { 78 PlatformCertificateInfo certificateInfo; 79 if (!decoder->decode(certificateInfo)) 80 return false; 81 82 resourceError.setCertificate(certificateInfo.certificate()); 83 resourceError.setTLSErrors(certificateInfo.tlsErrors()); 75 84 return true; 76 85 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp
r137450 r138273 58 58 resourceError.errorCode(), 59 59 resourceError.localizedDescription().utf8().data())); 60 webkitWebViewLoadFailed(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_STARTED, 61 resourceError.failingURL().utf8().data(), webError.get()); 60 if (resourceError.tlsErrors()) { 61 webkitWebViewLoadFailedWithTLSErrors(WEBKIT_WEB_VIEW(clientInfo), resourceError.failingURL().utf8().data(), webError.get(), 62 static_cast<GTlsCertificateFlags>(resourceError.tlsErrors()), resourceError.certificate()); 63 } else 64 webkitWebViewLoadFailed(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_STARTED, resourceError.failingURL().utf8().data(), webError.get()); 62 65 } 63 66 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
r137469 r138273 137 137 #endif 138 138 CString faviconDatabaseDirectory; 139 WebKitTLSErrorsPolicy tlsErrorsPolicy; 139 140 }; 140 141 … … 172 173 priv->requestManager = webContext->priv->context->soupRequestManagerProxy(); 173 174 priv->context->setCacheModel(CacheModelPrimaryWebBrowser); 175 priv->tlsErrorsPolicy = WEBKIT_TLS_ERRORS_POLICY_IGNORE; 174 176 175 177 attachDownloadClientToContext(webContext.get()); … … 695 697 } 696 698 699 /** 700 * webkit_web_context_set_tls_errors_policy: 701 * @context: a #WebKitWebContext 702 * @policy: a #WebKitTLSErrorsPolicy 703 * 704 * Set the TLS errors policy of @context as @policy 705 */ 706 void webkit_web_context_set_tls_errors_policy(WebKitWebContext* context, WebKitTLSErrorsPolicy policy) 707 { 708 g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context)); 709 710 if (context->priv->tlsErrorsPolicy == policy) 711 return; 712 713 context->priv->tlsErrorsPolicy = policy; 714 bool ignoreTLSErrors = policy == WEBKIT_TLS_ERRORS_POLICY_IGNORE; 715 if (context->priv->context->ignoreTLSErrors() != ignoreTLSErrors) 716 context->priv->context->setIgnoreTLSErrors(ignoreTLSErrors); 717 } 718 719 /** 720 * webkit_web_context_get_tls_errors_policy: 721 * @context: a #WebKitWebContext 722 * 723 * Get the TLS errors policy of @context 724 * 725 * Returns: a #WebKitTLSErrorsPolicy 726 */ 727 WebKitTLSErrorsPolicy webkit_web_context_get_tls_errors_policy(WebKitWebContext* context) 728 { 729 g_return_val_if_fail(WEBKIT_IS_WEB_CONTEXT(context), WEBKIT_TLS_ERRORS_POLICY_IGNORE); 730 731 return context->priv->tlsErrorsPolicy; 732 } 733 697 734 WebKitDownload* webkitWebContextGetOrCreateDownload(DownloadProxy* downloadProxy) 698 735 { -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h
r129906 r138273 61 61 WEBKIT_CACHE_MODEL_DOCUMENT_BROWSER 62 62 } WebKitCacheModel; 63 64 /** 65 * WebKitTLSErrorsPolicy: 66 * @WEBKIT_TLS_ERRORS_POLICY_IGNORE: Ignore TLS errors. 67 * @WEBKIT_TLS_ERRORS_POLICY_FAIL: TLS errors make the load to finish with an error. 68 * 69 * Enum values used to denote the TLS errors policy. 70 */ 71 typedef enum { 72 WEBKIT_TLS_ERRORS_POLICY_IGNORE, 73 WEBKIT_TLS_ERRORS_POLICY_FAIL 74 } WebKitTLSErrorsPolicy; 63 75 64 76 /** … … 166 178 const gchar * const *languages); 167 179 180 WEBKIT_API void 181 webkit_web_context_set_tls_errors_policy (WebKitWebContext *context, 182 WebKitTLSErrorsPolicy policy); 183 184 WEBKIT_API WebKitTLSErrorsPolicy 185 webkit_web_context_get_tls_errors_policy (WebKitWebContext *context); 186 168 187 G_END_DECLS 169 188 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
r137748 r138273 1364 1364 gboolean returnValue; 1365 1365 g_signal_emit(webView, signals[LOAD_FAILED], 0, loadEvent, failingURI, error, &returnValue); 1366 g_signal_emit(webView, signals[LOAD_CHANGED], 0, WEBKIT_LOAD_FINISHED); 1367 } 1368 1369 void webkitWebViewLoadFailedWithTLSErrors(WebKitWebView* webView, const char* failingURI, GError *error, GTlsCertificateFlags tlsErrors, GTlsCertificate* certificate) 1370 { 1371 webkitWebViewSetIsLoading(webView, false); 1372 1373 WebKitTLSErrorsPolicy tlsErrorsPolicy = webkit_web_context_get_tls_errors_policy(webView->priv->context); 1374 if (tlsErrorsPolicy == WEBKIT_TLS_ERRORS_POLICY_FAIL) { 1375 webkitWebViewLoadFailed(webView, WEBKIT_LOAD_STARTED, failingURI, error); 1376 return; 1377 } 1378 1366 1379 g_signal_emit(webView, signals[LOAD_CHANGED], 0, WEBKIT_LOAD_FINISHED); 1367 1380 } -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h
r137450 r138273 33 33 void webkitWebViewLoadChanged(WebKitWebView*, WebKitLoadEvent); 34 34 void webkitWebViewLoadFailed(WebKitWebView*, WebKitLoadEvent, const char* failingURI, GError*); 35 void webkitWebViewLoadFailedWithTLSErrors(WebKitWebView*, const char* failingURI, GError *, GTlsCertificateFlags, GTlsCertificate*); 35 36 void webkitWebViewSetEstimatedLoadProgress(WebKitWebView*, double estimatedLoadProgress); 36 37 void webkitWebViewSetTitle(WebKitWebView*, const CString&); -
trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt
r137450 r138273 25 25 WebKitWebContext 26 26 WebKitCacheModel 27 WebKitTLSErrorsPolicy 27 28 webkit_web_context_get_default 28 29 webkit_web_context_get_cache_model … … 43 44 webkit_web_context_set_spell_checking_languages 44 45 webkit_web_context_set_preferred_languages 46 webkit_web_context_set_tls_errors_policy 47 webkit_web_context_get_tls_errors_policy 45 48 46 49 <SUBSECTION URI Scheme> -
trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestSSL.cpp
r137450 r138273 39 39 } 40 40 41 virtual void provisionalLoadFailed(const gchar* failingURI, GError* error) 42 { 43 g_assert_error(error, SOUP_HTTP_ERROR, SOUP_STATUS_SSL_FAILED); 44 LoadTrackingTest::provisionalLoadFailed(failingURI, error); 45 } 46 41 47 virtual void loadCommitted() 42 48 { … … 49 55 webkit_uri_response_get_https_status(response, &certificate, &m_tlsErrors); 50 56 m_certificate = certificate; 57 LoadTrackingTest::loadCommitted(); 51 58 } 52 59 … … 114 121 } 115 122 123 static void testTLSErrorsPolicy(SSLTest* test, gconstpointer) 124 { 125 WebKitWebContext* context = webkit_web_view_get_context(test->m_webView); 126 // TLS errors are ignored by default. 127 g_assert(webkit_web_context_get_tls_errors_policy(context) == WEBKIT_TLS_ERRORS_POLICY_IGNORE); 128 test->loadURI(kHttpsServer->getURIForPath("/").data()); 129 test->waitUntilLoadFinished(); 130 g_assert(!test->m_loadFailed); 131 132 webkit_web_context_set_tls_errors_policy(context, WEBKIT_TLS_ERRORS_POLICY_FAIL); 133 test->loadURI(kHttpsServer->getURIForPath("/").data()); 134 test->waitUntilLoadFinished(); 135 g_assert(test->m_loadFailed); 136 g_assert(test->m_loadEvents.contains(LoadTrackingTest::ProvisionalLoadFailed)); 137 g_assert(!test->m_loadEvents.contains(LoadTrackingTest::LoadCommitted)); 138 } 139 116 140 static void httpsServerCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer) 117 141 { … … 173 197 SSLTest::add("WebKitWebView", "ssl", testSSL); 174 198 InsecureContentTest::add("WebKitWebView", "insecure-content", testInsecureContent); 199 SSLTest::add("WebKitWebContext", "tls-errors-policy", testTLSErrorsPolicy); 175 200 } 176 201 -
trunk/Source/WebKit2/UIProcess/WebContext.cpp
r138203 r138273 143 143 , m_usesNetworkProcess(false) 144 144 #endif 145 #if USE(SOUP) 146 , m_ignoreTLSErrors(true) 147 #endif 145 148 { 146 149 platformInitialize(); -
trunk/Source/WebKit2/UIProcess/WebContext.h
r138203 r138273 283 283 static void willStopUsingPrivateBrowsing(); 284 284 285 #if USE(SOUP) 286 void setIgnoreTLSErrors(bool); 287 bool ignoreTLSErrors() const { return m_ignoreTLSErrors; } 288 #endif 289 285 290 private: 286 291 WebContext(ProcessModel, const String& injectedBundlePath); … … 464 469 static bool s_applicationIsOccluded; 465 470 #endif 471 472 #if USE(SOUP) 473 bool m_ignoreTLSErrors; 474 #endif 466 475 }; 467 476 -
trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp
r137598 r138273 31 31 #include "WebInspectorServer.h" 32 32 #include "WebProcessCreationParameters.h" 33 #include "WebProcessMessages.h" 33 34 #include "WebSoupRequestManagerProxy.h" 34 35 #include <Efreet.h> … … 92 93 m_cookieManagerProxy->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType); 93 94 parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy; 95 parameters.ignoreTLSErrors = m_ignoreTLSErrors; 94 96 } 95 97 … … 126 128 } 127 129 130 void WebContext::setIgnoreTLSErrors(bool ignoreTLSErrors) 131 { 132 m_ignoreTLSErrors = ignoreTLSErrors; 133 sendToAllProcesses(Messages::WebProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors)); 134 } 135 128 136 } // namespace WebKit -
trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp
r138147 r138273 33 33 #include "WebInspectorServer.h" 34 34 #include "WebProcessCreationParameters.h" 35 #include "WebProcessMessages.h" 35 36 #include "WebSoupRequestManagerProxy.h" 36 37 #include <WebCore/FileSystem.h> … … 91 92 m_cookieManagerProxy->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType); 92 93 parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy; 94 parameters.ignoreTLSErrors = m_ignoreTLSErrors; 93 95 } 94 96 … … 127 129 } 128 130 131 void WebContext::setIgnoreTLSErrors(bool ignoreTLSErrors) 132 { 133 m_ignoreTLSErrors = ignoreTLSErrors; 134 sendToAllProcesses(Messages::WebProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors)); 135 } 136 129 137 } // namespace WebKit -
trunk/Source/WebKit2/WebProcess/WebProcess.h
r138203 r138273 286 286 void setJavaScriptGarbageCollectorTimerEnabled(bool flag); 287 287 288 #if USE(SOUP) 289 void setIgnoreTLSErrors(bool); 290 #endif 291 288 292 void postInjectedBundleMessage(const CoreIPC::DataReference& messageData); 289 293 -
trunk/Source/WebKit2/WebProcess/WebProcess.messages.in
r138203 r138273 55 55 SetShouldPaintNativeControls(bool shouldPaintNativeControls) 56 56 #endif 57 #if USE(SOUP) 58 SetIgnoreTLSErrors(bool ignoreTLSErrors) 59 #endif 57 60 58 61 // Private browsing session is per process. Individual pages or page groups may use the private session or the default one as appropriate. -
trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
r138234 r138273 112 112 soup_cache_load(soupCache); 113 113 114 WebCore::ResourceHandle::setIgnoreSSLErrors(true);115 116 114 int socket = atoi(argv[1]); 117 115 WebProcess::shared().initialize(socket, RunLoop::main()); -
trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp
r137588 r138273 76 76 soup_cache_load(soupCache.get()); 77 77 78 // This is for compatibility, it will be removed when UI process can handle SSL errors.79 WebCore::ResourceHandle::setIgnoreSSLErrors(true);80 81 78 RunLoop::run(); 82 79 -
trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp
r137432 r138273 177 177 WebCookieManager::shared().setHTTPCookieAcceptPolicy(parameters.cookieAcceptPolicy); 178 178 179 setIgnoreTLSErrors(parameters.ignoreTLSErrors); 180 179 181 WebCore::addLanguageChangeObserver(this, languageChanged); 180 182 } … … 185 187 } 186 188 189 void WebProcess::setIgnoreTLSErrors(bool ignoreTLSErrors) 190 { 191 WebCore::ResourceHandle::setIgnoreSSLErrors(ignoreTLSErrors); 192 } 193 187 194 } // namespace WebKit
Note: See TracChangeset
for help on using the changeset viewer.