diff options
Diffstat (limited to 'ftp/curl/files')
| -rw-r--r-- | ftp/curl/files/patch-configure | 14 | ||||
| -rw-r--r-- | ftp/curl/files/patch-lib-ssluse.c | 28 | ||||
| -rw-r--r-- | ftp/curl/files/patch-src-tool_operate.c | 16 |
3 files changed, 18 insertions, 40 deletions
diff --git a/ftp/curl/files/patch-configure b/ftp/curl/files/patch-configure index 836ffde30adb..97aa3eab854a 100644 --- a/ftp/curl/files/patch-configure +++ b/ftp/curl/files/patch-configure @@ -22,7 +22,7 @@ Last-Update: 2010-12-19 -U*) xc_bad_var_cflags=yes ;; -@@ -16912,6 +16913,8 @@ +@@ -16922,6 +16923,8 @@ tmp_CFLAGS="$CFLAGS" tmp_CPPFLAGS="$CPPFLAGS" @@ -31,7 +31,7 @@ Last-Update: 2010-12-19 ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -16942,6 +16945,7 @@ +@@ -16952,6 +16955,7 @@ done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS @@ -39,7 +39,7 @@ Last-Update: 2010-12-19 # if test "$want_debug" = "yes"; then -@@ -17159,6 +17163,8 @@ +@@ -17169,6 +17173,8 @@ # if test "$honor_optimize_option" = "yes"; then @@ -48,7 +48,7 @@ Last-Update: 2010-12-19 ac_var_stripped="" for word1 in $tmp_CFLAGS; do ac_var_strip_word="no" -@@ -17189,6 +17195,7 @@ +@@ -17199,6 +17205,7 @@ done tmp_CPPFLAGS="$ac_var_stripped" squeeze tmp_CPPFLAGS @@ -56,7 +56,7 @@ Last-Update: 2010-12-19 if test "$want_optimize" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5 -@@ -21614,7 +21621,8 @@ +@@ -21624,7 +21631,8 @@ PKGTEST="no" PREFIX_OPENSSL=$OPT_SSL @@ -66,7 +66,7 @@ Last-Update: 2010-12-19 { $as_echo "$as_me:${as_lineno-$LINENO}: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&5 $as_echo "$as_me: PKG_CONFIG_LIBDIR will be set to \"$OPENSSL_PCDIR\"" >&6;} if test -f "$OPENSSL_PCDIR/openssl.pc"; then -@@ -24962,29 +24970,30 @@ +@@ -24972,29 +24980,30 @@ ;; off) LIB_RTMP="-lrtmp" @@ -106,7 +106,7 @@ Last-Update: 2010-12-19 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -39256,9 +39265,10 @@ +@@ -39266,9 +39275,10 @@ xc_bad_var_cflags=no for xc_word in $CFLAGS; do case "$xc_word" in diff --git a/ftp/curl/files/patch-lib-ssluse.c b/ftp/curl/files/patch-lib-ssluse.c deleted file mode 100644 index 7b6d65772865..000000000000 --- a/ftp/curl/files/patch-lib-ssluse.c +++ /dev/null @@ -1,28 +0,0 @@ ---- lib/ssluse.c.orig -+++ lib/ssluse.c -@@ -2608,13 +2608,19 @@ static ssize_t ossl_recv(struct connectdata *conn, /* connection data */ - *curlcode = CURLE_AGAIN; - return -1; - default: -- /* openssl/ssl.h says "look at error stack/return value/errno" */ -+ /* openssl/ssl.h for SSL_ERROR_SYSCALL says "look at error stack/return -+ value/errno" */ -+ /* http://www.openssl.org/docs/crypto/ERR_get_error.html */ - sslerror = ERR_get_error(); -- failf(conn->data, "SSL read: %s, errno %d", -- ERR_error_string(sslerror, error_buffer), -- SOCKERRNO); -- *curlcode = CURLE_RECV_ERROR; -- return -1; -+ if((nread < 0) || sslerror) { -+ /* If the return code was negative or there actually is an error in the -+ queue */ -+ failf(conn->data, "SSL read: %s, errno %d", -+ ERR_error_string(sslerror, error_buffer), -+ SOCKERRNO); -+ *curlcode = CURLE_RECV_ERROR; -+ return -1; -+ } - } - } - return nread; diff --git a/ftp/curl/files/patch-src-tool_operate.c b/ftp/curl/files/patch-src-tool_operate.c index 01c92c9beeed..34aca86c5537 100644 --- a/ftp/curl/files/patch-src-tool_operate.c +++ b/ftp/curl/files/patch-src-tool_operate.c @@ -1,6 +1,6 @@ ---- src/tool_operate.c.orig 2012-07-24 01:59:20.000000000 +0800 -+++ src/tool_operate.c 2012-09-22 20:54:44.439408357 +0800 -@@ -653,22 +653,10 @@ +--- src/tool_operate.c.orig 2013-08-01 04:53:34.000000000 +0800 ++++ src/tool_operate.c 2013-08-17 18:25:00.139780776 +0800 +@@ -709,20 +709,7 @@ DEBUGASSERT(!outs.filename); } @@ -19,14 +19,20 @@ - - if(config->resume_from) { + if(config->resume_from || config->resume_from_current) { + #ifdef __VMS + /* open file for output, forcing VMS output format into stream + mode which is needed for stat() call above to always work. */ +@@ -730,7 +717,8 @@ + "ctx=stm", "rfm=stmlf", "rat=cr", "mrs=0"); + #else /* open file for output: */ - FILE *file = fopen(outfile, config->resume_from?"ab":"wb"); + /* (always open for appending, it has no effect on new files) */ + FILE *file = fopen(outfile, "ab"); + #endif if(!file) { helpf(config->errors, "Can't open '%s'!\n", outfile); - res = CURLE_WRITE_ERROR; -@@ -676,6 +664,19 @@ +@@ -739,6 +727,19 @@ } outs.fopened = TRUE; outs.stream = file; |