Skip to content

Fix GH-17645: FPM with httpd ProxyPass does not decode script path - #17896

Closed
bukka wants to merge 1 commit into
php:masterfrom
bukka:fpm_gh17645_apache_pp_sft_decoding
Closed

Fix GH-17645: FPM with httpd ProxyPass does not decode script path#17896
bukka wants to merge 1 commit into
php:masterfrom
bukka:fpm_gh17645_apache_pp_sft_decoding

Conversation

@bukka

@bukka bukka commented Feb 22, 2025

Copy link
Copy Markdown
Member

This always decodes SCRIPT_FILENAME when Apache ProxyPass or ProxyPassMatch is used. It also introduces a new INI option fastcgi.script_path_encoded that allows using previous behavior of not decoding as there is a chance that some users could use encoded file paths in FS.

@bukka bukka linked an issue Feb 22, 2025 that may be closed by this pull request
FPM with httpd ProxyPass does not decode script path #17645
Closed
ndossche
ndossche approved these changes Feb 23, 2025
View reviewed changes
Comment thread php.ini-production Resolved
@bukka
bukka force-pushed the fpm_gh17645_apache_pp_sft_decoding branch from 7dc17df to f990379 Compare March 2, 2025 08:31
ndossche
ndossche approved these changes Mar 2, 2025
View reviewed changes

@ndossche ndossche left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still LGTM

@ndossche

ndossche commented Mar 2, 2025

Copy link
Copy Markdown
Member

I do see on ARM64 macOS this fails: sapi/fpm/tests/log-suppress-output-request-body.phpt
Might not be a flaky one but could be real

@bukka
Fix phpGH-17645: FPM with httpd ProxyPass does not decode script path
8fae6fc 
This changes make FPM always decode SCRIPT_FILENAME when Apache
ProxyPass or ProxyPassMatch is used. It also introduces a new INI
option fastcgi.script_path_encoded that allows using the previous
behavior of not decoding the path. The INI is introduced because
there is a chance that some users could use encoded file paths in
their file system as a workaround for the previous behavior.

Close phpGH-17896
@bukka
bukka force-pushed the fpm_gh17645_apache_pp_sft_decoding branch from f990379 to 8fae6fc Compare March 15, 2025 16:11
@bukka

bukka commented Mar 15, 2025 •
edited
Loading

Copy link
Copy Markdown
Member Author

Hmm very strange that it fails. I just tested on my mac arm64 and can't recreate it.

It shows:

========DIFF========
001+ ERROR: The NOTICE does not match expected message
002+ 
003+ LOGS:
004+ --------------------------------------------------------------------
005+ [02-Mar-2025 08:44:17] NOTICE: fpm is running, pid 96302
006+ [02-Mar-2025 08:44:17] NOTICE: ready to handle connections
007+ [02-Mar-2025 08:44:17] NOTICE: Terminating ...
008+ --------------------------------------------------------------------
009+ 
010+ Most likely invalid match for entry:
011+ - PATTERN: /^(?:\[\d\d-\w\w\w-\d{4} \d\d:\d\d:\d\d(?:\.\d+)?\] )?NOTICE: (?:pid \d+, (?:\w+|\(null\))\(\), line \d+: )?(exiting, bye-bye!)$/
012+ - LINE: 
013+ - EXPECTED: exiting, bye-bye!

Which looks more like missing fetch for last log output so it didn't match last line. Can't really think how it could be related to this change.

@bukka bukka closed this in 5ff8d6d Mar 25, 2025
@bukka

bukka commented Mar 25, 2025

Copy link
Copy Markdown
Member Author

The last run was fine so merging it. Let's see if it shows again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ndossche ndossche ndossche approved these changes

Assignees

No one assigned

Labels

SAPI: fpm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

FPM with httpd ProxyPass does not decode script path

2 participants

@bukka @ndossche