diff options
| author | Carlos Garcia Campos <cgarcia@igalia.com> | 2017-01-16 15:08:43 +0100 |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2017-02-22 09:23:17 +0100 |
| commit | 28849060f5b8d8829bc4fc6d208d22f15e869f46 (patch) | |
| tree | f1ae1114475af6b5c2d4a7b0ddc5d7bb3612c9a7 | |
| parent | 5efaac686e5b6b50705603838b3afdda15e8310d (diff) | |
| download | libsoup-28849060f5b8d8829bc4fc6d208d22f15e869f46.tar.gz | |
Abort session after a new proxy resolver is set
It's currently don only when proxy-uri property is set, but it should
always be done after a new proxy resolver is set.
https://bugzilla.gnome.org/show_bug.cgi?id=777326
| -rw-r--r-- | libsoup/soup-session.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c index f7aef68e..20054f31 100644 --- a/libsoup/soup-session.c +++ b/libsoup/soup-session.c @@ -623,6 +623,8 @@ set_proxy_resolver (SoupSession *session, SoupURI *uri, G_GNUC_END_IGNORE_DEPRECATIONS; } else if (g_resolver) priv->proxy_resolver = g_object_ref (g_resolver); + + soup_session_abort (session); } static void @@ -644,7 +646,6 @@ soup_session_set_property (GObject *object, guint prop_id, case PROP_PROXY_URI: set_proxy_resolver (session, g_value_get_boxed (value), NULL, NULL); - soup_session_abort (session); socket_props_changed = TRUE; break; case PROP_PROXY_RESOLVER: @@ -3217,7 +3218,8 @@ soup_session_class_init (SoupSessionClass *session_class) * A #GProxyResolver to use with this session. Setting this * will clear the #SoupSession:proxy-uri property, and remove * any <type>SoupProxyURIResolver</type> features that have - * been added to the session. + * been added to the session. Setting this property will also + * cancel all currently pending messages. * * By default, in a plain #SoupSession, this is set to the * default #GProxyResolver, but you can set it to %NULL if you |