diff options
| author | Milan Crha <mcrha@redhat.com> | 2013-07-16 00:40:38 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2013-07-16 00:40:38 +0800 |
| commit | dcf302c2ba303a26f6f6a356f2f71f22f81eeb02 (patch) | |
| tree | 12b328d3f649d8751c0df6236fdeb5edc70f9c87 /mail | |
| parent | 6565a88ded370eb48a25377f46b5fb2a7c9307f5 (diff) | |
| download | gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar.gz gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar.bz2 gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar.lz gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar.xz gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.tar.zst gsoc2013-evolution-dcf302c2ba303a26f6f6a356f2f71f22f81eeb02.zip | |
Bug #703389 - Proxy ignored for images
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-http-request.c | 14 | ||||
| -rw-r--r-- | mail/e-mail-autoconfig.c | 15 |
2 files changed, 29 insertions, 0 deletions
diff --git a/mail/e-http-request.c b/mail/e-http-request.c index 14bfdda181..fb516f98ba 100644 --- a/mail/e-http-request.c +++ b/mail/e-http-request.c @@ -334,6 +334,7 @@ handle_http_request (GSimpleAsyncResult *res, CamelStream *cache_stream; GError *error; GMainContext *context; + EProxy *proxy; context = g_main_context_new (); g_main_context_push_thread_default (context); @@ -342,6 +343,19 @@ handle_http_request (GSimpleAsyncResult *res, SOUP_SESSION_TIMEOUT, 90, NULL); + proxy = e_proxy_new (); + e_proxy_setup_proxy (proxy); + + if (e_proxy_require_proxy_for_uri (proxy, uri)) { + SoupURI *proxy_uri; + + proxy_uri = e_proxy_peek_uri_for (proxy, uri); + + g_object_set (session, SOUP_SESSION_PROXY_URI, proxy_uri, NULL); + } + + g_clear_object (&proxy); + message = soup_message_new (SOUP_METHOD_GET, uri); soup_message_headers_append ( message->request_headers, "User-Agent", "Evolution/" VERSION); diff --git a/mail/e-mail-autoconfig.c b/mail/e-mail-autoconfig.c index 61fe0c6f75..ca0b96405f 100644 --- a/mail/e-mail-autoconfig.c +++ b/mail/e-mail-autoconfig.c @@ -377,10 +377,25 @@ mail_autoconfig_lookup (EMailAutoconfig *autoconfig, gboolean success; guint status; gchar *uri; + EProxy *proxy; soup_session = soup_session_sync_new (); uri = g_strconcat (AUTOCONFIG_BASE_URI, domain, NULL); + + proxy = e_proxy_new (); + e_proxy_setup_proxy (proxy); + + if (e_proxy_require_proxy_for_uri (proxy, uri)) { + SoupURI *proxy_uri; + + proxy_uri = e_proxy_peek_uri_for (proxy, uri); + + g_object_set (soup_session, SOUP_SESSION_PROXY_URI, proxy_uri, NULL); + } + + g_clear_object (&proxy); + soup_message = soup_message_new (SOUP_METHOD_GET, uri); g_free (uri); |