-
Notifications
You must be signed in to change notification settings - Fork 7.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix bug #74129: Incorrect SCRIPT_NAME with apache ProxyPassMatch
This happens when there are spaces are in the path info. The reason is that Apache decodes the path info part in the SCRIPT_NAME as per CGI RFC. FPM tries to strip path info from the SCRIPT_NAME but the comparison is done against SCRIPT_FILENAME which is not decoded. For that to work we have to decode it before comparison if there is any encoded character. Closes GH-10869
- Loading branch information
Showing
3 changed files
with
79 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
sapi/fpm/tests/fcgi-env-pif-apache-pp-sn-strip-encoded.phpt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
--TEST-- | ||
FPM: FastCGI env var path info fix for Apache ProxyPass SCRIPT_NAME stripping with encoded path (bug #74129) | ||
--SKIPIF-- | ||
<?php include "skipif.inc"; ?> | ||
--FILE-- | ||
<?php | ||
|
||
require_once "tester.inc"; | ||
|
||
$cfg = <<<EOT | ||
[global] | ||
error_log = {{FILE:LOG}} | ||
[unconfined] | ||
listen = {{ADDR}} | ||
pm = dynamic | ||
pm.max_children = 5 | ||
pm.start_servers = 1 | ||
pm.min_spare_servers = 1 | ||
pm.max_spare_servers = 3 | ||
php_admin_value[cgi.fix_pathinfo] = yes | ||
EOT; | ||
|
||
$code = <<<EOT | ||
<?php | ||
echo \$_SERVER["SCRIPT_NAME"] . "\n"; | ||
echo \$_SERVER["ORIG_SCRIPT_NAME"] . "\n"; | ||
echo \$_SERVER["SCRIPT_FILENAME"] . "\n"; | ||
echo \$_SERVER["PATH_INFO"] . "\n"; | ||
echo \$_SERVER["PHP_SELF"]; | ||
EOT; | ||
|
||
$tester = new FPM\Tester($cfg, $code); | ||
[$sourceFilePath, $scriptName] = $tester->createSourceFileAndScriptName(); | ||
$tester->start(); | ||
$tester->expectLogStartNotices(); | ||
$tester | ||
->request( | ||
uri: $scriptName . '/1%202', | ||
scriptFilename: "proxy:fcgi://" . $tester->getAddr() . $sourceFilePath . '/1%202', | ||
scriptName: $scriptName . '/1 2' | ||
) | ||
->expectBody([$scriptName, $scriptName . '/1 2', $sourceFilePath, '/1%202', $scriptName . '/1%202']); | ||
$tester->terminate(); | ||
$tester->close(); | ||
|
||
?> | ||
Done | ||
--EXPECT-- | ||
Done | ||
--CLEAN-- | ||
<?php | ||
require_once "tester.inc"; | ||
FPM\Tester::clean(); | ||
?> |