diff options
author | Daniel Stenberg <daniel@haxx.se> | 2013-05-07 23:30:52 +0200 |
---|---|---|
committer | Kamil Dudka <kdudka@redhat.com> | 2013-05-09 11:23:15 +0200 |
commit | 01a2abedd7e3a2075de70979003302313570c58c (patch) | |
tree | f2d084bff32b9fa596a0d530b2bc32f9a4fa387c | |
parent | a45e3f93e4e8e19786bc33839c95b8220ee487e8 (diff) |
nss: give PR_INTERVAL_NO_WAIT instead of -1 to PR_Recv/PR_Send
Reported by: David Strauss
Bug: http://curl.haxx.se/mail/lib-2013-05/0088.html
-rw-r--r-- | lib/nss.c | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -1482,10 +1482,8 @@ static ssize_t nss_send(struct connectdata *conn, /* connection data */ size_t len, /* amount to write */ CURLcode *curlcode) { - int rc; - - rc = PR_Send(conn->ssl[sockindex].handle, mem, (int)len, 0, -1); - + ssize_t rc = PR_Send(conn->ssl[sockindex].handle, mem, (int)len, 0, + PR_INTERVAL_NO_WAIT); if(rc < 0) { PRInt32 err = PR_GetError(); if(err == PR_WOULD_BLOCK_ERROR) @@ -1513,9 +1511,8 @@ static ssize_t nss_recv(struct connectdata * conn, /* connection data */ size_t buffersize, /* max amount to read */ CURLcode *curlcode) { - ssize_t nread; - - nread = PR_Recv(conn->ssl[num].handle, buf, (int)buffersize, 0, -1); + ssize_t nread = PR_Recv(conn->ssl[num].handle, buf, (int)buffersize, 0, + PR_INTERVAL_NO_WAIT); if(nread < 0) { /* failed SSL read */ PRInt32 err = PR_GetError(); |