[Catalyst-commits] r6471 - in branches: . Catalyst-Runtime-proxystuff/lib/Catalyst

[jrockway at dev.catalyst.perl.org]

Author: jrockway
Date: 2007-06-17 20:29:37 +0100 (Sun, 17 Jun 2007)
New Revision: 6471

Modified:
   branches/
   branches/Catalyst-Runtime-proxystuff/lib/Catalyst/Engine.pm
Log:
 r26680 at foo:  jon | 2007-06-17 13:52:38 -0500
 don't use values that aren't defined



Property changes on: branches
___________________________________________________________________
Name: svk:merge
   - d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst-branches:26678
   + d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst-branches:26680

Modified: branches/Catalyst-Runtime-proxystuff/lib/Catalyst/Engine.pm
===================================================================
--- branches/Catalyst-Runtime-proxystuff/lib/Catalyst/Engine.pm	2007-06-17 19:10:16 UTC (rev 6470)
+++ branches/Catalyst-Runtime-proxystuff/lib/Catalyst/Engine.pm	2007-06-17 19:29:37 UTC (rev 6471)
@@ -434,9 +434,12 @@
 
     # If we are running as a backend server, the user will always appear
     # as 127.0.0.1. Select the most recent upstream IP (last in the list)
-    my ($ip) = $c->request->header('X-Forwarded-For') =~ /([^,\s]+)$/;
-    $c->request->address($ip);
-
+    my $x_forwarded_for = $c->request->header('X-Forwarded-For');
+    if ($x_forwarded_for) {
+        my ($ip) = ($x_forwarded_for =~ /([^,\s]+)$/);
+        $c->request->address($ip);
+    }
+    
     my %uri;
     $uri{host}   = $c->request->header('X-Forwarded-Host');
     $uri{port}   = $c->request->header('X-Forwarded-Port');