Change Engine::write() to use IO::Select instead of worrying about EWOULDBLOCK

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

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 564cb42..9b59c7d 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -7,7 +7,7 @@ use Data::Dump qw/dump/;
 use HTML::Entities;
 use HTTP::Body;
 use HTTP::Headers;
-use URI::Escape ();
+use IO::Select ();
 use URI::QueryParam;
 use Scalar::Util ();
 
@@ -280,11 +280,7 @@ sub finalize_headers { }
 
 =cut
 
-sub finalize_read {
-    my ( $self, $c ) = @_;
-
-    undef $self->{_prepared_read};
-}
+sub finalize_read { }
 
 =head2 $self->finalize_uploads($c)
 
@@ -313,12 +309,8 @@ sets up the L<Catalyst::Request> object body using L<HTTP::Body>
 
 sub prepare_body {
     my ( $self, $c ) = @_;
-    
-    my $length = $c->request->header('Content-Length') || 0;
-
-    $self->read_length( $length );
 
-    if ( $length > 0 ) {
+    if ( my $length = $self->read_length ) {
         unless ( $c->request->{_body} ) {
             my $type = $c->request->header('Content-Type');
             $c->request->{_body} = HTTP::Body->new( $type, $length );
@@ -449,8 +441,9 @@ sub prepare_query_parameters {
     my ( $self, $c, $query_string ) = @_;
     
     # Check for keywords (no = signs)
+    # (yes, index() is faster than a regex :))
     if ( index( $query_string, '=' ) < 0 ) {
-        $c->request->keywords( $self->unescape_uri($query_string) );
+        $c->request->query_keywords( $self->unescape_uri($query_string) );
         return;
     }
 
@@ -494,8 +487,11 @@ prepare to read from the engine.
 sub prepare_read {
     my ( $self, $c ) = @_;
 
-    # Reset the read position
+    # Initialize the read position
     $self->read_position(0);
+    
+    # Initialize the amount of data we think we need to read
+    $self->read_length( $c->request->header('Content-Length') || 0 );
 }
 
 =head2 $self->prepare_request(@arguments)
@@ -565,11 +561,6 @@ sub prepare_write { }
 sub read {
     my ( $self, $c, $maxlength ) = @_;
 
-    unless ( $self->{_prepared_read} ) {
-        $self->prepare_read($c);
-        $self->{_prepared_read} = 1;
-    }
-
     my $remaining = $self->read_length - $self->read_position;
     $maxlength ||= $CHUNKSIZE;
 
@@ -619,7 +610,7 @@ sub run { }
 
 =head2 $self->write($c, $buffer)
 
-Writes the buffer to the client. Can only be called once for a request.
+Writes the buffer to the client.
 
 =cut
 
@@ -630,8 +621,31 @@ sub write {
         $self->prepare_write($c);
         $self->{_prepared_write} = 1;
     }
-
-    print STDOUT $buffer;
+    
+    my $wrote;
+    my $len = length($buffer);
+    
+    my $sel = IO::Select->new();
+    $sel->add( \*STDOUT );
+    
+    while ( $sel->can_write() ) {
+        $wrote ||= 0;
+        
+        my $ret = syswrite STDOUT, $buffer, $CHUNKSIZE, $wrote;
+        if ( defined $ret ) {
+            $wrote += $ret;
+        }
+        else {
+            # Write error
+            return;
+        }
+    
+        last if $wrote >= $len;
+    }
+    
+    $sel->remove( \*STDOUT );
+    
+    return $wrote;
 }
 
 =head2 $self->unescape_uri($uri)
@@ -642,12 +656,11 @@ as Apache may implement this using Apache's C-based modules, for example.
 =cut
 
 sub unescape_uri {
-    my $self = shift;
-    
-    my $e = URI::Escape::uri_unescape(@_);
-    $e =~ s/\+/ /g;
-    
-    return $e;
+    my ( $self, $str ) = @_;
+
+    $str =~ s/(?:%([0-9A-Fa-f]{2})|\+)/defined $1 ? chr(hex($1)) : ' '/eg;
+
+    return $str;
 }
 
 =head2 $self->finalize_output