From c83a66cbf3240503d35ee9916f17908b38a02ab6 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Wed, 7 Oct 2015 21:26:25 +0000
Subject: [PATCH] Add an optional `$description` parameter to `status_header()`
 so custom HTTP status descriptions can be provided.

Fixes #21472
Props nbachiyski, iamfriendly

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


git-svn-id: http://core.svn.wordpress.org/trunk@34879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php | 13 +++++++++----
 wp-includes/version.php   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 1e273b2b5d..7abf43ac48 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -981,16 +981,21 @@ function get_status_header_desc( $code ) {
  * Set HTTP status header.
  *
  * @since 2.0.0
+ * @since 4.4.0 Added the `$description` parameter.
  *
  * @see get_status_header_desc()
  *
- * @param int $code HTTP status code.
+ * @param int    $code        HTTP status code.
+ * @param string $description Optional. A custom description for the HTTP status.
  */
-function status_header( $code ) {
-	$description = get_status_header_desc( $code );
+function status_header( $code, $description = '' ) {
+	if ( ! $description ) {
+		$description = get_status_header_desc( $code );
+	}
 
-	if ( empty( $description ) )
+	if ( empty( $description ) ) {
 		return;
+	}
 
 	$protocol = wp_get_server_protocol();
 	$status_header = "$protocol $code $description";
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 28b0b621ce..999f6dabf7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34913';
+$wp_version = '4.4-alpha-34914';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.