archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix GH-12996: Incorrect SCRIPT_NAME with Apache ProxyPassMatch when plus in path

Browse source 
Closes GH-13072
This commit is contained in:
Jakub Zelenka 2024-01-04 14:51:20 +00:00
parent d57a7767a2
commit b04b09ef56
No known key found for this signature in database
GPG key ID: 1C0779DC5C0A9DE4
3 changed files with 59 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -6,6 +6,10 @@ PHP NEWS
. Fixed timer leak in zend-max-execution-timers builds. (withinboredom)
. Fixed bug GH-12349 (linking failure on ARM with mold). (Jan Palus)
- FPM:
. Fixed bug GH-12996 (Incorrect SCRIPT_NAME with Apache ProxyPassMatch when
plus in path). (Jakub Zelenka)
- Phar:
. Fixed bug #71465 (PHAR doesn't know about litespeed). (nielsdos)

2
sapi/fpm/fpm/fpm_main.c
View file

@ -1165,7 +1165,7 @@ static void init_request_info(void)
size_t decoded_path_info_len = 0;
if (strchr(path_info, '%')) {
decoded_path_info = estrdup(path_info);
decoded_path_info_len = php_url_decode(decoded_path_info, strlen(path_info));
decoded_path_info_len = php_raw_url_decode(decoded_path_info, strlen(path_info));
}
size_t snlen = strlen(env_script_name);
size_t env_script_file_info_start = 0;

54
sapi/fpm/tests/fcgi-env-pif-apache-pp-sn-strip-encoded-plus.phpt Normal file
View file

@ -0,0 +1,54 @@
--TEST--
FPM: FastCGI env var path info fix for Apache ProxyPass SCRIPT_NAME encoded path and plush sign (GH-12996)
--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%20+2',
scriptName: $scriptName . '/1 +2'
)
->expectBody([$scriptName, $scriptName . '/1 +2', $sourceFilePath, '/1%20+2', $scriptName . '/1%20+2']);
$tester->terminate();
$tester->close();
?>
Done
--EXPECT--
Done
--CLEAN--
<?php
require_once "tester.inc";
FPM\Tester::clean();
?>