aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-05-07 23:30:52 +0200
committerKamil Dudka <kdudka@redhat.com>2013-05-09 11:23:15 +0200
commit01a2abedd7e3a2075de70979003302313570c58c (patch)
treef2d084bff32b9fa596a0d530b2bc32f9a4fa387c
parenta45e3f93e4e8e19786bc33839c95b8220ee487e8 (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.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/nss.c b/lib/nss.c
index a2c5c63c6..cc3d9c91b 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -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();