Related: #1690971 - remove verbose "Expire in" ... messages

This commit is contained in:
Kamil Dudka 2019-03-25 12:35:52 +01:00
parent 902ddefeb5
commit 7594f15bce
2 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 2e8f4d01cdd07779e0582257cb6b53c5a91d6504 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 11 Feb 2019 22:57:33 +0100
Subject: [PATCH] multi: remove verbose "Expire in" ... messages
Reported-by: James Brown
Bug: https://curl.haxx.se/mail/archive-2019-02/0013.html
Closes #3558
Upstream-commit: aabc7ae5ecf70973add429b5acbc86d6a57e4da5
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
lib/multi.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/multi.c b/lib/multi.c
index 28f4c47..856cc22 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -3028,9 +3028,6 @@ void Curl_expire(struct Curl_easy *data, time_t milli, expire_id id)
DEBUGASSERT(id < EXPIRE_LAST);
- infof(data, "Expire in %ld ms for %x (transfer %p)\n",
- (long)milli, id, data);
-
set = Curl_now();
set.tv_sec += milli/1000;
set.tv_usec += (unsigned int)(milli%1000)*1000;
--
2.17.2

View File

@ -1,7 +1,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
Version: 7.64.0
Release: 5%{?dist}
Release: 6%{?dist}
License: MIT
Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
@ -17,6 +17,9 @@ Patch3: 0003-curl-7.64.0-cookie-segfault.patch
# avoid spurious "Could not resolve host: [host name]" error messages
Patch4: 0004-curl-7.64.0-spurious-resolver-error.patch
# remove verbose "Expire in" ... messages (#1690971)
Patch5: 0005-curl-7.64.0-expire-in-verbose-msgs.patch
# patch making libcurl multilib ready
Patch101: 0101-curl-7.32.0-multilib.patch
@ -182,6 +185,7 @@ be installed.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# Fedora patches
%patch101 -p1
@ -349,6 +353,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
%{_libdir}/libcurl.so.4.[0-9].[0-9].minimal
%changelog
* Mon Mar 25 2019 Kamil Dudka <kdudka@redhat.com> - 7.64.0-6
- remove verbose "Expire in" ... messages (#1690971)
* Wed Mar 21 2019 Kamil Dudka <kdudka@redhat.com> - 7.64.0-5
- avoid spurious "Could not resolve host: [host name]" error messages