diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-06-27 14:35:20 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-06-27 14:35:20 +0200 |
| commit | 4e32ecb90a00e46ebef2c2636622c8f630b3a5e2 (patch) | |
| tree | 0c9ecf6358ea042c91eab552d98326ee08bc85d1 /sapi/cli/php_cli_server.c | |
| parent | 692d283707b00b1cd25fb64e341a76719c6b7742 (diff) | |
| parent | 0730fc88306154fa770ab4558be7cb4d028b1e74 (diff) | |
| download | php-git-4e32ecb90a00e46ebef2c2636622c8f630b3a5e2.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #64878: 304 responses return Content-Type header
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index b07d6858da..d622b099de 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2083,6 +2083,9 @@ static int php_cli_server_dispatch(php_cli_server *server, php_cli_server_client if (!is_static_file) { 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); return SUCCESS; } |