Skip to content

handle apache DocumentRoot cyrillic encoding #17083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

handle apache DocumentRoot cyrillic encoding #17083

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
17479f8
handle apache DocumentRoot cyrillic encoding
divinity76 Dec 8, 2024
2aceb35
typo
divinity76 Dec 8, 2024
0f2be03
raw
divinity76 Dec 8, 2024
4c95d0c
simpler
divinity76 Dec 8, 2024
3e7f9f9
fix some failing tests
divinity76 Dec 8, 2024
6c9d63d
less state
divinity76 Dec 9, 2024
b937b59
not limited to cyrillic..
divinity76 Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions sapi/fpm/fpm/fpm_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,6 +1103,7 @@ static void init_request_info(void)
script_path_translated = __unixify(script_path_translated, 0, NULL, 1, 0);
#endif


/*
* if the file doesn't exist, try to extract PATH_INFO out
* of it by stat'ing back through the '/'
Expand All @@ -1118,8 +1119,19 @@ static void init_request_info(void)
char *ptr;

if (pt) {
// If DocumentRoot contains special characters like '%' or cyrillic 'рф' and PHP is invoked with SetHandler (not applicable to ProxyPassMatch),
// then the special characters are urlencoded by apache, and we need to decode them, for example with
// DocumentRoot /home/hans/web/cyrillicрф.ratma.net/public_html/test%lol
// env_script_filename contains /home/hans/web/cyrillic%D1%80%D1%84.ratma.net/public_html/test%25lol/index.php.
// and we must decode it to /home/hans/web/cyrillicрф.ratma.net/public_html/test%lol/index.php.
if(apache_was_here && memchr(pt, '%', len)) {
len = php_raw_url_decode(pt, len);
ptr = &pt[len]; // php_raw_url_decode() writes a trailing null byte, &pt[len] is that null byte.
goto apache_special_jump;
}
while ((ptr = strrchr(pt, '/')) || (ptr = strrchr(pt, '\\'))) {
*ptr = 0;
apache_special_jump:
if (stat(pt, &st) == 0 && S_ISREG(st.st_mode)) {
/*
* okay, we found the base script!
Expand Down
Loading