From 6161ad9020fb808490bc6e84db65590e9c4bf9e6 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Wed, 26 Oct 2016 14:32:28 +0000
Subject: [PATCH] Formatting: Don't overwrite the status header for Ajax
 responses that use output buffering or otherwise set their headers early.

Fixes #35666

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


git-svn-id: http://core.svn.wordpress.org/trunk@38899 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 d28b792537..112f0ffed0 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2880,9 +2880,10 @@ function _ajax_wp_die_handler( $message, $title = '', $args = array() ) {
 	);
 	$r = wp_parse_args( $args, $defaults );
 
-	if ( ! headers_sent() ) {
+	if ( ! headers_sent() && null !== $r['response'] ) {
 		status_header( $r['response'] );
 	}
+
 	if ( is_scalar( $message ) )
 		die( (string) $message );
 	die( '0' );
@@ -3111,10 +3112,14 @@ function wp_send_json( $response, $status_code = null ) {
 		status_header( $status_code );
 	}
 	echo wp_json_encode( $response );
-	if ( wp_doing_ajax() )
-		wp_die();
-	else
+
+	if ( wp_doing_ajax() ) {
+		wp_die( '', '', array(
+			'response' => null,
+		) );
+	} else {
 		die;
+	}
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 16ce9cd87c..256ba44225 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38955';
+$wp_version = '4.7-alpha-38956';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.