From: Christoph M. Becker <cmb@php.net>
Date: Sat, 27 Jun 2015 12:35:20 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.1.0alpha3~25^2~161
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e32ecb90a00e46ebef2c2636622c8f630b3a5e2;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #64878: 304 responses return Content-Type header
---

4e32ecb90a00e46ebef2c2636622c8f630b3a5e2
diff --cc sapi/cli/php_cli_server.c
index b07d6858da,3214a2bba1..d622b099de
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@@ -2081,9 -2183,12 +2081,12 @@@ static int php_cli_server_dispatch(php_
  	}
  
  	if (!is_static_file) {
 -		if (SUCCESS == php_cli_server_dispatch_script(server, client TSRMLS_CC)
 -				|| SUCCESS != php_cli_server_send_error_page(server, client, 500 TSRMLS_CC)) {
 +		if (SUCCESS == php_cli_server_dispatch_script(server, client)
 +				|| SUCCESS != php_cli_server_send_error_page(server, client, 500)) {
+ 			if (SG(sapi_headers).http_response_code == 304) {
+ 				SG(sapi_headers).send_default_content_type = 0;
+ 			}
 -			php_cli_server_request_shutdown(server, client TSRMLS_CC);
 +			php_cli_server_request_shutdown(server, client);
  			return SUCCESS;
  		}
  	} else {