From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 29 Mar 2016 14:08:38 +0000 (+0200)
Subject: http2: set correct scheme in handler structs [regression]
X-Git-Tag: curl-7_49_0~267
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fc767210c7c3083318ccd1f2a5741e1c757278f;p=thirdparty%2Fcurl.git

http2: set correct scheme in handler structs [regression]

Since commit a5aec58 the handler schemes need to match for the
connections to be reused and for HTTP/2 multiplexing to work, reusing
connections is very important!

Closes #736
---

diff --git a/lib/http2.c b/lib/http2.c
index 91abbf04ed..13f83947cf 100644
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -155,7 +155,7 @@ void Curl_http2_setup_conn(struct connectdata *conn)
  * HTTP to HTTP2.
  */
 const struct Curl_handler Curl_handler_http2 = {
-  "HTTP2",                              /* scheme */
+  "HTTP",                               /* scheme */
   ZERO_NULL,                            /* setup_connection */
   Curl_http,                            /* do_it */
   Curl_http_done,                       /* done */
@@ -175,7 +175,7 @@ const struct Curl_handler Curl_handler_http2 = {
 };
 
 const struct Curl_handler Curl_handler_http2_ssl = {
-  "HTTP2",                              /* scheme */
+  "HTTPS",                              /* scheme */
   ZERO_NULL,                            /* setup_connection */
   Curl_http,                            /* do_it */
   Curl_http_done,                       /* done */