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

Commit: fc69549593cb1ab4f9fa0fd41d74000cd4a98894 Author: Christoph M. Becker <cmb@php.net> Sun, 9 Aug 2015 02:51:16 +0200 Parents: cab75d8b00b6e86f6e2ede1ba3b3bd35518fc3bd 36cbb7cc4c7cd492394c62cd883c8e29d4f45760 Branches: PHP-7.0.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fc69549593cb1ab4f9fa0fd41d74000cd4a98894 Log: Merge branch 'PHP-5.6' * PHP-5.6: Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE added tests for bug #66606 Bugs: https://bugs.php.net/66606 Changed paths: MM sapi/cli/php_cli_server.c Diff: diff --cc sapi/cli/php_cli_server.c index f76199a,0022678..9c00fa0 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@@ -604,7 -732,10 +604,10 @@@ static int sapi_cli_server_register_ent } } spprintf(&real_key, 0, "%s_%s", "HTTP", key); + if (strcmp(key, "CONTENT_TYPE") == 0 || strcmp(key, "CONTENT_LENGTH") == 0) { - sapi_cli_server_register_variable(track_vars_array, key, *entry TSRMLS_CC); ++ sapi_cli_server_register_variable(track_vars_array, key, *entry); + } - sapi_cli_server_register_variable(track_vars_array, real_key, *entry TSRMLS_CC); + sapi_cli_server_register_variable(track_vars_array, real_key, *entry); efree(key); efree(real_key); }