diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2015-05-18 21:28:22 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-06-27 14:28:33 +0200 |
| commit | 1920ba6f7bd1ce3c866ca947f51a1633dc892fce (patch) | |
| tree | e7d575fced9d2354961dcd687483328ecf85ee33 /sapi/cli/php_cli_server.c | |
| parent | 6400ef192c7c50faf47e958141aac8142a1cef99 (diff) | |
| download | php-git-1920ba6f7bd1ce3c866ca947f51a1633dc892fce.tar.gz | |
Fix #64878: 304 responses return Content-Type header
According to RFC 7232 304 responses should not send a Content-Type header,
so the CLI server should comply.
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 3b5fe05945..3214a2bba1 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2185,6 +2185,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 TSRMLS_CC) || SUCCESS != php_cli_server_send_error_page(server, client, 500 TSRMLS_CC)) { + 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); return SUCCESS; } |