Attachment 339360 Details for Bug 185224 – FIX

[patch] FIX

185224.diff (text/plain), 1.34 KB, created by Basuke Suzuki on 2018-05-02 15:51:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2018-05-02 15:51:56 PDT

Size: 1.34 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 999639dec7f..544df5c0e8b 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-02  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Curl] Fix to follow the interface change of ProxySettings.
>+        https://bugs.webkit.org/show_bug.cgi?id=185224
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/win/SystemProxyWin.cpp:
>+        (WindowsSystemProxy::setCurlHttpProxy):
>+
> 2018-05-01  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         Use default std::optional if it is provided
>diff --git a/Source/WebKit/NetworkProcess/win/SystemProxyWin.cpp b/Source/WebKit/NetworkProcess/win/SystemProxyWin.cpp
>index d1732ddb4b5..2501e04f35b 100644
>--- a/Source/WebKit/NetworkProcess/win/SystemProxyWin.cpp
>+++ b/Source/WebKit/NetworkProcess/win/SystemProxyWin.cpp
>@@ -65,7 +65,8 @@ bool WindowsSystemProxy::getSystemHttpProxy(char* buffer, int bufferLen, int* po
> 
> void WindowsSystemProxy::setCurlHttpProxy(char* proxy, int port)
> {
>-    WebCore::CurlContext::singleton().setProxyInfo(proxy, port);
>+    WebCore::CurlProxySettings settings(WebCore::URL(WebCore::ParsedURLString, String::format("http://%s:%d/", proxy, port)), String());
>+    WebCore::CurlContext::singleton().setProxySettings(settings);
> }
> 
> void WindowsSystemProxy::setCurlHttpProxy()

Actions: View | Formatted Diff | Diff

Attachments on bug 185224: 339360 | 339763 | 340680