[Catalyst-commits] r6289 - trunk/Catalyst-Runtime/lib/Catalyst/Engine

[andyg at dev.catalyst.perl.org]

Author: andyg
Date: 2007-04-16 19:14:59 +0100 (Mon, 16 Apr 2007)
New Revision: 6289

Modified:
   trunk/Catalyst-Runtime/lib/Catalyst/Engine/HTTP.pm
Log:
Fix broken HTTP engine after botched merge from 2 weeks ago

Modified: trunk/Catalyst-Runtime/lib/Catalyst/Engine/HTTP.pm
===================================================================
--- trunk/Catalyst-Runtime/lib/Catalyst/Engine/HTTP.pm	2007-04-16 17:05:06 UTC (rev 6288)
+++ trunk/Catalyst-Runtime/lib/Catalyst/Engine/HTTP.pm	2007-04-16 18:14:59 UTC (rev 6289)
@@ -346,6 +346,9 @@
     $sel->add( \*STDIN );
     
     REQUEST:
+    while (1) {
+        my ( $path, $query_string ) = split /\?/, $uri, 2;
+        
         # Initialize CGI environment
         local %ENV = (
             PATH_INFO       => $path         || '',
@@ -359,19 +362,6 @@
             %copy_of_env,
         );
 
-        # Initialize CGI environment
-        local %ENV = (
-            PATH_INFO       => $path         || '',
-            QUERY_STRING    => $query_string || '',
-            REMOTE_ADDR     => $sockdata->{peeraddr},
-            REMOTE_HOST     => $sockdata->{peername},
-            REQUEST_METHOD  => $method || '',
-            SERVER_NAME     => $sockdata->{localname},
-            SERVER_PORT     => $port,
-            SERVER_PROTOCOL => "HTTP/$protocol",
-            %copy_of_env,
-        );
-
         # Parse headers
         if ( $protocol >= 1 ) {
             $self->_parse_headers;