Attachment #82869 for bug #54621

View Details Raw Unified Return to Bug 54621

| Differences between



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

        Reviewed by NOBODY (OOPS!).

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

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

        * ewk/ewk_settings.cpp:
        (ewk_settings_proxy_uri_set):

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

        Unreviewed build fix.



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);

    SoupSession* session = WebCore::ResourceHandle::defaultSession();
    g_object_set(session, SOUP_SESSION_PROXY_URI, uri, NULL);
    soup_uri_free(uri);
#elif USE(CURL)

Return to Bug 54621

Lines 279-288 Evas_Object* ewk_settings_icon_database_icon_object_add(const char* url, Evas* c a/Source/WebKit/efl/ewk/ewk_settings.cpp_sec1
- a/Source/WebKit/efl/ewk/ewk_settings.cpp -1 / +8 lines
279	void ewk_settings_proxy_uri_set(const char* proxy)	279	void ewk_settings_proxy_uri_set(const char* proxy)
280	{	280	{
281	#if USE(SOUP)	281	#if USE(SOUP)
		282	SoupSession* session = WebCore::ResourceHandle::defaultSession();
		283
		284	if (!proxy) {
		285	ERR("no proxy uri. remove proxy feature in soup.");
		286	soup_session_remove_feature_by_type(session, SOUP_TYPE_PROXY_RESOLVER);
		287	return;
		288	}
		289
282	SoupURI* uri = soup_uri_new(proxy);	290	SoupURI* uri = soup_uri_new(proxy);
283	EINA_SAFETY_ON_NULL_RETURN(uri);	291	EINA_SAFETY_ON_NULL_RETURN(uri);
284		292
285	SoupSession* session = WebCore::ResourceHandle::defaultSession();
286	g_object_set(session, SOUP_SESSION_PROXY_URI, uri, NULL);	293	g_object_set(session, SOUP_SESSION_PROXY_URI, uri, NULL);
287	soup_uri_free(uri);	294	soup_uri_free(uri);
288	#elif USE(CURL)	295	#elif USE(CURL)

Lines 1-3 a/Source/WebKit/efl/ChangeLog_sec1
- a/Source/WebKit/efl/ChangeLog +12 lines
		1	2011-02-17 Gyuyoung Kim <gyuyoung.kim@samsung.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	[EFL] Remove proxy feature of soup when proxy is null
		6	https://bugs.webkit.org/show_bug.cgi?id=54621
		7
		8	When proxy value is NULL, removes proxy feature in soup.
		9
		10	* ewk/ewk_settings.cpp:
		11	(ewk_settings_proxy_uri_set):
		12
1	2011-02-16 Gyuyoung Kim <gyuyoung.kim@samsung.com>	13	2011-02-16 Gyuyoung Kim <gyuyoung.kim@samsung.com>
2		14
3	Unreviewed build fix.	15	Unreviewed build fix.