Add patch for GNONE bug #781590 (Fails to connect to server due to request cancel)
This commit is contained in:
parent
592b6162d3
commit
6a34e67c97
49
libsoup-2.58.0-request-cancel.patch
Normal file
49
libsoup-2.58.0-request-cancel.patch
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
From 8d337030bd7b4c7a9c141765cc5bcedbffe3d7e0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dan Winship <danw@gnome.org>
|
||||||
|
Date: Sun, 30 Apr 2017 14:23:37 -0400
|
||||||
|
Subject: 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 file 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
|
||||||
|
--
|
||||||
|
cgit v0.12
|
||||||
|
|
@ -2,13 +2,15 @@
|
|||||||
|
|
||||||
Name: libsoup
|
Name: libsoup
|
||||||
Version: 2.58.0
|
Version: 2.58.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Soup, an HTTP library implementation
|
Summary: Soup, an HTTP library implementation
|
||||||
|
|
||||||
License: LGPLv2
|
License: LGPLv2
|
||||||
URL: https://wiki.gnome.org/Projects/libsoup
|
URL: https://wiki.gnome.org/Projects/libsoup
|
||||||
Source0: https://download.gnome.org/sources/%{name}/2.58/%{name}-%{version}.tar.xz
|
Source0: https://download.gnome.org/sources/%{name}/2.58/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
Patch01: libsoup-2.58.0-request-cancel.patch
|
||||||
|
|
||||||
BuildRequires: glib2-devel >= %{glib2_version}
|
BuildRequires: glib2-devel >= %{glib2_version}
|
||||||
BuildRequires: glib-networking
|
BuildRequires: glib-networking
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
@ -42,6 +44,7 @@ you to develop applications that use the libsoup library.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch01 -p1 -b .request-cancel
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-static
|
%configure --disable-static
|
||||||
@ -81,6 +84,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
|||||||
%{_datadir}/vala/vapi/libsoup-2.4.vapi
|
%{_datadir}/vala/vapi/libsoup-2.4.vapi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 03 2017 Milan Crha <mcrha@redhat.com> - 2.58.0-2
|
||||||
|
- Add patch for GNONE bug #781590 (Fails to connect to server due to request cancel)
|
||||||
|
|
||||||
* Thu Apr 20 2017 Kalev Lember <klember@redhat.com> - 2.58.0-1
|
* Thu Apr 20 2017 Kalev Lember <klember@redhat.com> - 2.58.0-1
|
||||||
- Update to 2.58.0
|
- Update to 2.58.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user