diff options
author | Joe Watkins <krakjoe@php.net> | 2017-01-18 17:46:11 +0000 |
---|---|---|
committer | Joe Watkins <krakjoe@php.net> | 2017-01-18 17:46:11 +0000 |
commit | bbe21ccf3877835d8c7c6aaadcbd9e4d20054c8b (patch) | |
tree | bd3b1a946c57e9b358d3e3f21372f9f099a44119 /sapi/cli/php_cli_server.c | |
parent | bce548d8e699c8e7d1a0cbbeb0ce4de4b0f0131d (diff) | |
parent | fb8486f3bdd84d92da7c05e6e3c226df71c574da (diff) | |
download | php-git-bbe21ccf3877835d8c7c6aaadcbd9e4d20054c8b.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove remnants of TSMRLS_* macro calls
Diffstat (limited to 'sapi/cli/php_cli_server.c')
-rw-r--r-- | sapi/cli/php_cli_server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 87cabe8b73..e7650cb763 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1979,7 +1979,7 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv if (client->request.path_translated && ('.' == client->request.path_translated[client->request.path_translated_len-1] || ' ' == client->request.path_translated[client->request.path_translated_len-1])) { - return php_cli_server_send_error_page(server, client, 500 TSRMLS_CC); + return php_cli_server_send_error_page(server, client, 500); } #endif |