From b8e23784848ada08e4242685cbea03532b500fc7 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sun, 6 Oct 2013 18:36:49 +0000 Subject: - Update to 7.32.0 - Turn COOKIES on by default - Support STAGEDIR Note: - mk-ca-bundle.1 will not be installed. Use http://curl.haxx.se/docs/caextract.html instead Changes: http://curl.haxx.se/changes.html PR: ports/181510 Exp run by: drewery --- ftp/curl/files/patch-lib-ssluse.c | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 ftp/curl/files/patch-lib-ssluse.c (limited to 'ftp/curl/files/patch-lib-ssluse.c') 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; -- cgit v1.2.3