Title: [160986] trunk/Source/WebKit2
- Revision
- 160986
- Author
- [email protected]
- Date
- 2013-12-22 22:20:59 -0800 (Sun, 22 Dec 2013)
Log Message
[WK2][SOUP] WebContext::allowSpecificHTTPSCertificateForHost does not work correctly when m_usesNetworkProcess is false
https://bugs.webkit.org/show_bug.cgi?id=125564
Reviewed Carlos Garcia Campos.
WebContext::allowSpecificHTTPSCertificateForHost should send
AllowSpecificHTTPSCertificateForHost to the web process when
m_usesNetworkProcess is false. Also we shouldn't guard
WebProcess::allowSpecificHTTPSCertificateForHost with
!ENABLE(NETWORK_PROCESS) because we need this method when
m_usesNetworkProcess is false.
Patch by Kwang Yul Seo <[email protected]> on 2013-12-22
* UIProcess/WebContext.cpp:
(WebKit::WebContext::allowSpecificHTTPSCertificateForHost):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:
* WebProcess/soup/WebProcessSoup.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160985 => 160986)
--- trunk/Source/WebKit2/ChangeLog 2013-12-23 06:08:44 UTC (rev 160985)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-23 06:20:59 UTC (rev 160986)
@@ -1,3 +1,23 @@
+2013-12-22 Kwang Yul Seo <[email protected]>
+
+ [WK2][SOUP] WebContext::allowSpecificHTTPSCertificateForHost does not work correctly when m_usesNetworkProcess is false
+ https://bugs.webkit.org/show_bug.cgi?id=125564
+
+ Reviewed Carlos Garcia Campos.
+
+ WebContext::allowSpecificHTTPSCertificateForHost should send
+ AllowSpecificHTTPSCertificateForHost to the web process when
+ m_usesNetworkProcess is false. Also we shouldn't guard
+ WebProcess::allowSpecificHTTPSCertificateForHost with
+ !ENABLE(NETWORK_PROCESS) because we need this method when
+ m_usesNetworkProcess is false.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::allowSpecificHTTPSCertificateForHost):
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+ * WebProcess/soup/WebProcessSoup.cpp:
+
2013-12-22 Martin Robinson <[email protected]>
[GTK][CMake] Integrate GResource for inspector files (and others?)
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (160985 => 160986)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-23 06:08:44 UTC (rev 160985)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-23 06:20:59 UTC (rev 160986)
@@ -1142,7 +1142,8 @@
m_networkProcess->send(Messages::NetworkProcess::AllowSpecificHTTPSCertificateForHost(certificate->certificateInfo(), host), 0);
return;
}
-#else
+#endif
+
#if USE(SOUP)
m_processes[0]->send(Messages::WebProcess::AllowSpecificHTTPSCertificateForHost(certificate->certificateInfo(), host), 0);
return;
@@ -1150,7 +1151,6 @@
UNUSED_PARAM(certificate);
UNUSED_PARAM(host);
#endif
-#endif
#if !PLATFORM(IOS)
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (160985 => 160986)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2013-12-23 06:08:44 UTC (rev 160985)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2013-12-23 06:20:59 UTC (rev 160986)
@@ -174,7 +174,7 @@
void updateActivePages();
-#if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
+#if USE(SOUP)
void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (160985 => 160986)
--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2013-12-23 06:08:44 UTC (rev 160985)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2013-12-23 06:20:59 UTC (rev 160986)
@@ -83,7 +83,7 @@
SetProcessSuppressionEnabled(bool flag);
#endif
-#if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
+#if USE(SOUP)
AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, String host)
#endif
}
Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (160985 => 160986)
--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2013-12-23 06:08:44 UTC (rev 160985)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2013-12-23 06:20:59 UTC (rev 160986)
@@ -235,10 +235,9 @@
WebCore::ResourceHandle::setIgnoreSSLErrors(ignoreTLSErrors);
}
-#if !ENABLE(NETWORK_PROCESS)
void WebProcess::allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo& certificateInfo, const String& host)
{
WebCore::ResourceHandle::setClientCertificate(host, certificateInfo.certificate());
}
-#endif
+
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
