summaryrefslogtreecommitdiff
path: root/lib/socks.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-09-22 23:12:00 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-09-22 23:12:00 +0000
commit391e8afd1f6695cb57738790676cfa4d57d54bcb (patch)
tree5752243fa1fbf088953fa101c0a542873f2050cb /lib/socks.c
parenteff2c3a621c539713ecd641c020f06ac28a7ea1d (diff)
downloadcurl-391e8afd1f6695cb57738790676cfa4d57d54bcb.tar.gz
- Made the SOCKS code use the new Curl_read_plain() function to fix the bug
Markus Moeller reported: http://curl.haxx.se/mail/archive-2008-09/0016.html - recv() errors other than those equal to EAGAIN now cause proper CURLE_RECV_ERROR to get returned. This made test case 160 fail so I've now disabled it until we can figure out another way to exercise that logic.
Diffstat (limited to 'lib/socks.c')
-rw-r--r--lib/socks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/socks.c b/lib/socks.c
index d2cb65522..9bbb0a7f4 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -88,7 +88,7 @@ static int blockread_all(struct connectdata *conn, /* connection data */
result = ~CURLE_OK;
break;
}
- result = Curl_read(conn, sockfd, buf, buffersize, &nread);
+ result = Curl_read_plain(sockfd, buf, buffersize, &nread);
if(result)
break;