diff options
author | Xinchen Hui <laruence@gmail.com> | 2016-06-24 18:08:28 -0700 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2016-06-24 18:08:28 -0700 |
commit | 8de8636a2b6dc331486284f1f037259bb7347768 (patch) | |
tree | 0e775196e4f7db003a627052c74e9d3d92be5b9a /sapi/cli/php_cli_server.c | |
parent | a485ae287158eb320ae528363d0b52c15124f710 (diff) | |
parent | 0183a9af5ac6e186d554634b854a3a86d5830d6d (diff) | |
download | php-git-8de8636a2b6dc331486284f1f037259bb7347768.tar.gz |
Merge branch 'PHP-7.0'
Diffstat (limited to 'sapi/cli/php_cli_server.c')
-rw-r--r-- | sapi/cli/php_cli_server.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 8f3ca54beb..60f68c3154 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -670,10 +670,7 @@ static void sapi_cli_server_register_variables(zval *track_vars_array) /* {{{ */ if (SG(request_info).path_translated) { sapi_cli_server_register_variable(track_vars_array, "SCRIPT_FILENAME", SG(request_info).path_translated); } else if (client->server->router) { - char *temp; - spprintf(&temp, 0, "%s/%s", client->server->document_root, client->server->router); - sapi_cli_server_register_variable(track_vars_array, "SCRIPT_FILENAME", temp); - efree(temp); + sapi_cli_server_register_variable(track_vars_array, "SCRIPT_FILENAME", client->server->router); } if (client->request.path_info) { sapi_cli_server_register_variable(track_vars_array, "PATH_INFO", client->request.path_info); |