diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2009-03-07 03:57:38 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2009-03-07 03:57:38 +0000 |
| commit | 1ec0906e4945a23baf1df56c0385c9ccf9ac8e67 (patch) | |
| tree | 9b7f56d2e9ae6066ea2e877834065970cab6d44c /ftp/curl/files/patch-lib::ftp.c | |
| parent | Remove math/cxsc per expiration note. (diff) | |
Update to curl-7.19.4, which fixes a redirection vulnerability.
The changes in the patch files are almost the same as in Eugene's PR,
although I arrived at them mostly independently :)
Reformat all patch files now that I use quilt to manage them.
Fix two complaints from portlint: needless use of CFLAGS and differentiation
between NOPORTDOCS and NOPORTEXAMPLES. Thanks, Eugene!
PR: 132358
Submitted by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Notes
Notes:
svn path=/head/; revision=229602
Diffstat (limited to 'ftp/curl/files/patch-lib::ftp.c')
| -rw-r--r-- | ftp/curl/files/patch-lib::ftp.c | 44 |
1 files changed, 5 insertions, 39 deletions
diff --git a/ftp/curl/files/patch-lib::ftp.c b/ftp/curl/files/patch-lib::ftp.c index d2a0b8e3f965..640d0c116ebd 100644 --- a/ftp/curl/files/patch-lib::ftp.c +++ b/ftp/curl/files/patch-lib::ftp.c @@ -1,24 +1,8 @@ ---- ../../../tags/curl-7.19.2-stock/lib/ftp.c 2009-01-23 18:11:47.000000000 +0200 -+++ lib/ftp.c 2009-01-26 03:31:07.000000000 +0200 -@@ -1901,7 +1901,7 @@ - result = CURLE_COULDNT_CONNECT; - break; - } --#ifndef CURL_DISABLE_HTTP -+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY) - if(conn->bits.tunnel_proxy && conn->bits.httpproxy) { - /* FIX: this MUST wait for a proper connect first if 'connected' is - * FALSE */ -@@ -1927,7 +1927,7 @@ - if(CURLE_OK != result) - return result; - } --#endif /* CURL_DISABLE_HTTP */ -+#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_PROXY */ - - state(conn, FTP_STOP); /* this phase is completed */ - -@@ -3056,7 +3056,7 @@ +Handle CURL_DISABLE_PROXY properly. + +--- a/lib/ftp.c ++++ b/lib/ftp.c +@@ -3055,7 +3055,7 @@ bool *done) /* see description above */ { CURLcode result; @@ -27,21 +11,3 @@ /* for FTP over HTTP proxy */ struct HTTP http_proxy; struct FTP *ftp_save; -@@ -3079,7 +3079,7 @@ - - ftpc->response_time = RESP_TIMEOUT; /* set default response time-out */ - --#ifndef CURL_DISABLE_HTTP -+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY) - if(conn->bits.tunnel_proxy && conn->bits.httpproxy) { - /* BLOCKING */ - /* We want "seamless" FTP operations through HTTP proxy tunnel */ -@@ -3102,7 +3102,7 @@ - if(CURLE_OK != result) - return result; - } --#endif /* CURL_DISABLE_HTTP */ -+#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_PROXY */ - - if(conn->protocol & PROT_FTPS) { - /* BLOCKING */ |