mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
urldata: remove the 'stream_was_rewound' connectdata struct member
... as it is never set anywhere.
Follow-up to 2f44e94ef
Closes #5046
This commit is contained in:
parent
8aa04e9a24
commit
6f17df7a6a
@ -890,7 +890,7 @@ static CURLcode readwrite_data(struct Curl_easy *data,
|
|||||||
|
|
||||||
} /* if(!header and data to read) */
|
} /* if(!header and data to read) */
|
||||||
|
|
||||||
if(conn->handler->readwrite && excess && !conn->bits.stream_was_rewound) {
|
if(conn->handler->readwrite && excess) {
|
||||||
/* Parse the excess data */
|
/* Parse the excess data */
|
||||||
k->str += nread;
|
k->str += nread;
|
||||||
|
|
||||||
@ -1234,9 +1234,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
|
|||||||
/* We go ahead and do a read if we have a readable socket or if
|
/* We go ahead and do a read if we have a readable socket or if
|
||||||
the stream was rewound (in which case we have data in a
|
the stream was rewound (in which case we have data in a
|
||||||
buffer) */
|
buffer) */
|
||||||
if((k->keepon & KEEP_RECV) &&
|
if((k->keepon & KEEP_RECV) && (select_res & CURL_CSELECT_IN)) {
|
||||||
((select_res & CURL_CSELECT_IN) || conn->bits.stream_was_rewound)) {
|
|
||||||
|
|
||||||
result = readwrite_data(data, conn, k, &didwhat, done, comeback);
|
result = readwrite_data(data, conn, k, &didwhat, done, comeback);
|
||||||
if(result || *done)
|
if(result || *done)
|
||||||
return result;
|
return result;
|
||||||
|
@ -464,8 +464,6 @@ struct ConnectBits {
|
|||||||
#endif
|
#endif
|
||||||
BIT(netrc); /* name+password provided by netrc */
|
BIT(netrc); /* name+password provided by netrc */
|
||||||
BIT(userpwd_in_url); /* name+password found in url */
|
BIT(userpwd_in_url); /* name+password found in url */
|
||||||
BIT(stream_was_rewound); /* The stream was rewound after a request read
|
|
||||||
past the end of its response byte boundary */
|
|
||||||
BIT(proxy_connect_closed); /* TRUE if a proxy disconnected the connection
|
BIT(proxy_connect_closed); /* TRUE if a proxy disconnected the connection
|
||||||
in a CONNECT request with auth, so that
|
in a CONNECT request with auth, so that
|
||||||
libcurl should reconnect and continue. */
|
libcurl should reconnect and continue. */
|
||||||
|
Loading…
Reference in New Issue
Block a user