2011-02-18 Gyuyoung Kim <gyuyoung.kim@samsung.com>

        Reviewed by Antonio Gomes.

        [EFL] Remove proxy feature of soup when proxy is null
        https://bugs.webkit.org/show_bug.cgi?id=54621

        When proxy value is NULL, remove proxy feature in soup.

        * ewk/ewk_settings.cpp:
        (ewk_settings_proxy_uri_set):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@79070 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
index bce3e9318496f3b7199375fccfa44404940dea8f..ce13bdd6c2eaf6518f3a30a631246f813a3bb6d5 100644 (file)
--- a/Source/WebKit/efl/ChangeLog
+++ b/Source/WebKit/efl/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-18  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Remove proxy feature of soup when proxy is null
+        https://bugs.webkit.org/show_bug.cgi?id=54621
+
+        When proxy value is NULL, remove proxy feature in soup.
+
+        * ewk/ewk_settings.cpp:
+        (ewk_settings_proxy_uri_set):
+
 2011-02-18  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         Reviewed by Kent Tamura.

diff --git a/Source/WebKit/efl/ewk/ewk_settings.cpp b/Source/WebKit/efl/ewk/ewk_settings.cpp
index 54e6645f037aaf56709de62744fc823f91f0d4d9..2b6d457d2feb7e269c8f1ef92314a99b0ce1904e 100644 (file)
--- a/Source/WebKit/efl/ewk/ewk_settings.cpp
+++ b/Source/WebKit/efl/ewk/ewk_settings.cpp
@@ -279,6 +279,14 @@ Evas_Object* ewk_settings_icon_database_icon_object_add(const char* url, Evas* c
 void ewk_settings_proxy_uri_set(const char* proxy)
 {
 #if USE(SOUP)
+    SoupSession* session = WebCore::ResourceHandle::defaultSession();
+
+    if (!proxy) {
+        ERR("no proxy uri. remove proxy feature in soup.");
+        soup_session_remove_feature_by_type(session, SOUP_TYPE_PROXY_RESOLVER);
+        return;
+    }
+
     SoupURI* uri = soup_uri_new(proxy);
     EINA_SAFETY_ON_NULL_RETURN(uri);