diff options
author | dartraiden <wowemuh@gmail.com> | 2018-09-07 00:27:45 +0300 |
---|---|---|
committer | dartraiden <wowemuh@gmail.com> | 2018-09-07 00:29:12 +0300 |
commit | dc059a02a3d8d1f3f509ba31b7618cee001cba93 (patch) | |
tree | a61572eda5489fcac8a2bbe896a788b297b8257a /libs/libcurl/src/pipeline.c | |
parent | a0fa47ed9d7be66a62f1cd05bc9577588c04a4fe (diff) |
libcurl: update to 7.61.1
Diffstat (limited to 'libs/libcurl/src/pipeline.c')
-rw-r--r-- | libs/libcurl/src/pipeline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/libcurl/src/pipeline.c b/libs/libcurl/src/pipeline.c index 0689409205..8de3babd78 100644 --- a/libs/libcurl/src/pipeline.c +++ b/libs/libcurl/src/pipeline.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2013, Linus Nielsen Feltzing, <linus@haxx.se> - * Copyright (C) 2013 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2013 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -110,8 +110,8 @@ CURLcode Curl_add_handle_to_pipeline(struct Curl_easy *handle, pipeline = &conn->send_pipe; result = addHandleToPipeline(handle, pipeline); - - if(pipeline == &conn->send_pipe && sendhead != conn->send_pipe.head) { + if((conn->bundle->multiuse == BUNDLE_PIPELINING) && + (pipeline == &conn->send_pipe && sendhead != conn->send_pipe.head)) { /* this is a new one as head, expire it */ Curl_pipeline_leave_write(conn); /* not in use yet */ Curl_expire(conn->send_pipe.head->ptr, 0, EXPIRE_RUN_NOW); |