Merge branch 'PHP-5.6'

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

diff --cc sapi/cli/php_cli_server.c
index b07d6858da3ae478a371f1ab3c032e4b5a0897c7,3214a2bba134976c756432ae7addfd0376146bd4..d622b099de0f0f4224e4c8bd539b4e31a4cb8ad1
--- 1/sapi/cli/php_cli_server.c
--- 2/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 {