[ViewVC] Diff of: cvs/Coro/myhttpd/httpd.pl

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.58 by root, Mon Dec 3 21:32:35 2001 UTC vs.
Revision 1.63 by root, Wed Jan 23 03:07:05 2002 UTC

 use Coro::Socket;
 use Coro::Signal;
 use HTTP::Date;
 use POSIX ();
+use Compress::Zlib ();
 no utf8;
 use bytes;
 # at least on my machine, this thingy serves files
    my (undef, $iaddr) = unpack_sockaddr_in $peername
       or $self->err(500, "unable to decode peername");
    $self->{remote_addr} =
       $self->{remote_id} = inet_ntoa $iaddr;
    $self->{time} = $::NOW;
    weaken ($Coro::current->{conn} = $self);
    $::conns++;
 }
 sub response {
    my ($self, $code, $msg, $hdr, $content) = @_;
    my $res = "HTTP/1.1 $code $msg\015\012";
+   my $GZ = "";
    if (exists $hdr->{Connection}) {
       if ($hdr->{Connection} =~ /close/) {
          $self->{h}{connection} = "close"
       }
             $self->{h}{connection} = "close"
          }
       }
    }
+   if ($self->{method} ne "HEAD"
+       && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
+       && $hdr->{"Content-Length"} == length $content
+       && !exists $hdr->{"Content-Encoding"}
+   ) {
+      my $orig = length $content;
+      $hdr->{"Content-Encoding"} = "gzip";
+      $content = Compress::Zlib::memGzip(\$content);
+      $hdr->{"Content-Length"} = length $content;
+      $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
+   }
    $res .= "Date: $HTTP_NOW\015\012";
    while (my ($h, $v) = each %$hdr) {
       $res .= "$h: $v\015\012"
    }
    $res .= "\015\012";
    $res .= $content if defined $content and $self->{method} ne "HEAD";
    my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
-             " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
+             " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
              " \"$self->{h}{referer}\"\n";
    print $accesslog $log if $accesslog;
    print STDERR $log;
          my (%hdr, $h, $v);
          $hdr{lc $1} .= ",$2"
             while $req =~ /\G
                   ([^:\000-\040]+):
-                  [\008\040]*
+                  [\010\040]*
-                  ((?: [^\015\012]+ | \015\012[\008\040] )*)
+                  ((?: [^\015\012]+ | \015\012[\010\040] )*)
                   \015\012
                /gxc;
          $req =~ /\G\015\012$/
             or $self->err(400, "bad request");
             }
          }
          if ($blocked{$self->{remote_id}}) {
             $self->{h}{connection} = "close";
-            die bless {}, err::
+            die bless {}, err::;
          }
          if (0) { # !AIO
             sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
                or last;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing Coro/myhttpd/httpd.pl (file contents): Revision 1.58 by root, Mon Dec 3 21:32:35 2001 UTC vs. Revision 1.63 by root, Wed Jan 23 03:07:05 2002 UTC

Diff Legend

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.58 by root, Mon Dec 3 21:32:35 2001 UTC vs.
Revision 1.63 by root, Wed Jan 23 03:07:05 2002 UTC