From 36bda54e8876d0d52ac54ab08fdd6d66ee51e136 Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Mon, 7 Sep 2015 02:18:26 +0000
Subject: [PATCH] Favicon: Do not specify a `Content-Length: 0` header for our
 "empty" response to fail more gracefully on environments with extra
 whitespace on output.

This allows for the web server to generate the appropriate `Content-Length` header for the request, allowing for strict clients/proxies/servers to process the response.

Props swissspidy.
Fixes #33626

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


git-svn-id: http://core.svn.wordpress.org/trunk@33904 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/load.php    | 1 -
 wp-includes/version.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/wp-includes/load.php b/wp-includes/load.php
index a6ad0222a2..7ffac2f662 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -132,7 +132,6 @@ function wp_check_php_mysql_versions() {
 function wp_favicon_request() {
 	if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) {
 		header('Content-Type: image/vnd.microsoft.icon');
-		header('Content-Length: 0');
 		exit;
 	}
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ca0d9fd5c1..0fe7ecddee 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-33934';
+$wp_version = '4.4-alpha-33935';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.