From: Stefan Eissing <icing@apache.org>
Date: Wed, 20 Apr 2016 11:02:54 +0000 (+0000)
Subject: changing r->protocol to HTTP/2.0 for HTTP/2 requests, fixes PR 59313
X-Git-Tag: 2.5.0-alpha~1726
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83099f13296cd19faa810ec58c6d2246f1f51fdb;p=thirdparty%2Fapache%2Fhttpd.git

changing r->protocol to HTTP/2.0 for HTTP/2 requests, fixes PR 59313

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1740108 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index ea49b840254..0c0f5a00da8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_http2: r->protocol changed to "HTTP/2.0" (was "HTTP/2") as this will
+     give expected syntax in CGI's SERVER_PROTOCOL is more compatible with
+     existing major/minor handling. Fixes PR 59313.
+  
   *) core: explicitly exclude 'h2' from protocols announced via an Upgrade: 
      header as commanded by http-wg.
      
diff --git a/modules/http2/h2_request.c b/modules/http2/h2_request.c
index a12b55072a9..0253bede409 100644
--- a/modules/http2/h2_request.c
+++ b/modules/http2/h2_request.c
@@ -372,7 +372,7 @@ request_rec *h2_request_create_rec(const h2_request *req, conn_rec *c)
     }
 
     ap_parse_uri(r, req->path);
-    r->protocol = "HTTP/2";
+    r->protocol = "HTTP/2.0";
     r->proto_num = HTTP_VERSION(2, 0);
 
     r->the_request = apr_psprintf(r->pool, "%s %s %s",