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

put HTTP_REQUEST_BASE support back from Dancer 1 #571

Closed
wants to merge 3 commits into from
Closed

put HTTP_REQUEST_BASE support back from Dancer 1 #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
848eaef
put HTTP_REQUEST_BASE support back from Dancer 1
fayland Apr 24, 2014
9e60df6
sub request_base
fayland Apr 24, 2014
f5c739b
update cookbook
fayland Apr 24, 2014
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
6 changes: 6 additions & 0 deletions lib/Dancer2/Cookbook.pod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,12 @@ under a specified dir:

ProxyPass /mywebapp/ http://localhost:3000/
ProxyPassReverse /mywebapp/ http://localhost:3000/
<Location /mywebapp/>
RequestHeader set Request-Base /mywebapp
</Location>

HTTP header C<Request-Base> is taken into account by Dancer, only when
C<behind_proxy> setting is set to true.

It is important for you to note that the Apache2 modules C<mod_proxy> and C<mod_proxy_http>
must be enabled.
Expand Down
11 changes: 10 additions & 1 deletion lib/Dancer2/Core/Request.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ supported:

=item C<remote_address>

=item C<request_base>

=item C<user_agent>

=item C<x_requested_with>
Expand Down Expand Up @@ -415,6 +417,7 @@ sub protocol { $_[0]->env->{SERVER_PROTOCOL} }
sub port { $_[0]->env->{SERVER_PORT} }
sub request_uri { $_[0]->env->{REQUEST_URI} }
sub user { $_[0]->env->{REMOTE_USER} }
sub request_base { $_[0]->env->{REQUEST_BASE} || $_[0]->env->{HTTP_REQUEST_BASE} }
sub script_name { $_[0]->env->{SCRIPT_NAME} }

=method scheme()
Expand Down Expand Up @@ -679,7 +682,13 @@ sub _common_uri {
my $uri = URI->new;
$uri->scheme($scheme);
$uri->authority( $host || "$server:$port" );
$uri->path( $path || '/' );
if (setting('behind_proxy')) {
my $request_base = $self->env->{REQUEST_BASE} || $self->env->{HTTP_REQUEST_BASE} || '';
$uri->path($request_base . $path || '/');
}
else {
$uri->path($path || '/');
}

return $uri;
}
Expand Down