added response method

diff --git a/examples/daemon.pl b/examples/daemon.pl
index a861906..6a6d8e7 100644 (file)
--- a/examples/daemon.pl
+++ b/examples/daemon.pl
@@ -27,6 +27,9 @@ while ( my $client = $server->accept ) {
 
         CGI::initialize_globals();
 
+        $request->uri->scheme('http');
+        $request->uri->host_port( $request->header('Host') || URI->new($server)->host_port );
+
         my $c = HTTP::Request::AsCGI->new( $request, %e )->setup;
         my $q = CGI->new;
 
@@ -37,31 +40,13 @@ while ( my $client = $server->accept ) {
 
         $c->restore;
 
-        my $message = "HTTP/1.1 200\x0d\x0a";
-
-        while ( my $line = $c->stdout->getline ) {
-            $message .= $line;
-            last if $line =~ /^\x0d?\x0a$/;
-        }
-
-        my $response = HTTP::Response->parse($message);
-
-        if ( my $code = $response->header('Status') ) {
-            $response->code($code);
-        }
-
+        my $response = $c->response;
+        
+        # set close to prevent blocking problems in single threaded daemon
         $response->header( Connection => 'close' );
-        $response->protocol( $request->protocol );
-        $response->content( sub {
-            if ( $c->stdout->read( my $buffer, 4096 ) ) {
-                return $buffer;
-            }
-            return undef;
-        });
 
         $client->send_response($response);
-        $client->close;
     }
 
-    #$client->close;
+    $client->close;
 }

diff --git a/lib/HTTP/Request/AsCGI.pm b/lib/HTTP/Request/AsCGI.pm
index 31279fe..78cb41d 100644 (file)
--- a/lib/HTTP/Request/AsCGI.pm
+++ b/lib/HTTP/Request/AsCGI.pm
@@ -77,10 +77,10 @@ sub setup {
     if ( $self->request->content_length ) {
 
         $self->stdin->syswrite( $self->request->content )
-          or croak("Can't write content to stdin: $!");
+          or croak("Can't write request content to stdin handle: $!");
 
         $self->stdin->sysseek( 0, SEEK_SET )
-          or croak("Can't seek stdin: $!");
+          or croak("Can't seek stdin handle: $!");
     }
 
     {
@@ -102,6 +102,61 @@ sub setup {
     return $self;
 }
 
+sub response {
+    my ( $self, $callback ) = @_;
+
+    return undef unless $self->{setuped};
+    return undef unless $self->{restored};
+
+    require HTTP::Response;
+
+    my $message  = undef;
+    my $position = $self->stdin->tell;
+
+    $self->stdin->sysseek( 0, SEEK_SET )
+      or croak("Can't seek stdin handle: $!");
+
+    while ( my $line = $self->stdout->getline ) {
+        $message .= $line;
+        last if $line =~ /^\x0d?\x0a$/;
+    }
+
+    unless ( $message =~ /^HTTP/ ) {
+        $message = "HTTP/1.1 200\x0d\x0a" . $message;
+    }
+
+    my $response = HTTP::Response->parse($message);
+
+    if ( my $code = $response->header('Status') ) {
+        $response->code($code);
+    }
+
+    $response->protocol( $self->request->protocol );
+    $response->headers->date( time() );
+
+    if ( $callback ) {
+        $response->content( sub {
+            if ( $self->stdout->read( my $buffer, 4096 ) ) {
+                return $buffer;
+            }
+            return undef;
+        });        
+    }
+    else {
+        my $length = 0;
+        while ( $self->stdout->read( my $buffer, 4096 ) ) {
+            $length += length($buffer);
+            $response->add_content($buffer);
+        }
+        $response->content_length($length) unless $response->content_length;
+    }
+
+    $self->stdin->sysseek( $position, SEEK_SET )
+      or croak("Can't seek stdin handle: $!");
+
+    return $response;
+}
+
 sub restore {
     my $self = shift;
 
@@ -116,10 +171,8 @@ sub restore {
     open( STDERR, '>&', $self->{restore}->{stderr} )
       or croak("Can't restore stderr: $!");
 
-    if ( $self->stdin->fileno != STDIN->fileno ) {
-        $self->stdin->sysseek( 0, SEEK_SET )
-          or croak("Can't seek stdin: $!");
-    }
+    $self->stdin->sysseek( 0, SEEK_SET )
+      or croak("Can't seek stdin: $!");
 
     if ( $self->stdout->fileno != STDOUT->fileno ) {
         $self->stdout->sysseek( 0, SEEK_SET )
@@ -190,6 +243,8 @@ HTTP::Request::AsCGI - Setup a CGI enviroment from a HTTP::Request
 
 =item request
 
+=item response
+
 =item stdin
 
 =item stdout