ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/Coro/myhttpd/httpd.pl
(Generate patch)

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.57 by root, Mon Dec 3 05:40:09 2001 UTC vs.
Revision 1.72 by root, Tue Sep 10 03:08:03 2002 UTC

… …
4use Coro::Socket; 4use Coro::Socket;
5use Coro::Signal; 5use Coro::Signal;
6 6
7use HTTP::Date; 7use HTTP::Date;
8use POSIX (); 8use POSIX ();
9
10use Compress::Zlib ();
9 11
10no utf8; 12no utf8;
11use bytes; 13use bytes;
12 14
13# at least on my machine, this thingy serves files 15# at least on my machine, this thingy serves files
… …
52our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
53our $httpevent = new Coro::Signal; 55our $httpevent = new Coro::Signal;
54 56
55our $queue_file = new transferqueue $MAX_TRANSFERS; 57our $queue_file = new transferqueue $MAX_TRANSFERS;
56our $queue_index = new transferqueue 10; 58our $queue_index = new transferqueue 10;
59
60our $tbf_top = new tbf rate => $TBF_RATE || 100000;
61
62my $unused_bytes = 0;
63my $unused_last = time;
64
65sub unused_bandwidth {
66 $unused_bytes += $_[0];
67 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
68 $unused_last = $NOW;
69 $unused_bytes = 0;
70 $queue_file->force_wake_next;
71 slog 1, "forced filetransfer due to unused bandwidth";
72 }
73}
57 74
58my @newcons; 75my @newcons;
59my @pool; 76my @pool;
60 77
61# one "execution thread" 78# one "execution thread"
… …
93 if (@pool) { 110 if (@pool) {
94 (pop @pool)->ready; 111 (pop @pool)->ready;
95 } else { 112 } else {
96 async \&handler; 113 async \&handler;
97 } 114 }
98
99 } 115 }
100 }; 116 };
101} 117}
102 118
103my $http_port = new Coro::Socket 119my $http_port = new Coro::Socket
… …
161 my (undef, $iaddr) = unpack_sockaddr_in $peername 177 my (undef, $iaddr) = unpack_sockaddr_in $peername
162 or $self->err(500, "unable to decode peername"); 178 or $self->err(500, "unable to decode peername");
163 179
164 $self->{remote_addr} = 180 $self->{remote_addr} =
165 $self->{remote_id} = inet_ntoa $iaddr; 181 $self->{remote_id} = inet_ntoa $iaddr;
182
166 $self->{time} = $::NOW; 183 $self->{time} = $::NOW;
167 184
168 weaken ($Coro::current->{conn} = $self); 185 weaken ($Coro::current->{conn} = $self);
169 186
170 $::conns++; 187 $::conns++;
… …
184} 201}
185 202
186sub response { 203sub response {
187 my ($self, $code, $msg, $hdr, $content) = @_; 204 my ($self, $code, $msg, $hdr, $content) = @_;
188 my $res = "HTTP/1.1 $code $msg\015\012"; 205 my $res = "HTTP/1.1 $code $msg\015\012";
206 my $GZ = "";
189 207
190 if (exists $hdr->{Connection}) { 208 if (exists $hdr->{Connection}) {
191 if ($hdr->{Connection} =~ /close/) { 209 if ($hdr->{Connection} =~ /close/) {
192 $self->{h}{connection} = "close" 210 $self->{h}{connection} = "close"
193 } 211 }
… …
199 $self->{h}{connection} = "close" 217 $self->{h}{connection} = "close"
200 } 218 }
201 } 219 }
202 } 220 }
203 221
222 if ($self->{method} ne "HEAD"
223 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
224 && 400 < length $content
225 && $hdr->{"Content-Length"} == length $content
226 && !exists $hdr->{"Content-Encoding"}
227 ) {
228 my $orig = length $content;
229 $hdr->{"Content-Encoding"} = "gzip";
230 $content = Compress::Zlib::memGzip(\$content);
231 $hdr->{"Content-Length"} = length $content;
232 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
233 }
234
204 $res .= "Date: $HTTP_NOW\015\012"; 235 $res .= "Date: $HTTP_NOW\015\012";
236 $res .= "Server: $::NAME\015\012";
205 237
206 while (my ($h, $v) = each %$hdr) { 238 while (my ($h, $v) = each %$hdr) {
207 $res .= "$h: $v\015\012" 239 $res .= "$h: $v\015\012"
208 } 240 }
209 $res .= "\015\012"; 241 $res .= "\015\012";
210 242
211 $res .= $content if defined $content and $self->{method} ne "HEAD"; 243 $res .= $content if defined $content and $self->{method} ne "HEAD";
212 244
213 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 245 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
214 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}. 246 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
215 " \"$self->{h}{referer}\"\n"; 247 " \"$self->{h}{referer}\"\n";
216 248
217 print $accesslog $log if $accesslog; 249 print $::accesslog $log if $::accesslog;
218 print STDERR $log; 250 print STDERR $log;
219 251
220 $self->{written} += 252 $tbf_top->request(length $res, 1e6);
221 print {$self->{fh}} $res; 253 $self->{written} += print {$self->{fh}} $res;
222} 254}
223 255
224sub err { 256sub err {
225 my $self = shift; 257 my $self = shift;
226 my ($code, $msg, $hdr, $content) = @_; 258 my ($code, $msg, $hdr, $content) = @_;
… …
281 my (%hdr, $h, $v); 313 my (%hdr, $h, $v);
282 314
283 $hdr{lc $1} .= ",$2" 315 $hdr{lc $1} .= ",$2"
284 while $req =~ /\G 316 while $req =~ /\G
285 ([^:\000-\040]+): 317 ([^:\000-\040]+):
286 [\008\040]* 318 [\011\040]*
287 ((?: [^\015\012]+ | \015\012[\008\040] )*) 319 ((?: [^\015\012]+ | \015\012[\011\040] )*)
288 \015\012 320 \015\012
289 /gxc; 321 /gxc;
290 322
291 $req =~ /\G\015\012$/ 323 $req =~ /\G\015\012$/
292 or $self->err(400, "bad request"); 324 or $self->err(400, "bad request");
… …
440 or $self->err(304, "not modified"); 472 or $self->err(304, "not modified");
441 473
442 if (-r "$path/index.html") { 474 if (-r "$path/index.html") {
443 # replace directory "size" by index.html filesize 475 # replace directory "size" by index.html filesize
444 $self->{stat} = [stat ($self->{path} .= "/index.html")]; 476 $self->{stat} = [stat ($self->{path} .= "/index.html")];
445 $self->handle_file($queue_index); 477 $self->handle_file($queue_index, $tbf_top);
446 } else { 478 } else {
447 $self->handle_dir; 479 $self->handle_dir;
448 } 480 }
449 } 481 }
450 } elsif (-f _ && -r _) { 482 } elsif (-f _ && -r _) {
451 -x _ and $self->err(403, "forbidden"); 483 -x _ and $self->err(403, "forbidden");
452 484
453 if (%{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) { 485 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
454 my $timeout = $::NOW + 10; 486 my $timeout = $::NOW + 10;
455 while (%{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) { 487 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
456 if ($timeout < $::NOW) { 488 if ($timeout < $::NOW) {
457 $self->block($::BLOCKTIME, "too many connections"); 489 $self->block($::BLOCKTIME, "too many connections");
458 } else { 490 } else {
459 $httpevent->wait; 491 $httpevent->wait;
460 } 492 }
461 } 493 }
462 } 494 }
463 495
464 $self->handle_file($queue_file); 496 $self->handle_file($queue_file, $tbf_top);
465 } else { 497 } else {
466 $self->err(404, "not found"); 498 $self->err(404, "not found");
467 } 499 }
468 } 500 }
469} 501}
… …
480 }, 512 },
481 $idx); 513 $idx);
482} 514}
483 515
484sub handle_file { 516sub handle_file {
485 my ($self, $queue) = @_; 517 my ($self, $queue, $tbf) = @_;
486 my $length = $self->{stat}[7]; 518 my $length = $self->{stat}[7];
487 my $hdr = { 519 my $hdr = {
488 "Last-Modified" => time2str ((stat _)[9]), 520 "Last-Modified" => time2str ((stat _)[9]),
489 }; 521 };
490 522
… …
509 541
510satisfiable: 542satisfiable:
511 # check for segmented downloads 543 # check for segmented downloads
512 if ($l && $::NO_SEGMENTED) { 544 if ($l && $::NO_SEGMENTED) {
513 my $timeout = $::NOW + 15; 545 my $timeout = $::NOW + 15;
514 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 546 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
515 if ($timeout <= $::NOW) { 547 if ($timeout <= $::NOW) {
516 $self->block($::BLOCKTIME, "segmented downloads are forbidden"); 548 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
517 #$self->err_segmented_download; 549 #$self->err_segmented_download;
518 } else { 550 } else {
519 $httpevent->wait; 551 $httpevent->wait;
… …
536 568
537 $self->response(@code, $hdr, ""); 569 $self->response(@code, $hdr, "");
538 570
539 if ($self->{method} eq "GET") { 571 if ($self->{method} eq "GET") {
540 $self->{time} = $::NOW; 572 $self->{time} = $::NOW;
573 $self->{written} = 0;
541 574
542 my $current = $Coro::current; 575 my $current = $Coro::current;
543 576
544 my ($fh, $buf, $r); 577 my ($fh, $buf, $r);
545 578
… …
561 while ($h > 0) { 594 while ($h > 0) {
562 unless ($locked) { 595 unless ($locked) {
563 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 596 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
564 $bufsize = $::BUFSIZE; 597 $bufsize = $::BUFSIZE;
565 $self->{time} = $::NOW; 598 $self->{time} = $::NOW;
599 $self->{written} = 0;
566 } 600 }
567 } 601 }
568 602
569 if ($blocked{$self->{remote_id}}) { 603 if ($blocked{$self->{remote_id}}) {
570 $self->{h}{connection} = "close"; 604 $self->{h}{connection} = "close";
571 die bless {}, err:: 605 die bless {}, err::;
572 } 606 }
573 607
574 if (0) { # !AIO 608 if (0) { # !AIO
575 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 609 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
576 or last; 610 or last;
… …
581 Coro::ready($current); 615 Coro::ready($current);
582 }); 616 });
583 &Coro::schedule; 617 &Coro::schedule;
584 last unless $r; 618 last unless $r;
585 } 619 }
620
621 $tbf->request(length $buf);
586 my $w = syswrite $self->{fh}, $buf 622 my $w = syswrite $self->{fh}, $buf
587 or last; 623 or last;
588 $::written += $w; 624 $::written += $w;
589 $self->{written} += $w; 625 $self->{written} += $w;
590 $l += $r; 626 $l += $r;

Diff Legend

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