Changeset 160988 in webkit

Timestamp:

Dec 23, 2013 12:41:08 AM (10 years ago)

Author:

brian.holt@samsung.com

Message:

[WK2] Implement platform specific Resource Response for SOUP
​https://bugs.webkit.org/show_bug.cgi?id=125422

Reviewed by Martin Robinson.

SOUP specific Resource Response implementation for the Network
Process.

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::continueWillSendRequest):

• WebProcess/Network/WebResourceLoader.cpp:

(WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (1 diff)
• WebProcess/Network/WebResourceLoader.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-23  Brian Holt  <brian.holt@samsung.com>
+
+        [WK2] Implement platform specific Resource Response for SOUP
+        https://bugs.webkit.org/show_bug.cgi?id=125422
+
+        Reviewed by Martin Robinson.
+
+        SOUP specific Resource Response implementation for the Network
+        Process.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::continueWillSendRequest):
+        * WebProcess/Network/WebResourceLoader.cpp:
+        (WebKit::WebResourceLoader::didReceiveResponseWithCertificateInfo):
+
 2013-12-22  Kwang Yul Seo  <skyul@company100.net>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -244 +244 @@
 void NetworkResourceLoader::continueWillSendRequest(const ResourceRequest& newRequest)
 {
+#if PLATFORM(MAC)
     m_suggestedRequestForWillSendRequest.updateFromDelegatePreservingOldHTTPBody(newRequest.nsURLRequest(DoNotUpdateHTTPBody));
+#elif USE(SOUP)
+    // FIXME: Implement ResourceRequest::updateFromDelegatePreservingOldHTTPBody. See https://bugs.webkit.org/show_bug.cgi?id=126127.
+    m_suggestedRequestForWillSendRequest.updateFromDelegatePreservingOldHTTPBody(newRequest);
+#endif
 
     RunLoop::main()->dispatch(bind(&NetworkResourceLoadScheduler::receivedRedirect, &NetworkProcess::shared().networkResourceLoadScheduler(), this, m_suggestedRequestForWillSendRequest.url()));

trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp

@@ -107 +107 @@
 
     ResourceResponse responseCopy(response);
+    // FIXME: This should use CertificateInfo to avoid the platform ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=124724.
+#if PLATFORM(MAC)
     responseCopy.setCertificateChain(certificateInfo.certificateChain());
+#elif USE(SOUP)
+    responseCopy.setSoupMessageCertificate(certificateInfo.certificate());
+    responseCopy.setSoupMessageTLSErrors(certificateInfo.tlsErrors());
+#endif
     m_coreLoader->didReceiveResponse(responseCopy);