From 18e1bee8d55087681fc3d9ffba58ffedbf58ee6e Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Tue, 31 Mar 2009 14:49:25 +0000
Subject: [PATCH] Properly return an error code in curl_easy_recv (reported by
Jim Freeman).
---
CHANGES | 3 +++
lib/easy.c | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CHANGES b/CHANGES
index 66b24f7197..7b4b5c09db 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
Changelog
+Daniel Fandrich (31 Mar 2009)
+- Properly return an error code in curl_easy_recv (reported by Jim Freeman).
+
Daniel Stenberg (18 Mar 2009)
- Kamil Dudka brought a patch that enables 6 additional crypto algorithms when
NSS is used. These ciphers were added in NSS 3.4 and require to be enabled
diff --git a/lib/easy.c b/lib/easy.c
index dc6c59366c..a581934950 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -1095,8 +1095,8 @@ CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen, size_t *n)
if(ret1 == -1)
return CURLE_AGAIN;
- if(n1 == -1)
- return CURLE_RECV_ERROR;
+ if(ret1 != CURLE_OK)
+ return ret1;
*n = (size_t)n1;
--
GitLab