diff options
author | Daniel Stenberg <daniel@haxx.se> | 2006-05-04 22:39:47 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2006-05-04 22:39:47 +0000 |
commit | e85e30546c89e17b6fb0cf383de25b7ed7f3bf3d (patch) | |
tree | 2a1b3fd6b5c6a93bbae756e8dcea01c7c43fa198 /lib/sendf.c | |
parent | 758f6eed5169f20635c410077b840c1ffb741ddb (diff) |
Roland Blom filed bug report #1481217
(http://curl.haxx.se/bug/view.cgi?id=1481217), with follow-ups by Michele Bini
and David Byron. libcurl previously wrongly used GetLastError() on windows to
get error details after socket-related function calls, when it really should
use WSAGetLastError() instead.
When changing to this, the former function Curl_ourerrno() is now instead
called Curl_sockerrno() as it is necessary to only use it to get errno from
socket-related functions as otherwise it won't work as intended on Windows.
Diffstat (limited to 'lib/sendf.c')
-rw-r--r-- | lib/sendf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sendf.c b/lib/sendf.c index a9cb58363..c922ce38e 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -335,7 +335,7 @@ CURLcode Curl_write(struct connectdata *conn, bytes_written = (ssize_t)swrite(sockfd, mem, len); if(-1 == bytes_written) { - int err = Curl_ourerrno(); + int err = Curl_sockerrno(); if( #ifdef WSAEWOULDBLOCK @@ -466,7 +466,7 @@ int Curl_read(struct connectdata *conn, /* connection data */ nread = sread(sockfd, buf, buffersize); if(-1 == nread) { - int err = Curl_ourerrno(); + int err = Curl_sockerrno(); #ifdef WIN32 if(WSAEWOULDBLOCK == err) #else |