diff --git a/0004-curl-7.21.3-bz650255.patch b/0004-curl-7.21.3-bz650255.patch deleted file mode 100644 index ccba647..0000000 --- a/0004-curl-7.21.3-bz650255.patch +++ /dev/null @@ -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 */ diff --git a/curl.spec b/curl.spec index 95805d6..4c367ec 100644 --- a/curl.spec +++ b/curl.spec @@ -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