Attachment 349494 Details for Bug 189531 – PATCH

[patch] PATCH

189531.diff (text/plain), 3.00 KB, created by Basuke Suzuki on 2018-09-11 16:58:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2018-09-11 16:58:24 PDT

Size: 3.00 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 593804b6fda..1e9adb086e5 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-09-11  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Curl] WebInspector doesn't display request headers added during processing.
>+        https://bugs.webkit.org/show_bug.cgi?id=189531
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        While processing the request, Curl port network layer adds some headers to the request
>+        such as cookies. Those headers should be displayed in the WebInspector.
>+
>+        Tested on MiniBrowser.
>+
>+        * platform/network/curl/CurlRequest.cpp:
>+        (WebCore::CurlRequest::didReceiveHeader):
>+        (WebCore::CurlRequest::didCompleteTransfer):
>+        (WebCore::CurlRequest::updateNetworkLoadMetrics):
>+        * platform/network/curl/CurlRequest.h:
>+
> 2018-09-10  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
> 
>         [WTF] Add Markable<T, Traits>
>diff --git a/Source/WebCore/platform/network/curl/CurlRequest.cpp b/Source/WebCore/platform/network/curl/CurlRequest.cpp
>index 726992aa3d2..1403dc70a23 100644
>--- a/Source/WebCore/platform/network/curl/CurlRequest.cpp
>+++ b/Source/WebCore/platform/network/curl/CurlRequest.cpp
>@@ -301,8 +301,7 @@ size_t CurlRequest::didReceiveHeader(String&& header)
>     if (auto version = m_curlHandle->getHttpVersion())
>         m_response.httpVersion = *version;
> 
>-    if (auto metrics = m_curlHandle->getNetworkLoadMetrics())
>-        m_networkLoadMetrics = *metrics;
>+    updateNetworkLoadMetrics();
> 
>     if (m_response.availableProxyAuth)
>         CurlContext::singleton().setProxyAuthMethod(m_response.availableProxyAuth);
>@@ -402,8 +401,7 @@ void CurlRequest::didCompleteTransfer(CURLcode result)
>         if (m_multipartHandle)
>             m_multipartHandle->didComplete();
> 
>-        if (auto metrics = m_curlHandle->getNetworkLoadMetrics())
>-            m_networkLoadMetrics = *metrics;
>+        updateNetworkLoadMetrics();
> 
>         finalizeTransfer();
>         callClient([](CurlRequest& request, CurlRequestClient& client) {
>@@ -637,6 +635,14 @@ bool CurlRequest::isHandlePaused() const
>     return m_isHandlePaused;
> }
> 
>+void CurlRequest::updateNetworkLoadMetrics()
>+{
>+    if (auto metrics = m_curlHandle->getNetworkLoadMetrics())
>+        m_networkLoadMetrics = *metrics;
>+
>+    m_networkLoadMetrics.requestHeaders = m_request.httpHeaderFields();
>+}
>+
> void CurlRequest::enableDownloadToFile()
> {
>     LockHolder locker(m_downloadMutex);
>diff --git a/Source/WebCore/platform/network/curl/CurlRequest.h b/Source/WebCore/platform/network/curl/CurlRequest.h
>index e4cc4a234fd..6f78f4fa799 100644
>--- a/Source/WebCore/platform/network/curl/CurlRequest.h
>+++ b/Source/WebCore/platform/network/curl/CurlRequest.h
>@@ -143,6 +143,8 @@ private:
>     void updateHandlePauseState(bool);
>     bool isHandlePaused() const;
> 
>+    void updateNetworkLoadMetrics();
>+
>     // Download
>     void writeDataToDownloadFileIfEnabled(const SharedBuffer&);
>     void closeDownloadFile();

Actions: View | Formatted Diff | Diff

Attachments on bug 189531: 349494