Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
no need to cache result
  • Loading branch information
kraih committed Aug 28, 2014
1 parent a8aec73 commit 898a5dc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Changes
@@ -1,5 +1,5 @@

5.34 2014-08-28
5.34 2014-08-29
- Added original_remote_address attribute to Mojo::Transaction.

5.33 2014-08-24
Expand Down
11 changes: 3 additions & 8 deletions lib/Mojo/Transaction.pm
Expand Up @@ -47,17 +47,12 @@ sub is_writing { (shift->{state} // 'write') eq 'write' }
sub remote_address {
my $self = shift;

# New address
return $self->original_remote_address(@_) if @_;
return $self->original_remote_address unless $self->req->reverse_proxy;

# Reverse proxy
if ($self->req->reverse_proxy) {
return $self->{forwarded_for} if $self->{forwarded_for};
my $forwarded = $self->req->headers->header('X-Forwarded-For') // '';
$forwarded =~ /([^,\s]+)$/ and return $self->{forwarded_for} = $1;
}

return $self->original_remote_address;
return ($self->req->headers->header('X-Forwarded-For') // '')
=~ /([^,\s]+)$/ ? $1 : $self->original_remote_address;
}

sub resume { shift->_state(qw(write resume)) }
Expand Down

0 comments on commit 898a5dc

Please sign in to comment.