Ticket #34131: 34131.diff

src/wp-includes/functions.php

@@ -993 +993 @@
                 return;
 
         $protocol = $_SERVER['SERVER_PROTOCOL'];
-        if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
+        if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
                 $protocol = 'HTTP/1.0';
+        }
         $status_header = "$protocol $code $description";
         if ( function_exists( 'apply_filters' ) )
 

src/wp-includes/load.php

@@ -113 +113 @@
                 wp_load_translations_early();
 
                 $protocol = $_SERVER['SERVER_PROTOCOL'];
-                if ( 'HTTP/1.1' !== $protocol && 'HTTP/1.0' !== $protocol ) {
+                if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
                         $protocol = 'HTTP/1.0';
                 }
                 header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
@@ -125 +125 @@
                 wp_load_translations_early();
 
                 $protocol = $_SERVER['SERVER_PROTOCOL'];
-                if ( 'HTTP/1.1' !== $protocol && 'HTTP/1.0' !== $protocol ) {
+                if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
                         $protocol = 'HTTP/1.0';
                 }
                 header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
@@ -183 +183 @@
         wp_load_translations_early();
 
         $protocol = $_SERVER["SERVER_PROTOCOL"];
-        if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
+        if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
                 $protocol = 'HTTP/1.0';
+        }
         header( "$protocol 503 Service Unavailable", true, 503 );
         header( 'Content-Type: text/html; charset=utf-8' );
         header( 'Retry-After: 600' );