From 46cb70e9fa81c9a56de484cdd7c5d9d0d9fbec36 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 5 Jan 2016 11:32:30 +0100 Subject: multiplex: allow only once HTTP/2 is actually used To make sure curl doesn't allow multiplexing before a connection is upgraded to HTTP/2 (like when Upgrade: h2c fails), we must make sure the connection uses HTTP/2 as well and not only check what's wanted. Closes #584 Patch-by: c0ff --- lib/url.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/url.c b/lib/url.c index be2f2f896..875cb8b20 100644 --- a/lib/url.c +++ b/lib/url.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -2865,8 +2865,9 @@ static bool IsPipeliningPossible(const struct SessionHandle *handle, return TRUE; if(Curl_pipeline_wanted(handle->multi, CURLPIPE_MULTIPLEX) && - (handle->set.httpversion >= CURL_HTTP_VERSION_2)) - /* allows HTTP/2 */ + (handle->set.httpversion >= CURL_HTTP_VERSION_2) && + (conn->httpversion >= 20)) + /* allows and uses HTTP/2 */ return TRUE; } return FALSE; -- cgit v1.2.3