drop 0004-curl-7.21.3-bz650255.patch

This has been already fixed upstream (commits 5c7c9a7 and 5965d45).
This commit is contained in:
Kamil Dudka 2010-12-16 18:08:15 +01:00
parent 0a2e77997c
commit dd545452bb
2 changed files with 0 additions and 23 deletions

View File

@ -1,19 +0,0 @@
lib/url.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/lib/url.c b/lib/url.c
index 1b65a92..4e2bce6 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2910,6 +2910,11 @@
check->data = data;
infof(data, "Connection #%ld seems to be dead!\n", i);
+ if(check->protocol & PROT_FTP)
+ /* FTP: avoid sending QUIT and waiting for response on a dead
+ * connection */
+ check->proto.ftpc.ctl_valid = FALSE;
+
/* disconnect resources */
Curl_disconnect(check, /* dead_connection */ TRUE);
data->state.connc->connects[i]=NULL; /* nothing here */

View File

@ -8,9 +8,6 @@ Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
Source2: curlbuild.h
Source3: hide_selinux.c
# do not send QUIT to a dead FTP control connection (#650255)
Patch4: 0004-curl-7.21.3-bz650255.patch
# Avoid buffer overflow report from glibc with FORTIFY_SOURCE
Patch5: 0005-curl-7.21.3-tftpd-buffer-overflow.patch
@ -110,7 +107,6 @@ for f in CHANGES README; do
done
# upstream patches (not yet applied)
%patch4 -p1
%patch5 -p1
# Fedora patches