[svn] Minor bugfixing for test suite.

[wget] / tests / HTTPServer.pm

diff --git a/tests/HTTPServer.pm b/tests/HTTPServer.pm
index c7de835fd22e7ba972427b993427141b0ac0de3a..6747359ec648cde68f435f1946194a4bb0b434af 100755 (executable)
--- a/tests/HTTPServer.pm
+++ b/tests/HTTPServer.pm
@@ -1,65 +1,86 @@
 #!/usr/bin/perl -w
 
+package HTTPServer;
+
+use strict;
+
 use HTTP::Daemon;
 use HTTP::Status;
 use HTTP::Headers;
 use HTTP::Response;
 
-use strict;
+our @ISA=qw(HTTP::Daemon);
+my $VERSION = 0.01;
 
-package HTTPServer;
+my $CRLF = "\015\012"; # "\r\n" is not portable
+my $log = undef;
 
-sub run_daemon {
-    my %urls = @_;
-    my $server = HTTP::Daemon->new (LocalAddr => 'localhost', 
-                                    LocalPort => '8080',
-                                    ReuseAddr => 1) or die "Cannot create server!!!";
+sub run {
+    my ($self, $urls) = @_;
                                 
-    while (my $con = $server->accept) {
+    while (my $con = $self->accept) {
+        print STDERR "Accepted a new connection\n" if $log;
         while (my $req = $con->get_request) {
-            # print STDERR "method: ", $req->method, "\n";
-            if ($req->method eq "GET" and $urls{$req->url->path}) {
-                # print STDERR "requested URL: ", $req->url->path, "\n";
+            my $url_path = $req->url->path;
+            if ($url_path =~ m{/$}) {
+                $url_path .= 'index.html';
+            }
+            if ($log) {
+                print STDERR "Method: ", $req->method, "\n";
+                print STDERR "Path: ", $url_path, "\n";
+                print STDERR "Available URLs: ", "\n";
+                foreach my $key (keys %$urls) {
+                    print STDERR $key, "\n";
+                }
+            }
+            if (exists($urls->{$url_path})) {
+                print STDERR "Serving requested URL: ", $url_path, "\n" if $log;
+                next unless ($req->method eq "HEAD" || $req->method eq "GET");
                 
                 # create response
-                my $tmp = $urls{$req->url->path};
-                my $resp = HTTP::Response->new ($tmp->{'code'},
-                                                $tmp->{'msg'});
-                # print STDERR "HTTP::Response: \n", $resp->as_string;
+                my $tmp = $urls->{$url_path};
+                my $resp = HTTP::Response->new ($tmp->{code}, $tmp->{msg});
+                print STDERR "HTTP::Response: \n", $resp->as_string if $log;
                 
-                # fill in headers
-                while (my ($name, $value) = each %{$tmp->{headers}}) {
-                    # print STDERR "setting header: $name = $value\n";
-                    $resp->header($name => $value);
-                }
-                # print STDERR "HTTP::Response with headers: \n", $resp->as_string;
-
-                # fill in content
-                $resp->content($tmp->{content});
-                # print STDERR "HTTP::Response with content: \n", $resp->as_string;
+                #if (is_dynamic_url) { # dynamic resource
+                #} else { # static resource
+                    # fill in headers
+                    while (my ($name, $value) = each %{$tmp->{headers}}) {
+                        # print STDERR "setting header: $name = $value\n";
+                        $resp->header($name => $value);
+                    }
+                    print STDERR "HTTP::Response with headers: \n", $resp->as_string if $log;
+                    
+                    if ($req->method eq "GET") {
+                        if (exists($tmp->{headers}{"Content-Length"})) {
+                            # Content-Length and length($tmp->{content}) don't match
+                            # manually prepare the HTTP response
+                            $con->send_basic_header($tmp->{code}, $resp->message, $resp->protocol);
+                            print $con $resp->headers_as_string($CRLF);
+                            print $con $CRLF;
+                            print $con $tmp->{content};                                
+                            next;
+                        }
+                        # fill in content
+                        $resp->content($tmp->{content});
+                        print STDERR "HTTP::Response with content: \n", $resp->as_string if $log;
+                    }
+                #}
                 
                 $con->send_response($resp);
-                # print STDERR "HTTP::Response sent: \n", $resp->as_string;
+                print STDERR "HTTP::Response sent: \n", $resp->as_string if $log;
             } else {
-                print STDERR "requested wrong URL: ", $req->url->path, "\n";
+                print STDERR "Requested wrong URL: ", $url_path, "\n" if $log;
                 $con->send_error($HTTP::Status::RC_FORBIDDEN);
-            }
+                last;
+            }            
         }
+        print STDERR "Closing connection\n" if $log;
         $con->close;
         undef($con);
     }
 }
 
-sub run {
-    my $pid = fork();
-
-    if($pid == 0) {
-        run_daemon(@_);
-    }
-
-    return $pid;
-}
-
 1;
 
 # vim: et ts=4 sw=4