Skip to content
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

Jump to bottom

fastcgi: Set PATH_INFO to file matcher remainder as fallback #3739

Merged
merged 3 commits into from
Dec 5, 2020
Merged

fastcgi: Set PATH_INFO to file matcher remainder as fallback #3739

merged 3 commits into from
Dec 5, 2020

Conversation

francislavoie
Copy link
Member

Fixes #3718

This isn't perfect, because if the SplitPath value is different between the fastcgi transport and a file matcher, then unexpected behaviour could happen... but this should work correctly for the php_fastcgi shortcut we provide.

@francislavoie francislavoie added the bug 🐞 Something isn't working label Sep 20, 2020
@francislavoie francislavoie added this to the v2.3.0 milestone Sep 20, 2020
@francislavoie francislavoie requested a review from mholt September 20, 2020 17:46
@francislavoie francislavoie mentioned this pull request Sep 20, 2020
Closed
@francislavoie francislavoie force-pushed the fastcgi-pathinfo branch 2 times, most recently from 4f7cfd2 to 8b98915 Compare September 23, 2020 01:46
@mholt mholt added the under review 🧐 Review is pending before merging label Sep 25, 2020
mholt
mholt previously approved these changes Dec 4, 2020
View reviewed changes
Copy link
Member

@mholt mholt left a comment

Choose a reason for hiding this comment

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

This LGTM -- how do you feel about it?

Just noting a couple areas for improvement in terms of readability.

modules/caddyhttp/fileserver/matcher.go Outdated Show resolved Hide resolved
modules/caddyhttp/fileserver/matcher.go Outdated Show resolved Hide resolved
@mholt mholt removed the under review 🧐 Review is pending before merging label Dec 4, 2020
mholt
mholt approved these changes Dec 5, 2020
View reviewed changes
Copy link
Member

@mholt mholt left a comment

Choose a reason for hiding this comment

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

Thanks for the fix, Francis!

@mholt mholt merged commit 6e9ac24 into caddyserver:master Dec 5, 2020
@francislavoie francislavoie deleted the fastcgi-pathinfo branch December 5, 2020 00:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mholt mholt mholt approved these changes

Assignees
No one assigned
Labels
bug 🐞 Something isn't working
Projects
None yet
Milestone
v2.3.0
Development

Successfully merging this pull request may close these issues.

PATH_INFO is empty with basic fastcgi Caddyfile
2 participants
@francislavoie @mholt