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

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.46 by root, Sat Nov 17 04:15:23 2001 UTC vs.
Revision 1.48 by root, Tue Nov 27 03:38:08 2001 UTC

 use Coro::Event;
 use Coro::Socket;
 use Coro::Signal;
 use HTTP::Date;
+use POSIX ();
 no utf8;
 use bytes;
 # at least on my machine, this thingy serves files
 our $httpevent   = new Coro::Signal;
 our $wait_factor = 0.95;
 our @transfers = (
-  [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
+  [(new Coro::Semaphore $MAX_TRANSFERS_SMALL), 1],
-  [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
+  [(new Coro::Semaphore $MAX_TRANSFERS_LARGE), 1],
 );
 my @newcons;
 my @pool;
    }
    $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).
-   my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
+             " $self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
    print $accesslog $log if $accesslog;
    print STDERR $log;
    $self->{written} +=
    $self->response(200, "ok",
          {
             "Content-Type"   => "text/html",
             "Content-Length" => length $idx,
+            "Last-Modified"  => time2str ((stat _)[9]),
          },
          $idx);
 }
 sub handle_file {
       my $fudge = $queue->[0]->waiters;
       $fudge = $fudge ? ($fudge+1)/$fudge : 1;
       $queue->[1] *= $fudge;
-      my $transfer = $queue->[0]->guard;
-      if ($fudge != 1) {
-         $queue->[1] /= $fudge;
-         $queue->[1] = $queue->[1] * $::wait_factor
-                     + ($::NOW - $self->{time}) * (1 - $::wait_factor);
-      }
-      $self->{time} = $::NOW;
-      $self->{fh}->writable or return;
       my ($fh, $buf, $r);
       my $current = $Coro::current;
       open $fh, "<", $self->{path}
          or die "$self->{path}: late open failure ($!)";
       if (0) {
          if ($l) {
             sysseek $fh, $l, 0;
          }
       }
+      my $transfer; # transfer guard
+      my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
       while ($h > 0) {
+         unless ($transfer) {
+            if ($transfer ||= $queue->[0]->timed_guard($::WAIT_INTERVAL)) {
+               if ($fudge != 1) {
+                  $queue->[1] /= $fudge;
+                  $queue->[1] = $queue->[1] * $::wait_factor
+                              + ($::NOW - $self->{time}) * (1 - $::wait_factor);
+               }
+               $bufsize = $::BUFSIZE;
+               $self->{time} = $::NOW;
+            }
+         }
          if (0) {
-            sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
+            sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
                or last;
          } else {
-            aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
+            aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
                      $buf, 0, sub {
                         $r = $_[0];
                         Coro::ready($current);
                      });
             &Coro::schedule;

Diff Legend

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

Comparing Coro/myhttpd/httpd.pl (file contents): Revision 1.46 by root, Sat Nov 17 04:15:23 2001 UTC vs. Revision 1.48 by root, Tue Nov 27 03:38:08 2001 UTC

Diff Legend

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.46 by root, Sat Nov 17 04:15:23 2001 UTC vs.
Revision 1.48 by root, Tue Nov 27 03:38:08 2001 UTC