diff options
Diffstat (limited to 'lib/transfer.c')
| -rw-r--r-- | lib/transfer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/transfer.c b/lib/transfer.c index 2a044a9ea..80a2a75f9 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -859,7 +859,8 @@ Transfer(struct connectdata *c_conn) conn->upload_bufsize=(long)min(data->progress.ulspeed, BUFSIZE); } - if (data->set.timeout && (Curl_tvdiff (now, start) > data->set.timeout)) { + if (data->set.timeout && + ((Curl_tvdiff(now, start)/1000) > data->set.timeout)) { failf (data, "Operation timed out with %d out of %d bytes received", bytecount, conn->size); return CURLE_OPERATION_TIMEOUTED; @@ -984,7 +985,7 @@ CURLcode Curl_perform(struct SessionHandle *data) data->change.referer_alloc = TRUE; /* yes, free this later */ } - if(2 != sscanf(newurl, "%15[^:]://%c", prot, &letter)) { + if(2 != sscanf(newurl, "%15[^?&/:]://%c", prot, &letter)) { /*** *DANG* this is an RFC 2068 violation. The URL is supposed to be absolute and this doesn't seem to be that! |