Merge pull request #4 from kazeburo/master

do not send more than one Server header
kazuho · May 27, 2011 · 83b1035 · 83b1035
2 parents 89b50d2 + e52d3f1
commit 83b1035
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 5 deletions.
diff --git a/lib/Starlet/Server.pm b/lib/Starlet/Server.pm
@@ -221,11 +221,7 @@ sub _handle_response {
     my $headers = $res->[1];
     my $body = $res->[2];
 
-    my @lines = (
-        "Date: @{[HTTP::Date::time2str()]}\015\012",
-        "Server: $self->{server_software}\015\012",
-    );
-
+    my @lines;
     my %send_headers;
     for (my $i = 0; $i < @$headers; $i += 2) {
         my $k = $headers->[$i];
@@ -239,6 +235,13 @@ sub _handle_response {
             $send_headers{$lck} = $v;
         }
     }
+    if ( ! exists $send_headers{server} ) {
+        unshift @lines, "Server: $self->{server_software}\015\012";
+    }
+    if ( ! exists $send_headers{date} ) {
+        unshift @lines, "Date: @{[HTTP::Date::time2str()]}\015\012";
+    }
+
     # try to set content-length when keepalive can be used, or disable it
     if ($$use_keepalive_r) {
         if (defined $send_headers{'content-length'}

diff --git a/t/05server-header.t b/t/05server-header.t
@@ -0,0 +1,41 @@
+use strict;
+use warnings;
+use Test::More;
+use Test::TCP;
+use LWP::UserAgent;
+use Plack::Loader;
+
+test_tcp(
+    client => sub {
+        my $port = shift;
+        sleep 1;
+        my $ua = LWP::UserAgent->new;
+        my $res = $ua->get("http://localhost:$port/");
+        ok( $res->is_success );
+        like( scalar $res->header('Server'), qr/Starlet/ );
+        unlike( scalar $res->header('Server'), qr/Hello/ );
+
+        $res = $ua->get("http://localhost:$port/?server=1");
+        ok( $res->is_success );
+        unlike( scalar $res->header('Server'), qr/Starlet/ );
+        like( scalar $res->header('Server'), qr/Hello/ );
+
+    },
+    server => sub {
+        my $port = shift;
+        my $loader = Plack::Loader->load(
+            'Starlet',
+            port => $port,
+            max_workers => 5,
+        );
+        $loader->run(sub{
+            my $env = shift;
+            my @headers = ('Content-Type','text/html');
+            push @headers, 'Server', 'Hello' if $env->{QUERY_STRING};
+            [200, \@headers, ['HELLO']];
+        });
+    },
+);
+
+done_testing;
+