Changeset 63972 in webkit

Timestamp:

Jul 23, 2010 7:34:26 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-23 Gyuyoung Kim <​gyuyoung.kim@samsung.com>

Reviewed by Kenneth Rohde Christiansen.

[EFL] Set proxy address for Soup
​https://bugs.webkit.org/show_bug.cgi?id=42721

Sets the given proxy URI for libsoup network backend. This method will
support libcurl network backend later.

• EWebLauncher/main.c: (main): Invoke proxy set method
• ewk/ewk_settings.cpp: (ewk_settings_proxy_uri_set): Sets proxy URI.
• ewk/ewk_settings.h:

Location:

trunk/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• EWebLauncher/main.c (modified) (2 diffs)
• ewk/ewk_settings.cpp (modified) (2 diffs)
• ewk/ewk_settings.h (modified) (1 diff)

trunk/WebKit/efl/ChangeLog

@@ +1 @@
+2010-07-23  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Set proxy address for Soup
+        https://bugs.webkit.org/show_bug.cgi?id=42721
+
+        Sets the given proxy URI for libsoup network backend. This method will
+        support libcurl network backend later.
+
+        * EWebLauncher/main.c:
+        (main): Invoke proxy set method
+        * ewk/ewk_settings.cpp:
+        (ewk_settings_proxy_uri_set): Sets proxy URI.
+        * ewk/ewk_settings.h:
+
 2010-07-16  Leandro Pereira  <leandro@profusion.mobi>
 

trunk/WebKit/efl/EWebLauncher/main.c

@@ -773 +773 @@
     char *userAgent = NULL;
     const char *tmp;
+    const char *proxyUri;
     char path[PATH_MAX];
 
@@ -835 +836 @@
     ewk_settings_web_database_path_set(path);
 
+    proxyUri = getenv("http_proxy");
+    if (proxyUri)
+        ewk_settings_proxy_uri_set(proxyUri);
+
     browserCreate(url, theme, userAgent, geometry, engine, isFullscreen);
     ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, &windows);

trunk/WebKit/efl/ewk/ewk_settings.cpp

@@ -39 +39 @@
 #include <sys/types.h>
 #include <unistd.h>
+
+#if USE(SOUP)
+#include "ResourceHandle.h"
+#include <libsoup/soup.h>
+#endif
 
 static uint64_t _ewk_default_web_database_quota = 1 * 1024 * 1024;
@@ -224 +229 @@
     return ewk_util_image_from_cairo_surface_add(canvas, surface);
 }
+
+/**
+ * Sets the given proxy URI to network backend.
+ *
+ * @param proxy URI.
+ */
+void ewk_settings_proxy_uri_set(const char* proxy)
+{
+#if USE(SOUP)
+    SoupURI* uri = soup_uri_new(proxy);
+    EINA_SAFETY_ON_NULL_RETURN(uri);
+
+    SoupSession* session = WebCore::ResourceHandle::defaultSession();
+    g_object_set(session, SOUP_SESSION_PROXY_URI, uri, NULL);
+    soup_uri_free(uri);
+#elif USE(CURL)
+    EINA_SAFETY_ON_TRUE_RETURN(1);
+#endif
+}

trunk/WebKit/efl/ewk/ewk_settings.h

@@ -49 +49 @@
 EAPI Evas_Object     *ewk_settings_icon_database_icon_object_add(const char *url, Evas *canvas);
 
+EAPI void            ewk_settings_proxy_uri_set(const char* proxy);
 
 #ifdef __cplusplus