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

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.79 by root, Fri Dec 1 03:53:33 2006 UTC vs.
Revision 1.80 by root, Fri Dec 1 04:18:32 2006 UTC

 our $accesslog;
 our $errorlog;
 our $NOW;
 our $HTTP_NOW;
+our $ERROR_LOG;
+our $ACCESS_LOG;
 Event->timer(interval => 1, hard => 1, cb => sub {
    $NOW = time;
    $HTTP_NOW = time2str $NOW;
 })->now;
    listen_on $http_port;
 }
 package conn;
+use strict;
+use bytes;
 use Socket;
 use HTTP::Date;
 use Convert::Scalar 'weaken';
 use IO::AIO;
    for (keys %$hash) {
       if (ref $hash->{$_} eq HASH::) {
          prune_cache($hash->{$_});
          unless (scalar keys %{$hash->{$_}}) {
             delete $hash->{$_};
-            $d2++;
          }
       }
    }
 }
    if ($self->{method} eq "GET") {
       $self->{time} = $::NOW;
       $self->{written} = 0;
-      my $current = $Coro::current;
+      my $fh;
-      my ($fh, $buf, $r);
       open $fh, "<", $self->{path}
          or die "$self->{path}: late open failure ($!)";
       $h -= $l - 1;
          if ($blocked{$self->{remote_id}}) {
             $self->{h}{connection} = "close";
             die bless {}, err::;
          }
-         Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), $buf, 0
+         Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), my $buf, 0
             or last;
          $tbf->request (length $buf);
          my $w = syswrite $self->{fh}, $buf
             or last;
          $::written += $w;
          $self->{written} += $w;
-         $l += $r;
+         $l += $w;
       }
       close $fh;
    }
 }

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