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

-- Allows <Files *.psgi> Apache2 configuration, w/o specific "psgi_app" #615

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

-- Allows <Files *.psgi> Apache2 configuration, w/o specific "psgi_app" #615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion lib/Plack/Handler/Apache2.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ sub call_app {
sub handler {
my $class = __PACKAGE__;
my $r = shift;
my $psgi = $r->dir_config('psgi_app');
my $psgi = $r->dir_config('psgi_app') || $r->filename();
$class->call_app($r, $class->load_app($psgi));
}

Expand All @@ -144,6 +144,8 @@ sub fixup_path {
$env->{SCRIPT_NAME} = '';
} elsif ($path_info =~ s{^($location)/?}{/}) {
$env->{SCRIPT_NAME} = $1 || '';
} elsif ( $r->filename() =~ /$location/) {
Copy link
Member

Choose a reason for hiding this comment

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

i think this match has a false positive.

Copy link
Author

Choose a reason for hiding this comment

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

could be, probably begin anchor would be enough. I'll have a look at it again tomorrow.

Copy link
Author

@cade-vs cade-vs Mar 5, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

so, on second glance, no, it cannot have false positive. location is the regexp <Files> has and it seems a bit redundant here, because if we reach here, /$location/ will always match and will be correct. so I don't believe there is a problem here.

Copy link
Author

Choose a reason for hiding this comment

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

any eta for merge? tnx.

$env->{SCRIPT_NAME} = $r->filename();
} else {
# Apache's <Location> is matched but here is not.
# This is something wrong. We can only respect original.
Expand Down