From: Rider Linden <rider@lindenlab.com>
Date: Fri, 19 Feb 2016 19:18:33 +0000 (-0800)
Subject: url: skip to-be-closed connections when pipelining
X-Git-Tag: curl-7_51_0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5f0b1a;p=thirdparty%2Fcurl.git

url: skip to-be-closed connections when pipelining

No longer attempt to use "doomed" to-be-closed connections when
pipelining. Prior to this change connections marked for deletion (e.g.
timeout) would be erroneously used, resulting in sporadic crashes.

As originally reported and fixed by Carlo Wood (origin unknown).

Bug: https://github.com/curl/curl/issues/627
Reported-by: Rider Linden

Closes https://github.com/curl/curl/pull/1075
Participation-by: nopjmp@users.noreply.github.com
---

diff --git a/lib/url.c b/lib/url.c
index 74e9bf5c62..5e1a0c32fa 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2908,7 +2908,7 @@ static bool IsPipeliningPossible(const struct Curl_easy *handle,
                                  const struct connectdata *conn)
 {
   /* If a HTTP protocol and pipelining is enabled */
-  if(conn->handler->protocol & PROTO_FAMILY_HTTP) {
+  if((conn->handler->protocol & PROTO_FAMILY_HTTP) && !conn->bits.close) {
 
     if(Curl_pipeline_wanted(handle->multi, CURLPIPE_HTTP1) &&
        (handle->set.httpversion != CURL_HTTP_VERSION_1_0) &&
@@ -3283,6 +3283,8 @@ ConnectionExists(struct Curl_easy *data,
       pipeLen = check->send_pipe->size + check->recv_pipe->size;
 
       if(canPipeline) {
+        if(check->bits.close)
+            continue;
 
         if(!check->bits.multiplex) {
           /* If not multiplexing, make sure the pipe has only GET requests */