Hello community,
here is the log from the commit of package curl for openSUSE:Factory checked in
at 2019-03-27 16:11:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/curl (Old)
and /work/SRC/openSUSE:Factory/.curl.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "curl"
Wed Mar 27 16:11:56 2019 rev:144 rq:686085 version:7.64.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/curl/curl-mini.changes 2019-03-11
11:14:22.709360313 +0100
+++ /work/SRC/openSUSE:Factory/.curl.new.25356/curl-mini.changes
2019-03-27 16:11:58.323658838 +0100
@@ -1,0 +2,7 @@
+Mon Mar 18 10:34:14 UTC 2019 - Pedro Monreal Gonzalez
<pmonrealgonza...@suse.com>
+
+- Fix variable placement that wasn't properly reset within a loop
+ missing to notify sockets. [bsc#1129083, bsc#1129470]
+ * Added curl-singlesocket-sincebefore-placement.patch
+
+-------------------------------------------------------------------
curl.changes: same change
New:
----
curl-singlesocket-sincebefore-placement.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ curl-mini.spec ++++++
--- /var/tmp/diff_new_pack.kNCUC5/_old 2019-03-27 16:11:59.827658455 +0100
+++ /var/tmp/diff_new_pack.kNCUC5/_new 2019-03-27 16:11:59.831658453 +0100
@@ -49,6 +49,8 @@
# PATCH-FIX-UPSTREAM boo#1127849 fix a crash in libcurl
Patch6: 0001-connection_check-set-data-to-the-transfer-doing-the-.patch
Patch7: 0002-connection_check-restore-original-conn-data-after-th.patch
+# PATCH-FIX-UPSTREAM bsc#1129083 bsc#1129470 Fix sincebefore variable placement
+Patch8: curl-singlesocket-sincebefore-placement.patch
BuildRequires: libtool
BuildRequires: pkgconfig
Requires: libcurl4%{?mini} = %{version}
@@ -134,6 +136,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
# curl complains if macro definition is contained in CFLAGS
++++++ curl.spec ++++++
--- /var/tmp/diff_new_pack.kNCUC5/_old 2019-03-27 16:11:59.855658448 +0100
+++ /var/tmp/diff_new_pack.kNCUC5/_new 2019-03-27 16:11:59.855658448 +0100
@@ -47,6 +47,8 @@
# PATCH-FIX-UPSTREAM boo#1127849 fix a crash in libcurl
Patch6: 0001-connection_check-set-data-to-the-transfer-doing-the-.patch
Patch7: 0002-connection_check-restore-original-conn-data-after-th.patch
+# PATCH-FIX-UPSTREAM bsc#1129083 bsc#1129470 Fix sincebefore variable placement
+Patch8: curl-singlesocket-sincebefore-placement.patch
BuildRequires: libtool
BuildRequires: pkgconfig
Requires: libcurl4%{?mini} = %{version}
@@ -132,6 +134,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
# curl complains if macro definition is contained in CFLAGS
++++++ curl-singlesocket-sincebefore-placement.patch ++++++
>From afc00e047c773faeaa60a5f86a246cbbeeba5819 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <dan...@haxx.se>
Date: Tue, 19 Feb 2019 15:56:54 +0100
Subject: [PATCH] singlesocket: fix the 'sincebefore' placement
The variable wasn't properly reset within the loop and thus could remain
set for sockets that hadn't been set before and miss notifying the app.
This is a follow-up to 4c35574 (shipped in curl 7.64.0)
Reported-by: buzo-ffm on github
Detected-by: Jan Alexander Steffens
Fixes #3585
Closes #3589
---
lib/multi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/multi.c b/lib/multi.c
index aaae8b9786..521262b2b2 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -2349,8 +2349,6 @@ static CURLMcode singlesocket(struct Curl_multi *multi,
int num;
unsigned int curraction;
int actions[MAX_SOCKSPEREASYHANDLE];
- unsigned int comboaction;
- bool sincebefore = FALSE;
for(i = 0; i< MAX_SOCKSPEREASYHANDLE; i++)
socks[i] = CURL_SOCKET_BAD;
@@ -2369,6 +2367,8 @@ static CURLMcode singlesocket(struct Curl_multi *multi,
i++) {
unsigned int action = CURL_POLL_NONE;
unsigned int prevaction = 0;
+ unsigned int comboaction;
+ bool sincebefore = FALSE;
s = socks[i];
