[libsoup] Revert "Abort session after a new proxy resolver is set"



commit 8d337030bd7b4c7a9c141765cc5bcedbffe3d7e0
Author: Dan Winship <danw gnome org>
Date:   Sun Apr 30 14:23:37 2017 -0400

    Revert "Abort session after a new proxy resolver is set"
    
    This reverts commit 28849060f5b8d8829bc4fc6d208d22f15e869f46.
    
    There was no compelling need for the change, just consistency, but it
    apparently broke things.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=781590

 libsoup/soup-session.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
index 20054f3..f7aef68 100644
--- a/libsoup/soup-session.c
+++ b/libsoup/soup-session.c
@@ -623,8 +623,6 @@ 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
@@ -646,6 +644,7 @@ 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:
@@ -3218,8 +3217,7 @@ 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. Setting this property will also
-        * cancel all currently pending messages.
+        * been added to the session.
         *
         * By default, in a plain #SoupSession, this is set to the
         * default #GProxyResolver, but you can set it to %NULL if you


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]