bye bye Class::C3. for good.

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Engine / HTTP.pm

diff --git a/lib/Catalyst/Engine/HTTP.pm b/lib/Catalyst/Engine/HTTP.pm
index 30c5201..fb40d6f 100644 (file)
--- a/lib/Catalyst/Engine/HTTP.pm
+++ b/lib/Catalyst/Engine/HTTP.pm
@@ -2,6 +2,7 @@ package Catalyst::Engine::HTTP;
 
 use Moose;
 extends 'Catalyst::Engine::CGI';
+
 use Data::Dump qw(dump);
 use Errno 'EWOULDBLOCK';
 use HTTP::Date ();
@@ -61,8 +62,8 @@ sub finalize_headers {
 
     # Should we keep the connection open?
     my $connection = $c->request->header('Connection');
-    if (   $self->{options}->{keepalive}
-        && $connection
+    if (   $self->{options}->{keepalive} 
+        && $connection 
         && $connection =~ /^keep-alive$/i
     ) {
         $res_headers->header( Connection => 'keep-alive' );
@@ -83,19 +84,21 @@ sub finalize_headers {
 
 =cut
 
-before finalize_read => sub {
+around finalize_read => sub {
     # Never ever remove this, it would result in random length output
     # streams if STDIN eq STDOUT (like in the HTTP engine)
     *STDIN->blocking(1);
+    shift->(@_);
 };
 
 =head2 $self->prepare_read($c)
 
 =cut
 
-befpre prepare_read => sub {
+around prepare_read => sub {
     # Set the input handle to non-blocking
     *STDIN->blocking(0);
+    shift->(@_);
 };
 
 =head2 $self->read_chunk($c, $buffer, $length)
@@ -105,7 +108,7 @@ befpre prepare_read => sub {
 sub read_chunk {
     my $self = shift;
     my $c    = shift;
-
+    
     # If we have any remaining data in the input buffer, send it back first
     if ( $_[0] = delete $self->{inputbuf} ) {
         my $read = length( $_[0] );
@@ -150,7 +153,7 @@ around write => sub {
         $buffer = $headers . $buffer;
     }
 
-    my $ret = $self->$orig( $c, $buffer );
+    my $ret = $self->$orig($c, $buffer);
 
     if ( !defined $ret ) {
         $self->{_write_error} = $!;
@@ -172,7 +175,7 @@ sub run {
     my ( $self, $class, $port, $host, $options ) = @_;
 
     $options ||= {};
-
+    
     $self->{options} = $options;
 
     if ($options->{background}) {
@@ -276,10 +279,10 @@ sub run {
                 }
 
                 $self->_handler( $class, $port, $method, $uri, $protocol );
-
+            
                 if ( my $error = delete $self->{_write_error} ) {
                     close Remote;
-
+                    
                     if ( !defined $pid ) {
                         next LISTEN;
                     }
@@ -311,9 +314,9 @@ sub run {
             close Remote;
         }
     }
-
+    
     $daemon->close;
-
+    
     DEBUG && warn "Shutting down\n";
 
     if ($restart) {
@@ -324,8 +327,8 @@ sub run {
         ### those include dirs upon re-exec. So add them to PERL5LIB, so they
         ### are available again for the exec'ed process --kane
         use Config;
-        $ENV{PERL5LIB} .= join $Config{path_sep}, @INC;
-
+        $ENV{PERL5LIB} .= join $Config{path_sep}, @INC; 
+        
         exec $^X, $0, @{ $options->{argv} };
     }
 
@@ -346,11 +349,11 @@ sub _handler {
 
     my $sel = IO::Select->new;
     $sel->add( \*STDIN );
-
+    
     REQUEST:
     while (1) {
         my ( $path, $query_string ) = split /\?/, $uri, 2;
-
+        
         # Initialize CGI environment
         local %ENV = (
             PATH_INFO       => $path         || '',
@@ -371,37 +374,37 @@ sub _handler {
 
         # Pass flow control to Catalyst
         $class->handle_request;
-
+    
         DEBUG && warn "Request done\n";
-
+    
         # Allow keepalive requests, this is a hack but we'll support it until
         # the next major release.
         if ( delete $self->{_keepalive} ) {
-
+            
             DEBUG && warn "Reusing previous connection for keep-alive request\n";
-
-            if ( $sel->can_read(1) ) {
+            
+            if ( $sel->can_read(1) ) {            
                 if ( !$self->_read_headers ) {
                     # Error reading, give up
                     last REQUEST;
                 }
 
                 ( $method, $uri, $protocol ) = $self->_parse_request_line;
-
+                
                 DEBUG && warn "Parsed request: $method $uri $protocol\n";
-
+                
                 # Force HTTP/1.0
                 $protocol = '1.0';
-
+                
                 next REQUEST;
             }
-
+            
             DEBUG && warn "No keep-alive request within 1 second\n";
         }
-
+        
         last REQUEST;
     }
-
+    
     DEBUG && warn "Closing connection\n";
 
     close Remote;
@@ -472,19 +475,19 @@ sub _parse_headers {
         }
     }
     $headers->push_header( $key, $val ) if $key;
-
+    
     DEBUG && warn "Parsed headers: " . dump($headers) . "\n";
 
     # Convert headers into ENV vars
     $headers->scan( sub {
         my ( $key, $val ) = @_;
-
+        
         $key = uc $key;
         $key = 'COOKIE' if $key eq 'COOKIES';
         $key =~ tr/-/_/;
         $key = 'HTTP_' . $key
             unless $key =~ m/\A(?:CONTENT_(?:LENGTH|TYPE)|COOKIE)\z/;
-
+            
         if ( exists $ENV{$key} ) {
             $ENV{$key} .= ", $val";
         }
@@ -498,19 +501,19 @@ sub _socket_data {
     my ( $self, $handle ) = @_;
 
     my $remote_sockaddr       = getpeername($handle);
-    my ( undef, $iaddr )      = $remote_sockaddr
-        ? sockaddr_in($remote_sockaddr)
+    my ( undef, $iaddr )      = $remote_sockaddr 
+        ? sockaddr_in($remote_sockaddr) 
         : (undef, undef);
-
+        
     my $local_sockaddr        = getsockname($handle);
     my ( undef, $localiaddr ) = sockaddr_in($local_sockaddr);
 
     # This mess is necessary to keep IE from crashing the server
     my $data = {
-        peername  => $iaddr
+        peername  => $iaddr 
             ? ( gethostbyaddr( $iaddr, AF_INET ) || 'localhost' )
             : 'localhost',
-        peeraddr  => $iaddr
+        peeraddr  => $iaddr 
             ? ( inet_ntoa($iaddr) || '127.0.0.1' )
             : '127.0.0.1',
         localname => gethostbyaddr( $localiaddr, AF_INET ) || 'localhost',
@@ -522,6 +525,8 @@ sub _socket_data {
 
 sub _inet_addr { unpack "N*", inet_aton( $_[0] ) }
 
+no Moose;
+
 =head1 SEE ALSO
 
 L<Catalyst>, L<Catalyst::Engine>.