WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
Patch
bug-145154-20150519153402.patch (text/plain), 19.98 KB, created by
Ryuan Choi
on 2015-05-18 23:34:05 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Ryuan Choi
Created:
2015-05-18 23:34:05 PDT
Size:
19.98 KB
patch
obsolete
>Subversion Revision: 184543 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index de46fcf2df662f81c2a0953ac708b505846467e4..f1d236902877698428bde913b3b3b02e1a12729a 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,26 @@ >+2015-05-18 Ryuan Choi <ryuan.choi@navercorp.com> >+ >+ [EFL] Use GSimpleProxyResolver instead of custom SoupProxyResolver >+ https://bugs.webkit.org/show_bug.cgi?id=145154 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ SoupProxyResolver was deprecated since libsoup 2.42. >+ So, this patch refactors the custom SoupProxyResolver to GSimpleProxyResolver >+ which provides same functionality in gio. >+ >+ No new tests, because there is not behavior change. >+ >+ * PlatformEfl.cmake: >+ * WebCore.vcxproj/WebCore.vcxproj: >+ * WebCore.vcxproj/WebCore.vcxproj.filters: >+ * platform/network/soup/ProxyResolverSoup.cpp: Removed. >+ * platform/network/soup/ProxyResolverSoup.h: Removed. >+ * platform/network/soup/SoupNetworkSession.cpp: >+ (WebCore::SoupNetworkSession::setHTTPProxy): Moved to private member. >+ (WebCore::SoupNetworkSession::httpProxy): Deleted because nobody calls it. >+ * platform/network/soup/SoupNetworkSession.h: >+ > 2015-05-18 Gyuyoung Kim <gyuyoung.kim@webkit.org> > > Use Ref instead of PassRefPtr in WebCore/bindings >diff --git a/Source/WebCore/PlatformEfl.cmake b/Source/WebCore/PlatformEfl.cmake >index 691a597b2ebb6d401c3c17a05a11fb786650e8f7..d8b9295167e62fdb8cd27074a9c5807fe6206f08 100644 >--- a/Source/WebCore/PlatformEfl.cmake >+++ b/Source/WebCore/PlatformEfl.cmake >@@ -232,7 +232,6 @@ list(APPEND WebCore_SOURCES > platform/network/soup/CredentialStorageSoup.cpp > platform/network/soup/DNSSoup.cpp > platform/network/soup/NetworkStorageSessionSoup.cpp >- platform/network/soup/ProxyResolverSoup.cpp > platform/network/soup/ProxyServerSoup.cpp > platform/network/soup/ResourceErrorSoup.cpp > platform/network/soup/ResourceHandleSoup.cpp >diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj >index c1e7496eca8c7ee446e5f8d69d287cbed9b70fc4..a6702e7d8df644741d83b8e308d8ccdff4834beb 100644 >--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj >+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj >@@ -7913,16 +7913,6 @@ > <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild> > <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> > </ClCompile> >- <ClCompile Include="..\platform\network\soup\ProxyResolverSoup.cpp"> >- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> >- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> >- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild> >- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild> >- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> >- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> >- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild> >- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> >- </ClCompile> > <ClCompile Include="..\platform\network\soup\ProxyServerSoup.cpp"> > <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> > <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> >@@ -19881,7 +19871,6 @@ > <ClInclude Include="..\platform\network\soup\CertificateInfo.h" /> > <ClInclude Include="..\platform\network\soup\CookieJarSoup.h" /> > <ClInclude Include="..\platform\network\soup\GUniquePtrSoup.h" /> >- <ClInclude Include="..\platform\network\soup\ProxyResolverSoup.h" /> > <ClInclude Include="..\platform\network\soup\ResourceError.h" /> > <ClInclude Include="..\platform\network\soup\ResourceRequest.h" /> > <ClInclude Include="..\platform\network\soup\ResourceResponse.h" /> >@@ -21786,4 +21775,4 @@ > <ImportGroup Label="ExtensionTargets"> > <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" /> > </ImportGroup> >-</Project> >\ No newline at end of file >+</Project> >diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters >index 13d157a0fa91cdeb3d83716c6b2b937294dc8302..78ff511e25a1c3980b4800e002238fd7479d58b2 100644 >--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters >+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters >@@ -6889,9 +6889,6 @@ > <ClCompile Include="..\platform\network\soup\NetworkStorageSessionSoup.cpp"> > <Filter>platform\network\soup</Filter> > </ClCompile> >- <ClCompile Include="..\platform\network\soup\ProxyResolverSoup.cpp"> >- <Filter>platform\network\soup</Filter> >- </ClCompile> > <ClCompile Include="..\platform\network\soup\ProxyServerSoup.cpp"> > <Filter>platform\network\soup</Filter> > </ClCompile> >diff --git a/Source/WebCore/platform/network/soup/ProxyResolverSoup.cpp b/Source/WebCore/platform/network/soup/ProxyResolverSoup.cpp >deleted file mode 100644 >index 51cc86b2c6af6f994d645526d02fdce6c54316e8..0000000000000000000000000000000000000000 >--- a/Source/WebCore/platform/network/soup/ProxyResolverSoup.cpp >+++ /dev/null >@@ -1,215 +0,0 @@ >-/* >- * Copyright (C) 2012 Intel Corporation. All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >- * THE POSSIBILITY OF SUCH DAMAGE. >- */ >- >-#include "config.h" >- >-#if USE(SOUP) >- >-#include "ProxyResolverSoup.h" >- >-#include <libsoup/soup.h> >-#include <string.h> >-#include <wtf/Vector.h> >-#include <wtf/text/CString.h> >-#include <wtf/text/WTFString.h> >- >-static const char defaultNoProxyValue[] = "localhost,127.0.0.1"; >- >-typedef struct { >- SoupURI* proxyURI; >- CString noProxy; >- Vector<String> proxyExceptions; >-} SoupProxyResolverWkPrivate; >- >-#define SOUP_PROXY_RESOLVER_WK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), SOUP_TYPE_PROXY_RESOLVER_WK, SoupProxyResolverWkPrivate)) >- >-static void soup_proxy_resolver_wk_interface_init(SoupProxyURIResolverInterface* proxyResolverInterface); >- >-G_DEFINE_TYPE_EXTENDED(SoupProxyResolverWk, soup_proxy_resolver_wk, G_TYPE_OBJECT, 0, >- G_IMPLEMENT_INTERFACE(SOUP_TYPE_SESSION_FEATURE, 0) >- G_IMPLEMENT_INTERFACE(SOUP_TYPE_PROXY_URI_RESOLVER, soup_proxy_resolver_wk_interface_init)) >- >-enum { >- PROP_0, >- PROP_PROXY_URI, >- PROP_NO_PROXY, >- LAST_PROP >-}; >- >-static void soup_proxy_resolver_wk_init(SoupProxyResolverWk*) >-{ >-} >- >-static void soupProxyResolverWkFinalize(GObject* object) >-{ >- SoupProxyResolverWkPrivate* priv = SOUP_PROXY_RESOLVER_WK_GET_PRIVATE(object); >- >- g_clear_pointer(&priv->proxyURI, soup_uri_free); >- >- G_OBJECT_CLASS(soup_proxy_resolver_wk_parent_class)->finalize(object); >-} >- >-static void soupProxyResolverWkSetProperty(GObject* object, unsigned propID, const GValue* value, GParamSpec* pspec) >-{ >- SoupProxyResolverWkPrivate* priv = SOUP_PROXY_RESOLVER_WK_GET_PRIVATE(object); >- >- switch (propID) { >- case PROP_PROXY_URI: { >- SoupURI* uri = static_cast<SoupURI*>(g_value_get_boxed(value)); >- if (priv->proxyURI) >- soup_uri_free(priv->proxyURI); >- >- priv->proxyURI = uri ? soup_uri_copy(uri) : 0; >- break; >- } >- case PROP_NO_PROXY: >- priv->noProxy = g_value_get_string(value); >- priv->proxyExceptions.clear(); >- String::fromUTF8(priv->noProxy.data()).replaceWithLiteral(' ', "").split(',', priv->proxyExceptions); >- break; >- default: >- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, pspec); >- break; >- } >-} >- >-static void soupProxyResolverWkGetProperty(GObject* object, unsigned propID, GValue* value, GParamSpec* pspec) >-{ >- SoupProxyResolverWkPrivate* priv = SOUP_PROXY_RESOLVER_WK_GET_PRIVATE(object); >- >- switch (propID) { >- case PROP_PROXY_URI: >- g_value_set_boxed(value, priv->proxyURI); >- break; >- case PROP_NO_PROXY: >- g_value_set_string(value, priv->noProxy.data()); >- break; >- default: >- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, pspec); >- break; >- } >-} >- >-static bool shouldBypassProxy(SoupProxyResolverWkPrivate* priv, SoupURI* uri) >-{ >- const size_t exceptionCount = priv->proxyExceptions.size(); >- for (size_t i = 0; i < exceptionCount; ++i) { >- if (String::fromUTF8(uri->host).endsWith(priv->proxyExceptions[i], false)) >- return true; >- } >- >- return false; >-} >- >-typedef struct { >- SoupProxyURIResolver* proxyResolver; >- SoupURI* uri; >- SoupProxyURIResolverCallback callback; >- void* userData; >-} SoupWkAsyncData; >- >-static gboolean idle_return_proxy_uri(void* data) >-{ >- SoupWkAsyncData* ssad = static_cast<SoupWkAsyncData*>(data); >- SoupProxyResolverWkPrivate* priv = SOUP_PROXY_RESOLVER_WK_GET_PRIVATE(ssad->proxyResolver); >- >- SoupURI* proxyURI = 0; >- if (!shouldBypassProxy(priv, ssad->uri)) >- proxyURI = priv->proxyURI; >- >- ssad->callback(ssad->proxyResolver, SOUP_STATUS_OK, proxyURI, ssad->userData); >- g_object_unref(ssad->proxyResolver); >- soup_uri_free(ssad->uri); >- g_slice_free(SoupWkAsyncData, ssad); >- >- return false; >-} >- >-static void soupProxyResolverWkGetProxyURIAsync(SoupProxyURIResolver* proxyResolver, SoupURI* uri, GMainContext* asyncContext, GCancellable*, SoupProxyURIResolverCallback callback, void* userData) >-{ >- SoupWkAsyncData* ssad; >- >- ssad = g_slice_new0(SoupWkAsyncData); >- ssad->proxyResolver = SOUP_PROXY_URI_RESOLVER(g_object_ref(proxyResolver)); >- ssad->uri = soup_uri_copy(uri); >- ssad->callback = callback; >- ssad->userData = userData; >- soup_add_completion(asyncContext, idle_return_proxy_uri, ssad); >-} >- >-static unsigned soupProxyResolverWkGetProxyURISync(SoupProxyURIResolver* proxyResolver, SoupURI* uri, GCancellable*, SoupURI** proxyURI) >-{ >- SoupProxyResolverWkPrivate* priv = SOUP_PROXY_RESOLVER_WK_GET_PRIVATE(proxyResolver); >- >- if (!shouldBypassProxy(priv, uri)) >- *proxyURI = soup_uri_copy(priv->proxyURI); >- >- return SOUP_STATUS_OK; >-} >- >-static void soup_proxy_resolver_wk_class_init(SoupProxyResolverWkClass* wkClass) >-{ >- GObjectClass* object_class = G_OBJECT_CLASS(wkClass); >- >- g_type_class_add_private(wkClass, sizeof(SoupProxyResolverWkPrivate)); >- >- object_class->set_property = soupProxyResolverWkSetProperty; >- object_class->get_property = soupProxyResolverWkGetProperty; >- object_class->finalize = soupProxyResolverWkFinalize; >- >- g_object_class_install_property(object_class, PROP_PROXY_URI, >- g_param_spec_boxed(SOUP_PROXY_RESOLVER_WK_PROXY_URI, >- "Proxy URI", >- "The HTTP Proxy to use", >- SOUP_TYPE_URI, >- static_cast<GParamFlags>(G_PARAM_READWRITE))); >- >- g_object_class_install_property(object_class, PROP_NO_PROXY, >- g_param_spec_string(SOUP_PROXY_RESOLVER_WK_NO_PROXY, >- "Proxy exceptions", >- "Comma-separated proxy exceptions", >- defaultNoProxyValue, >- static_cast<GParamFlags>(G_PARAM_READWRITE))); >-} >- >-static void soup_proxy_resolver_wk_interface_init(SoupProxyURIResolverInterface* proxy_uri_resolver_interface) >-{ >- proxy_uri_resolver_interface->get_proxy_uri_async = soupProxyResolverWkGetProxyURIAsync; >- proxy_uri_resolver_interface->get_proxy_uri_sync = soupProxyResolverWkGetProxyURISync; >-} >- >-SoupProxyURIResolver* soupProxyResolverWkNew(const char* httpProxy, const char* noProxy) >-{ >- SoupURI* proxyURI = soup_uri_new(httpProxy); >- SoupProxyURIResolver* resolver = SOUP_PROXY_URI_RESOLVER(g_object_new(SOUP_TYPE_PROXY_RESOLVER_WK, >- SOUP_PROXY_RESOLVER_WK_PROXY_URI, proxyURI, >- SOUP_PROXY_RESOLVER_WK_NO_PROXY, noProxy ? noProxy : defaultNoProxyValue, >- 0)); >- soup_uri_free(proxyURI); >- >- return resolver; >-} >- >-#endif >diff --git a/Source/WebCore/platform/network/soup/ProxyResolverSoup.h b/Source/WebCore/platform/network/soup/ProxyResolverSoup.h >deleted file mode 100644 >index 1fded538a1ff135474f9ec54c48fce316a7831fb..0000000000000000000000000000000000000000 >--- a/Source/WebCore/platform/network/soup/ProxyResolverSoup.h >+++ /dev/null >@@ -1,57 +0,0 @@ >-/* >- * Copyright (C) 2012 Intel Corporation. All rights reserved. >- * >- * Redistribution and use in source and binary forms, with or without >- * modification, are permitted provided that the following conditions >- * are met: >- * 1. Redistributions of source code must retain the above copyright >- * notice, this list of conditions and the following disclaimer. >- * 2. Redistributions in binary form must reproduce the above copyright >- * notice, this list of conditions and the following disclaimer in the >- * documentation and/or other materials provided with the distribution. >- * >- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' >- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, >- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS >- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR >- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF >- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS >- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN >- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF >- * THE POSSIBILITY OF SUCH DAMAGE. >- */ >- >-#ifndef ProxyResolverSoup_h >-#define ProxyResolverSoup_h >- >-#include <libsoup/soup.h> >- >-G_BEGIN_DECLS >- >-#define SOUP_TYPE_PROXY_RESOLVER_WK (soup_proxy_resolver_wk_get_type ()) >-#define SOUP_PROXY_RESOLVER_WK(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), SOUP_TYPE_PROXY_RESOLVER_WK, SoupProxyResolverWk)) >-#define SOUP_PROXY_RESOLVER_WK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_PROXY_RESOLVER_WK, SoupProxyResolverWkClass)) >-#define SOUP_IS_PROXY_RESOLVER_WK(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), SOUP_TYPE_PROXY_RESOLVER_WK)) >-#define SOUP_IS_PROXY_RESOLVER_WK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SOUP_TYPE_PROXY_RESOLVER_WK)) >-#define SOUP_PROXY_RESOLVER_WK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SOUP_TYPE_PROXY_RESOLVER_WK, SoupProxyResolverWkClass)) >- >-static const char SOUP_PROXY_RESOLVER_WK_PROXY_URI[] = "proxy-uri"; >-static const char SOUP_PROXY_RESOLVER_WK_NO_PROXY[] = "no-proxy"; >- >-typedef struct { >- GObject parent; >-} SoupProxyResolverWk; >- >-typedef struct { >- GObjectClass parent_class; >-} SoupProxyResolverWkClass; >- >-GType soup_proxy_resolver_wk_get_type(void); >- >-SoupProxyURIResolver* soupProxyResolverWkNew(const char* httpProxy, const char* noProxy); >- >-G_END_DECLS >- >-#endif // ProxyResolverSoup_h >diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp b/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp >index 48e521d5552d931145e1478cb23acc09d8695d66..4a731afdc127aebc8198534614fa4878cafc8c33 100644 >--- a/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp >+++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp >@@ -40,10 +40,6 @@ > #include <wtf/text/CString.h> > #include <wtf/text/StringBuilder.h> > >-#if PLATFORM(EFL) >-#include "ProxyResolverSoup.h" >-#endif >- > namespace WebCore { > > #if !LOG_DISABLED >@@ -225,36 +221,24 @@ SoupNetworkSession::SSLPolicy SoupNetworkSession::sslPolicy() const > void SoupNetworkSession::setHTTPProxy(const char* httpProxy, const char* httpProxyExceptions) > { > #if PLATFORM(EFL) >- // Only for EFL because GTK port uses the default resolver, which uses GIO's proxy resolver. >- if (!httpProxy) { >- soup_session_remove_feature_by_type(m_soupSession.get(), SOUP_TYPE_PROXY_URI_RESOLVER); >- return; >+ GProxyResolver* resolver = nullptr; >+ if (httpProxy) { >+ gchar** ignoreLists = nullptr; >+ if (httpProxyExceptions) >+ ignoreLists = g_strsplit(httpProxyExceptions, ",", -1); >+ >+ resolver = g_simple_proxy_resolver_new(httpProxy, ignoreLists); >+ >+ g_strfreev(ignoreLists); > } > >- GRefPtr<SoupProxyURIResolver> resolver = adoptGRef(soupProxyResolverWkNew(httpProxy, httpProxyExceptions)); >- soup_session_add_feature(m_soupSession.get(), SOUP_SESSION_FEATURE(resolver.get())); >+ g_object_set(m_soupSession.get(), SOUP_SESSION_PROXY_RESOLVER, resolver, nullptr); > #else > UNUSED_PARAM(httpProxy); > UNUSED_PARAM(httpProxyExceptions); > #endif > } > >-char* SoupNetworkSession::httpProxy() const >-{ >-#if PLATFORM(EFL) >- SoupSessionFeature* soupResolver = soup_session_get_feature(m_soupSession.get(), SOUP_TYPE_PROXY_URI_RESOLVER); >- if (!soupResolver) >- return nullptr; >- >- GUniqueOutPtr<SoupURI> uri; >- g_object_get(soupResolver, SOUP_PROXY_RESOLVER_WK_PROXY_URI, &uri.outPtr(), nullptr); >- >- return uri ? soup_uri_to_string(uri.get(), FALSE) : nullptr; >-#else >- return nullptr; >-#endif >-} >- > void SoupNetworkSession::setupHTTPProxyFromEnvironment() > { > #if PLATFORM(EFL) >diff --git a/Source/WebCore/platform/network/soup/SoupNetworkSession.h b/Source/WebCore/platform/network/soup/SoupNetworkSession.h >index 796927da74504c97053efca585b4c06f51a14720..893455a6c2ead06eced132169f274222ed839bef 100644 >--- a/Source/WebCore/platform/network/soup/SoupNetworkSession.h >+++ b/Source/WebCore/platform/network/soup/SoupNetworkSession.h >@@ -65,8 +65,6 @@ public: > void setSSLPolicy(SSLPolicy); > SSLPolicy sslPolicy() const; > >- void setHTTPProxy(const char* httpProxy, const char* httpProxyExceptions); >- char* httpProxy() const; > void setupHTTPProxyFromEnvironment(); > > void setAcceptLanguages(const Vector<String>&); >@@ -75,6 +73,8 @@ private: > SoupNetworkSession(SoupCookieJar*); > SoupNetworkSession(SoupSession*); > >+ void setHTTPProxy(const char* httpProxy, const char* httpProxyExceptions); >+ > void setupLogger(); > > GRefPtr<SoupSession> m_soupSession;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=253372">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 145154
:
253355
|
253372
|
253373
|
253413