From 4d3223b28ea744c9247b4636d3750379ce44a95b Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Wed, 7 Oct 2015 02:35:26 +0000
Subject: [PATCH] Introduce `wp_get_server_protocol()` to DRY protocol parsing
 logic and make adding more protocols, like `HTTP/2`, easier.

Props johnbillion, wonderboymusic.
Fixes #34131.

Built from https://develop.svn.wordpress.org/trunk@34894


git-svn-id: http://core.svn.wordpress.org/trunk@34859 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php |  4 +---
 wp-includes/load.php      | 29 ++++++++++++++++++-----------
 wp-includes/version.php   |  2 +-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index b2972d2435..5808b29182 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -992,9 +992,7 @@ function status_header( $code ) {
 	if ( empty( $description ) )
 		return;
 
-	$protocol = $_SERVER['SERVER_PROTOCOL'];
-	if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
-		$protocol = 'HTTP/1.0';
+	$protocol = wp_get_server_protocol();
 	$status_header = "$protocol $code $description";
 	if ( function_exists( 'apply_filters' ) )
 
diff --git a/wp-includes/load.php b/wp-includes/load.php
index 90db8290db..bd34b4dbfb 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -7,6 +7,21 @@
  * @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;
+}
+
 /**
  * Turn register globals off.
  *
@@ -112,10 +127,7 @@ function wp_check_php_mysql_versions() {
 	if ( version_compare( $required_php_version, $php_version, '>' ) ) {
 		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' );
 		die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
@@ -124,10 +136,7 @@ function wp_check_php_mysql_versions() {
 	if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
 		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' );
 		die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
@@ -182,9 +191,7 @@ function wp_maintenance() {
 
 	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' );
 	header( 'Retry-After: 600' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e66954821b..7c2f955703 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34893';
+$wp_version = '4.4-alpha-34894';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.