diff options
| author | Xinchen Hui <laruence@php.net> | 2012-03-11 08:56:14 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-03-11 08:56:14 +0000 |
| commit | 40cd3d54b9cc1fe0d053710b98878375389c1b69 (patch) | |
| tree | b69920ec2e07518f390ecef74b56054dd7f042d6 /sapi/cli/php_cli_server.c | |
| parent | 0d076c3c7789919290908765de4a8f2af83248da (diff) | |
| download | php-git-40cd3d54b9cc1fe0d053710b98878375389c1b69.tar.gz | |
Implemented FR #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME'] when using router)
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index e1de637f1b..88f5d78d20 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -599,6 +599,11 @@ static void sapi_cli_server_register_variables(zval *track_vars_array TSRMLS_DC) sapi_cli_server_register_variable(track_vars_array, "SCRIPT_NAME", client->request.vpath TSRMLS_CC); if (SG(request_info).path_translated) { sapi_cli_server_register_variable(track_vars_array, "SCRIPT_FILENAME", SG(request_info).path_translated TSRMLS_CC); + } 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 TSRMLS_CC); + efree(temp); } if (client->request.path_info) { sapi_cli_server_register_variable(track_vars_array, "PATH_INFO", client->request.path_info TSRMLS_CC); |