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 090b4f2..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 ();
@@ -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)
@@ -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} = $!;
@@ -159,7 +162,7 @@ around write => sub {
     else {
         DEBUG && warn "write: Wrote response ($ret bytes)\n";
     }
-    
+
     return $ret;
 };
 
@@ -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>.