Skip to content

Commit 9d4d838

Browse files
committed
Update test and remove lingering keys in request
1 parent c369c85 commit 9d4d838

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

lib/Dancer2/Core/App.pm

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,12 +1593,11 @@ sub build_request {
15931593

15941594
# If we have an app, send the serialization engine
15951595
my $request = Dancer2::Core::Request->new(
1596-
env => $env,
1597-
is_behind_proxy => $self->settings->{'behind_proxy'} || 0,
1596+
env => $env,
15981597

1599-
$self->has_serializer_engine
1600-
? ( serializer => $self->serializer_engine )
1601-
: (),
1598+
$self->has_serializer_engine
1599+
? ( serializer => $self->serializer_engine )
1600+
: (),
16021601
);
16031602

16041603
return $request;

lib/Dancer2/Core/Request.pm

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ our $XS_HTTP_COOKIES = eval { require_module('HTTP::XSCookies'); 1; };
4444

4545
our $_id = 0;
4646

47-
# self->new( env => {}, serializer => $s, is_behind_proxy => 0|1 )
47+
# self->new( env => {}, serializer => $s )
4848
sub new {
4949
my ( $class, @args ) = @_;
5050

@@ -65,9 +65,8 @@ sub new {
6565
}
6666

6767
# additionally supported attributes
68-
$self->{'id'} = ++$_id;
69-
$self->{'vars'} = {};
70-
$self->{'is_behind_proxy'} = !!$opts{'is_behind_proxy'};
68+
$self->{'id'} = ++$_id;
69+
$self->{'vars'} = {};
7170

7271
$opts{'body_params'}
7372
and $self->{'_body_params'} = $opts{'body_params'};
@@ -566,8 +565,7 @@ sub _shallow_clone {
566565
$new_request->{headers} = $self->headers;
567566

568567
# Copy remaining settings
569-
$new_request->{is_behind_proxy} = $self->{is_behind_proxy};
570-
$new_request->{vars} = $self->{vars};
568+
$new_request->{vars} = $self->{vars};
571569

572570
# Clone any existing decoded & cached body params. (GH#1116 GH#1269)
573571
$new_request->{'body_parameters'} = $self->body_parameters->clone;

t/issues/gh-730.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use HTTP::Request::Common;
88
package App;
99
use Dancer2;
1010

11-
get '/' => sub { request->is_behind_proxy };
11+
get '/' => sub { app->config->{'behind_proxy'} };
1212
}
1313

1414
my $app = App->to_app;

0 commit comments

Comments
 (0)