You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2016/06/15 14:47:21 UTC

svn commit: r1748591 - /httpd/httpd/trunk/server/protocol.c

Author: icing
Date: Wed Jun 15 14:47:21 2016
New Revision: 1748591

URL: http://svn.apache.org/viewvc?rev=1748591&view=rev
Log:
core: removing quirk for supressing h2 in Upgrade: response header, never backported, obsolete

Modified:
    httpd/httpd/trunk/server/protocol.c

Modified: httpd/httpd/trunk/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=1748591&r1=1748590&r2=1748591&view=diff
==============================================================================
--- httpd/httpd/trunk/server/protocol.c (original)
+++ httpd/httpd/trunk/server/protocol.c Wed Jun 15 14:47:21 2016
@@ -2023,12 +2023,7 @@ AP_DECLARE(apr_status_t) ap_get_protocol
                                       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;
                 }