[gnurl] 244/282: urldata: remove the 'stream_was_rewound' connectdata struct member

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 6f17df7a6afcc600d96fb02d125aa2932540eff1
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Mar 5 23:52:41 2020 +0100

    urldata: remove the 'stream_was_rewound' connectdata struct member
    
    ... as it is never set anywhere.
    
    Follow-up to 2f44e94ef
    Closes #5046
---
 lib/transfer.c | 6 ++----
 lib/urldata.h  | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/transfer.c b/lib/transfer.c
index ead8b36db..f015b9120 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -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;
diff --git a/lib/urldata.h b/lib/urldata.h
index e1348cf29..9e4626530 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -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. */

-- 
To stop receiving notification emails like this one, please contact
address@hidden.