diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-03-01 23:01:48 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-03-01 23:01:48 -0800 |
| commit | 90a0cbd59470dcc81f57c66698f05158149d2980 (patch) | |
| tree | 53dbb8c272b7276f5de1114a7787034048649fe9 /sapi/cli | |
| parent | 07b6fc93b11b46926db6e7c02f90c84981a40c33 (diff) | |
| parent | 6e6a556b8c8e192ab44edeaabe012f29b614202d (diff) | |
| download | php-git-90a0cbd59470dcc81f57c66698f05158149d2980.tar.gz | |
Merge branch 'PHP-5.6.19' into PHP-7.0.4
* PHP-5.6.19:
fix test file
Fix version
update NEWS
Update NEWS
Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
fix ts buld
prep for 5.6.19RC1
5.6.20 is next
Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize
Conflicts:
configure.in
ext/wddx/wddx.c
main/php_version.h
Diffstat (limited to 'sapi/cli')
| -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 ac41c44def..f94ac74741 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1964,7 +1964,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); + return php_cli_server_send_error_page(server, client, 500 TSRMLS_CC); } #endif |