From: Stefan Eissing <icing@apache.org>
Date: Wed, 15 Jun 2016 14:47:21 +0000 (+0000)
Subject: core: removing quirk for supressing h2 in Upgrade: response header, never backported... 
X-Git-Tag: 2.5.0-alpha~1499
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81b4949306cdc4c034fbc9e9b984c4ede7294bdd;p=apache

core: removing quirk for supressing h2 in Upgrade: response header, never backported, obsolete

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

diff --git a/server/protocol.c b/server/protocol.c
index bb524c4a3c..afdcf5fb65 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -2023,12 +2023,7 @@ AP_DECLARE(apr_status_t) ap_get_protocol_upgrades(conn_rec *c, request_rec *r,
                                       sizeof(char *));
             for (i = 0; i < conf->protocols->nelts; i++) {
                 const char *p = APR_ARRAY_IDX(conf->protocols, i, char *);
-                /* special quirk for HTTP/2 which does not allow 'h2' to
-                 * be part of an Upgrade: header */
-                if (!strcmp("h2", p)) {
-                    continue;
-                }
-                else if (strcmp(existing, p)) {
+                if (strcmp(existing, p)) {
                     /* not the one we have and possible, add in this order */
                     APR_ARRAY_PUSH(upgrades, const char*) = p;
                 }