Changeset 34894 for trunk/src/wp-includes/load.php

Timestamp:

10/07/2015 02:34:58 AM (11 years ago)

Author:

wonderboymusic

Message:

Introduce wp_get_server_protocol() to DRY protocol parsing logic and make adding more protocols, like HTTP/2, easier.

Props johnbillion, wonderboymusic.
Fixes #34131.

File:

• trunk/src/wp-includes/load.php (modified) (4 diffs)

trunk/src/wp-includes/load.php

@@ -7 +7 @@
  * @package WordPress
  */
+
+/**
+ * Return the HTTP protocol sent by the server.
+ *
+ * @since 4.4.0
+ *
+ * @return string The HTTP protocol. Default: HTTP/1.0.
+ */
+function wp_get_server_protocol() {
+        $protocol = $_SERVER['SERVER_PROTOCOL'];
+        if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+                $protocol = 'HTTP/1.0';
+        }
+        return $protocol;
+}
 
 /**
@@ -113 +128 @@
                 wp_load_translations_early();
 
-                $protocol = $_SERVER['SERVER_PROTOCOL'];
-                if ( 'HTTP/1.1' !== $protocol && 'HTTP/1.0' !== $protocol ) {
-                        $protocol = 'HTTP/1.0';
-                }
+                $protocol = wp_get_server_protocol();
                 header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
                 header( 'Content-Type: text/html; charset=utf-8' );
@@ -125 +137 @@
                 wp_load_translations_early();
 
-                $protocol = $_SERVER['SERVER_PROTOCOL'];
-                if ( 'HTTP/1.1' !== $protocol && 'HTTP/1.0' !== $protocol ) {
-                        $protocol = 'HTTP/1.0';
-                }
+                $protocol = wp_get_server_protocol();
                 header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
                 header( 'Content-Type: text/html; charset=utf-8' );
@@ -183 +192 @@
         wp_load_translations_early();
 
-        $protocol = $_SERVER["SERVER_PROTOCOL"];
-        if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
-                $protocol = 'HTTP/1.0';
+        $protocol = wp_get_server_protocol();
         header( "$protocol 503 Service Unavailable", true, 503 );
         header( 'Content-Type: text/html; charset=utf-8' );