diff options
| author | Lucas Eckels <eckels@google.com> | 2012-08-06 15:07:02 -0700 |
|---|---|---|
| committer | Lucas Eckels <eckels@google.com> | 2012-08-08 09:28:48 -0700 |
| commit | 9bd90e6e25f1e55f50201c87a1b5837de7e5b64a (patch) | |
| tree | d2061a00d7d0ee884170bc955fceeed2d0edf284 /lib/pingpong.c | |
| parent | e6f2b03027b5feb92b30f5d47801ec3fabe9fd95 (diff) | |
| download | android_external_curl-9bd90e6e25f1e55f50201c87a1b5837de7e5b64a.tar.gz android_external_curl-9bd90e6e25f1e55f50201c87a1b5837de7e5b64a.tar.bz2 android_external_curl-9bd90e6e25f1e55f50201c87a1b5837de7e5b64a.zip | |
Add Music Manager's curl 7.21.2 source.
Change-Id: I259a43fa52d581524a5ce8ae1711467acb1d9d50
Diffstat (limited to 'lib/pingpong.c')
| -rw-r--r-- | lib/pingpong.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/pingpong.c b/lib/pingpong.c index c6b6f2f..876a6a2 100644 --- a/lib/pingpong.c +++ b/lib/pingpong.c @@ -322,7 +322,7 @@ CURLcode Curl_pp_readresp(curl_socket_t sockfd, */ DEBUGASSERT((ptr+pp->cache_size) <= (buf+BUFSIZE+1)); memcpy(ptr, pp->cache, pp->cache_size); - gotbytes = pp->cache_size; + gotbytes = (ssize_t)pp->cache_size; free(pp->cache); /* free the cache */ pp->cache = NULL; /* clear the pointer */ pp->cache_size = 0; /* zero the size just in case */ @@ -340,8 +340,7 @@ CURLcode Curl_pp_readresp(curl_socket_t sockfd, #if defined(HAVE_KRB4) || defined(HAVE_GSSAPI) conn->data_prot = prot; #endif - if(res < 0) - /* EWOULDBLOCK */ + if(res == CURLE_AGAIN) return CURLE_OK; /* return */ #ifdef CURL_DOES_CONVERSIONS @@ -387,8 +386,8 @@ CURLcode Curl_pp_readresp(curl_socket_t sockfd, if(!conn->sec_complete) #endif if(data->set.verbose) - Curl_debug(data, CURLINFO_HEADER_IN, - pp->linestart_resp, (size_t)perline, conn); + Curl_debug(data, CURLINFO_HEADER_IN, + pp->linestart_resp, (size_t)perline, conn); /* * We pass all response-lines to the callback function registered |