summaryrefslogtreecommitdiff
path: root/lib/url.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-01-08 14:39:54 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-01-08 14:39:54 +0100
commitc338d8cf9c173858d176b73ef80787907bd2d3bf (patch)
treeb82df5b299988db2e41f1d9e5d539c7091818324 /lib/url.c
parent984d1e9e23a6cfa1ef6c233c681d82b0c018c493 (diff)
downloadcurl-c338d8cf9c173858d176b73ef80787907bd2d3bf.tar.gz
Revert "multiplex: allow only once HTTP/2 is actually used"
This reverts commit 46cb70e9fa81c9a56de484cdd7c5d9d0d9fbec36. Bug: http://curl.haxx.se/mail/lib-2016-01/0031.html
Diffstat (limited to 'lib/url.c')
-rw-r--r--lib/url.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/url.c b/lib/url.c
index 728ceb83d..925c67ded 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2015, 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
@@ -2851,9 +2851,8 @@ static bool IsPipeliningPossible(const struct SessionHandle *handle,
return TRUE;
if(Curl_pipeline_wanted(handle->multi, CURLPIPE_MULTIPLEX) &&
- (handle->set.httpversion >= CURL_HTTP_VERSION_2) &&
- (conn->httpversion >= 20))
- /* allows and uses HTTP/2 */
+ (handle->set.httpversion >= CURL_HTTP_VERSION_2))
+ /* allows HTTP/2 */
return TRUE;
}
return FALSE;