]> granicus.if.org Git - curl/commitdiff
http2: set correct scheme in handler structs [regression]
authorDaniel Stenberg <daniel@haxx.se>
Tue, 29 Mar 2016 14:08:38 +0000 (16:08 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Tue, 29 Mar 2016 14:08:38 +0000 (16:08 +0200)
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

lib/http2.c

index 91abbf04ed0f0eacc8a6702b4db2fe4125b631c3..13f83947cfcd15809748713dd7c44ff3483bf987 100644 (file)
@@ -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 */