Commit c338d8cf authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Revert "multiplex: allow only once HTTP/2 is actually used" 

This reverts commit 46cb70e9.

Bug: http://curl.haxx.se/mail/lib-2016-01/0031.html
parent 984d1e9e

lib/url.c

+3 −4
Original line number Diff line number Diff line
@@ -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;