mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 16:18:48 -05:00
better check for absolute URL redirects, adjusted to new Curl_tvdiff() proto
This commit is contained in:
parent
8e91d5de8e
commit
2c5e416591
@ -859,7 +859,8 @@ Transfer(struct connectdata *c_conn)
|
|||||||
conn->upload_bufsize=(long)min(data->progress.ulspeed, BUFSIZE);
|
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",
|
failf (data, "Operation timed out with %d out of %d bytes received",
|
||||||
bytecount, conn->size);
|
bytecount, conn->size);
|
||||||
return CURLE_OPERATION_TIMEOUTED;
|
return CURLE_OPERATION_TIMEOUTED;
|
||||||
@ -984,7 +985,7 @@ CURLcode Curl_perform(struct SessionHandle *data)
|
|||||||
data->change.referer_alloc = TRUE; /* yes, free this later */
|
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
|
*DANG* this is an RFC 2068 violation. The URL is supposed
|
||||||
to be absolute and this doesn't seem to be that!
|
to be absolute and this doesn't seem to be that!
|
||||||
|
Loading…
Reference in New Issue
Block a user