Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1740119 - in /httpd/httpd/trunk: CHANGES
 server/protocol.c
Date: Wed, 20 Apr 2016 11:39:30 -0000
To: cvs@httpd.apache.org
From: icing@apache.org
Message-Id: <20160420113930.78A883A006A@svn01-us-west.apache.org>

Author: icing
Date: Wed Apr 20 11:39:30 2016
New Revision: 1740119

URL: http://svn.apache.org/viewvc?rev=1740119&view=rev
Log:
fixing h2 supress to inhibit other annnouncements in upgrade: header

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

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1740119&r1=1740118&r2=1740119&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Apr 20 11:39:30 2016
@@ -1,16 +1,9 @@
                                                          -*- 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.
      
-  *) mod_http2: disabling mmap for file buckets transport due to segmenation
-     faults when files change on the fly.
-     
   *) mod_http2: new "bucket beam" technology to transport buckets across
      threads without buffer copy. Delaying response start until flush or
      enough body data has been accumulated. [Stefan Eissing]

Modified: httpd/httpd/trunk/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=1740119&r1=1740118&r2=1740119&view=diff
==============================================================================
--- httpd/httpd/trunk/server/protocol.c (original)
+++ httpd/httpd/trunk/server/protocol.c Wed Apr 20 11:39:30 2016
@@ -2021,7 +2021,10 @@ AP_DECLARE(apr_status_t) ap_get_protocol
                 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(existing, p) && strcmp("h2", p)) {
+                if (!strcmp("h2", p)) {
+                    continue;
+                }
+                else if (strcmp(existing, p)) {
                     /* not the one we have and possible, add in this order */
                     APR_ARRAY_PUSH(upgrades, const char*) = p;
                 }