httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1740075 - in /httpd/httpd/trunk: CHANGES server/protocol.c
Date Wed, 20 Apr 2016 09:22:37 GMT
Author: icing
Date: Wed Apr 20 09:22:37 2016
New Revision: 1740075

URL: http://svn.apache.org/viewvc?rev=1740075&view=rev
Log:
suppress h2 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=1740075&r1=1740074&r2=1740075&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Apr 20 09:22:37 2016
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) 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.
      

Modified: httpd/httpd/trunk/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=1740075&r1=1740074&r2=1740075&view=diff
==============================================================================
--- httpd/httpd/trunk/server/protocol.c (original)
+++ httpd/httpd/trunk/server/protocol.c Wed Apr 20 09:22:37 2016
@@ -2019,7 +2019,9 @@ 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 *);
-                if (strcmp(existing, p)) {
+                /* special quirk for HTTP/2 which does not allow 'h2' to
+                 * be part of an Upgrade: header */
+                if (strcmp(existing, p) && strcmp("h2", p)) {
                     /* not the one we have and possible, add in this order */
                     APR_ARRAY_PUSH(upgrades, const char*) = p;
                 }



Mime
View raw message