moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

urldata: remove the 'stream_was_rewound' connectdata struct member

Browse Source 
... as it is never set anywhere.

Follow-up to 2f44e94ef
Closes #5046
This commit is contained in:
Daniel Stenberg 2020-03-05 23:52:41 +01:00
parent 8aa04e9a24
commit 6f17df7a6a
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/transfer.c
View File

@ -890,7 +890,7 @@ static CURLcode readwrite_data(struct Curl_easy *data,
} /* 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 */
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
the stream was rewound (in which case we have data in a
buffer) */
if((k->keepon & KEEP_RECV) &&
((select_res & CURL_CSELECT_IN) || conn->bits.stream_was_rewound)) {
if((k->keepon & KEEP_RECV) && (select_res & CURL_CSELECT_IN)) {
result = readwrite_data(data, conn, k, &didwhat, done, comeback);
if(result || *done)
return result;

2
lib/urldata.h
View File

@ -464,8 +464,6 @@ struct ConnectBits {
#endif
BIT(netrc); /* name+password provided by netrc */
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
in a CONNECT request with auth, so that
libcurl should reconnect and continue. */