Implemented FR #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME...

diff --git a/NEWS b/NEWS
index 0b5358453cbbbb32bf23c7a12a6e6ba26790c888..bf34c2a9c7677312ad04cbb50e43eec08e12b18b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ PHP                                                                        NEWS
 
 - CLI Server:
   . "Connection: close" instead of "Connection: closed" (Gustavo)
+  . Implemented FR #60850 (Built in web server does not set 
+    $_SERVER['SCRIPT_FILENAME'] when using router). (Laruence)
 
 - Core:
   . Fixed bug #61225 (Incorect lexing of 0b00*+<NUM>). (Pierrick)

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index e1de637f1b58c2dfdbc9b4d0fdb38abd572fc73d..88f5d78d2024321de74516a1c78aefa13e4ddc95 100644 (file)
--- 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);

diff --git a/sapi/cli/tests/php_cli_server_017.phpt b/sapi/cli/tests/php_cli_server_017.phpt
new file mode 100644 (file)
index 0000000..778e5f2
--- /dev/null
+++ b/sapi/cli/tests/php_cli_server_017.phpt
@@ -0,0 +1,44 @@
+--TEST--
+Implement Req #60850 (Built in web server does not set $_SERVER['SCRIPT_FILENAME'] when using router)
+--SKIPIF--
+<?php
+include "skipif.inc"; 
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start(<<<PHP
+var_dump(\$_SERVER['SCRIPT_FILENAME']);
+PHP
+);
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+  die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+POST / HTTP/1.1
+Host: {$host}
+
+
+HEADER
+)) {
+       while (!feof($fp)) {
+               echo fgets($fp);
+       }
+}
+
+fclose($fp);
+?>
+--EXPECTF--
+HTTP/1.1 200 OK
+Host: %s
+Connection: close
+X-Powered-By: %s
+Content-type: text/html
+
+string(%d) "%s/tests/index.php"