com php-src: Merge branch 'PHP-5.6': sapi/cli/php_cli_serve r.c

Commit: 4e32ecb90a00e46ebef2c2636622c8f630b3a5e2 Author: Christoph M. Becker <cmb@php.net> Sat, 27 Jun 2015 14:35:20 +0200 Parents: 692d283707b00b1cd25fb64e341a76719c6b7742 0730fc88306154fa770ab4558be7cb4d028b1e74 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e32ecb90a00e46ebef2c2636622c8f630b3a5e2 Log: Merge branch 'PHP-5.6' * PHP-5.6: Fix #64878: 304 responses return Content-Type header Bugs: https://bugs.php.net/64878 Changed paths: MM sapi/cli/php_cli_server.c Diff: diff --cc sapi/cli/php_cli_server.c index b07d685,3214a2b..d622b09 --- 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 {