Changeset 17712 for lang

Timestamp:

08/16/08 19:46:28 (5 years ago)

Author:

tokuhirom

Message:

no HTTP::Request::AsCGI;

Location:

lang/perl/HTTP-Engine/trunk/lib/HTTP/Engine

Files:

• Interface/POE.pm (modified) (6 diffs)
• Interface/POE/Filter.pm (added)
• Interface/POE/RequestBuilder.pm (modified) (1 diff)
• Interface/POE/ResponseWriter.pm (added)
• ResponseWriter.pm (modified) (1 diff)

lang/perl/HTTP-Engine/trunk/lib/HTTP/Engine/Interface/POE.pm

@@ -6 +6 @@
     Component::Server::TCP
 /;
-use POE::Filter::HTTPD;
+use HTTP::Engine::Interface::POE::Filter;
 use HTTP::Request::AsCGI;
+use IO::Scalar;
+use URI::WithBase;
 
 has host => (
@@ -33 +35 @@
         Port         => $self->port,
         Address      => $self->host,
-        ClientFilter => 'POE::Filter::HTTPD',
+        ClientFilter => 'HTTP::Engine::Interface::POE::Filter',
         ( $self->alias ? ( Alias => $self->alias ) : () ),
         ClientInput  => _client_input($self),
     );
 }
+
+our $CLIENT;
 
 sub _client_input {
@@ -50 +54 @@
         # the responses as they are and finish up.
         if ( $request->isa('HTTP::Response') ) {
-            $heap->{client}->put($request);
+            $heap->{client}->put($request->as_string);
             $kernel->yield('shutdown');
             return;
@@ -56 +60 @@
 
         # follow is normal workflow.
-        my $ascgi = HTTP::Request::AsCGI->new($request)->setup;
         do {
-            my $env = \%ENV;
+            local $CLIENT = $heap->{client};
 
             my $host = $request->header('Host');
@@ -70 +73 @@
                 request_args => {
                     headers => $request->headers,
+                    uri     => URI::WithBase->new($uri),
                     connection_info => {
                         address    => $heap->{remote_ip},
@@ -78 +82 @@
                         protocol   => $request->protocol(),
                     },
+                    _connection => {
+                        input_handle  => do {
+                            my $stdinbuf = $request->content;
+                            IO::Scalar->new( \$stdinbuf );
+                        },
+                        output_handle => undef,
+                        env           => \%ENV,
+                    },
                 },
             );
         };
-        $ascgi->restore;
 
-        $heap->{client}->put($ascgi->response);
         $kernel->yield('shutdown');
     }

lang/perl/HTTP-Engine/trunk/lib/HTTP/Engine/Interface/POE/RequestBuilder.pm

@@ -1 +1 @@
 package HTTP::Engine::Interface::POE::RequestBuilder;
 use Moose;
-extends 'HTTP::Engine::RequestBuilder';
 
-sub _build_connection_info { die "explicit parameter" }
+with qw(
+    HTTP::Engine::Role::RequestBuilder::Standard
+    HTTP::Engine::Role::RequestBuilder::HTTPBody
+);
+
+# all of these will be passed to handle_request
+sub _build_connection { die "explicit parameter" }
+sub _build_uri { die "explicit parameter" }
+sub _build_connection_info { die "explicit parameter" };
+sub _build_headers { die "explicit parameter" };
 
 1;

lang/perl/HTTP-Engine/trunk/lib/HTTP/Engine/ResponseWriter.pm

@@ -34 +34 @@
     }
 
-    local *STDOUT = $req->_connection->{output_handle};
+    local *STDOUT = $req->_connection->{output_handle} if $req->_connection->{output_handle};
     $self->_prepare_write;
     $self->_write($self->_response_line($res) . $CRLF) if $self->should_write_response_line;