summaryrefslogtreecommitdiff
path: root/ftp/curl/files/patch-lib-ssluse.c
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2013-10-06 18:36:49 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2013-10-06 18:36:49 +0000
commitb8e23784848ada08e4242685cbea03532b500fc7 (patch)
tree54caf81fa31c7c2c46fc12dda00bd8c7db30b323 /ftp/curl/files/patch-lib-ssluse.c
parent- Update to 2.0.1 (diff)
- 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
Notes
Notes: svn path=/head/; revision=329619
Diffstat (limited to 'ftp/curl/files/patch-lib-ssluse.c')
-rw-r--r--ftp/curl/files/patch-lib-ssluse.c28
1 files changed, 0 insertions, 28 deletions
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;