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.65 by root, Fri Jan 25 09:26:13 2002 UTC vs.
Revision 1.89 by root, Sun Jan 24 20:44:34 2010 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::Event; 3use Coro::EV;
4use Coro::Socket; 4use Coro::Socket;
5use Coro::Signal; 5use Coro::Signal;
6use Coro::AIO ();
6 7
7use HTTP::Date; 8use HTTP::Date;
8use POSIX (); 9use POSIX ();
9 10
10use Compress::Zlib (); 11use Compress::Zlib ();
… …
22our $errorlog; 23our $errorlog;
23 24
24our $NOW; 25our $NOW;
25our $HTTP_NOW; 26our $HTTP_NOW;
26 27
27Event->timer(interval => 1, hard => 1, cb => sub { 28our $ERROR_LOG;
29our $ACCESS_LOG;
30
31our $update_time = EV::periodic 0, 1, undef, sub {
28 $NOW = time; 32 $NOW = time;
29 $HTTP_NOW = time2str $NOW; 33 $HTTP_NOW = time2str $NOW;
30})->now; 34};
35$update_time->invoke;
31 36
32if ($ERROR_LOG) { 37if ($ERROR_LOG) {
33 use IO::Handle; 38 use IO::Handle;
34 open $errorlog, ">>$ERROR_LOG" 39 open $errorlog, ">>$ERROR_LOG"
35 or die "$ERROR_LOG: $!"; 40 or die "$ERROR_LOG: $!";
… …
55our $httpevent = new Coro::Signal; 60our $httpevent = new Coro::Signal;
56 61
57our $queue_file = new transferqueue $MAX_TRANSFERS; 62our $queue_file = new transferqueue $MAX_TRANSFERS;
58our $queue_index = new transferqueue 10; 63our $queue_index = new transferqueue 10;
59 64
60my @newcons; 65our $tbf_top = new tbf rate => $TBF_RATE || 100000;
61my @pool;
62 66
63# one "execution thread" 67my $unused_bytes = 0;
64sub handler { 68my $unused_last = time;
65 while () {
66 if (@newcons) {
67 eval {
68 conn->new(@{pop @newcons})->handle;
69 };
70 slog 1, "$@" if $@ && !ref $@;
71 69
72 $httpevent->broadcast; # only for testing, but doesn't matter much 70sub unused_bandwidth {
73 71 $unused_bytes += $_[0];
74 $connections->up; 72 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
75 } else { 73 $unused_last = $NOW;
76 last if @pool >= $MAX_POOL; 74 $unused_bytes = 0;
77 push @pool, $Coro::current; 75 $queue_file->force_wake_next;
78 schedule; 76 slog 1, "forced filetransfer due to unused bandwidth";
79 }
80 } 77 }
81} 78}
82 79
83sub listen_on { 80sub listen_on {
84 my $listen = $_[0]; 81 my $listen = $_[0];
… …
88 # the "main thread" 85 # the "main thread"
89 async { 86 async {
90 slog 1, "accepting connections"; 87 slog 1, "accepting connections";
91 while () { 88 while () {
92 $connections->down; 89 $connections->down;
93 push @newcons, [$listen->accept]; 90 my @conn = $listen->accept;
94 #slog 3, "accepted @$connections ".scalar(@pool); 91 #slog 3, "accepted @$connections ".scalar(@pool);
95 if (@pool) { 92
96 (pop @pool)->ready; 93 async_pool {
97 } else { 94 eval {
98 async \&handler; 95 conn->new (@conn)->handle;
99 } 96 };
97 slog 1, "$@" if $@ && !ref $@;
100 98
99 $httpevent->broadcast; # only for testing, but doesn't matter much
100
101 $connections->up;
102 }
101 } 103 }
102 }; 104 };
103} 105}
104 106
105my $http_port = new Coro::Socket 107my $http_port = new Coro::Socket
106 LocalAddr => $SERVER_HOST, 108 LocalAddr => $SERVER_HOST,
107 LocalPort => $SERVER_PORT, 109 LocalPort => $SERVER_PORT,
108 ReuseAddr => 1, 110 ReuseAddr => 1,
109 Listen => 50, 111 Listen => 50,
110 or die "unable to start server"; 112 or die "unable to start server";
111 113
112listen_on $http_port; 114listen_on $http_port;
113 115
114if ($SERVER_PORT2) { 116if ($SERVER_PORT2) {
115 my $http_port = new Coro::Socket 117 my $http_port = new Coro::Socket
116 LocalAddr => $SERVER_HOST, 118 LocalAddr => $SERVER_HOST,
117 LocalPort => $SERVER_PORT2, 119 LocalPort => $SERVER_PORT2,
118 ReuseAddr => 1, 120 ReuseAddr => 1,
119 Listen => 50, 121 Listen => 50,
120 or die "unable to start server"; 122 or die "unable to start server";
121 123
122 listen_on $http_port; 124 listen_on $http_port;
123} 125}
124 126
125package conn; 127package conn;
128
129use strict;
130use bytes;
126 131
127use Socket; 132use Socket;
128use HTTP::Date; 133use HTTP::Date;
129use Convert::Scalar 'weaken'; 134use Convert::Scalar 'weaken';
130use Linux::AIO; 135use IO::AIO;
131 136
132Linux::AIO::min_parallel $::AIO_PARALLEL; 137IO::AIO::min_parallel $::AIO_PARALLEL;
133 138
134Event->io(fd => Linux::AIO::poll_fileno, 139our $AIO_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
135 poll => 'r', async => 1,
136 cb => \&Linux::AIO::poll_cb);
137 140
138our %conn; # $conn{ip}{self} => connobj 141our %conn; # $conn{ip}{self} => connobj
139our %uri; # $uri{ip}{uri}{self} 142our %uri; # $uri{ip}{uri}{self}
140our %blocked; 143our %blocked;
141our %mimetype; 144our %mimetype;
142 145
143sub read_mimetypes { 146sub read_mimetypes {
144 local *M;
145 if (open M, "<mime_types") { 147 if (open my $fh, "<mime_types") {
146 while (<M>) { 148 while (<$fh>) {
147 if (/^([^#]\S+)\t+(\S+)$/) { 149 if (/^([^#]\S+)\t+(\S+)$/) {
148 $mimetype{lc $1} = $2; 150 $mimetype{lc $1} = $2;
149 } 151 }
150 } 152 }
151 } else { 153 } else {
… …
159 my $class = shift; 161 my $class = shift;
160 my $fh = shift; 162 my $fh = shift;
161 my $peername = shift; 163 my $peername = shift;
162 my $self = bless { fh => $fh }, $class; 164 my $self = bless { fh => $fh }, $class;
163 my (undef, $iaddr) = unpack_sockaddr_in $peername 165 my (undef, $iaddr) = unpack_sockaddr_in $peername
164 or $self->err(500, "unable to decode peername"); 166 or $self->err (500, "unable to decode peername");
165 167
166 $self->{remote_addr} = 168 $self->{remote_addr} =
167 $self->{remote_id} = inet_ntoa $iaddr; 169 $self->{remote_id} = inet_ntoa $iaddr;
168 170
169 $self->{time} = $::NOW; 171 $self->{time} = $::NOW;
170 172
171 weaken ($Coro::current->{conn} = $self); 173 weaken ($Coro::current->{conn} = $self);
172 174
173 $::conns++; 175 ++$::conns;
174 $::maxconns = $::conns if $::conns > $::maxconns; 176 $::maxconns = $::conns if $::conns > $::maxconns;
175 177
176 $self; 178 $self
177} 179}
178 180
179sub DESTROY { 181sub DESTROY {
180 #my $self = shift; 182 my $self = shift;
183
181 $::conns--; 184 --$::conns;
182} 185}
186
187sub prune_cache {
188 my $hash = $_[0];
189
190 for (keys %$hash) {
191 if (ref $hash->{$_} eq HASH::) {
192 prune_cache($hash->{$_});
193 unless (scalar keys %{$hash->{$_}}) {
194 delete $hash->{$_};
195 }
196 }
197 }
198}
199
200sub prune_caches {
201 prune_cache \%conn;
202 prune_cache \%uri;
203
204 for (keys %blocked) {
205 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
206 }
207}
208
209our $PRUNE_WATCHER = EV::timer 60, 60, \&prune_caches;
183 210
184sub slog { 211sub slog {
185 my $self = shift; 212 my $self = shift;
186 main::slog($_[0], "$self->{remote_id}> $_[1]"); 213 main::slog($_[0], "$self->{remote_id}> $_[1]");
187} 214}
… …
217 $hdr->{"Content-Length"} = length $content; 244 $hdr->{"Content-Length"} = length $content;
218 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig); 245 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
219 } 246 }
220 247
221 $res .= "Date: $HTTP_NOW\015\012"; 248 $res .= "Date: $HTTP_NOW\015\012";
249 $res .= "Server: $::NAME\015\012";
222 250
223 while (my ($h, $v) = each %$hdr) { 251 while (my ($h, $v) = each %$hdr) {
224 $res .= "$h: $v\015\012" 252 $res .= "$h: $v\015\012"
225 } 253 }
226 $res .= "\015\012"; 254 $res .= "\015\012";
… …
232 " \"$self->{h}{referer}\"\n"; 260 " \"$self->{h}{referer}\"\n";
233 261
234 print $::accesslog $log if $::accesslog; 262 print $::accesslog $log if $::accesslog;
235 print STDERR $log; 263 print STDERR $log;
236 264
237 $self->{written} += 265 $tbf_top->request(length $res, 1e6);
238 print {$self->{fh}} $res; 266 $self->{written} += print {$self->{fh}} $res;
239} 267}
240 268
241sub err { 269sub err {
242 my $self = shift; 270 my $self = shift;
243 my ($code, $msg, $hdr, $content) = @_; 271 my ($code, $msg, $hdr, $content) = @_;
… …
247 $hdr->{"Content-Type"} = "text/plain"; 275 $hdr->{"Content-Type"} = "text/plain";
248 $hdr->{"Content-Length"} = length $content; 276 $hdr->{"Content-Length"} = length $content;
249 } 277 }
250 $hdr->{"Connection"} = "close"; 278 $hdr->{"Connection"} = "close";
251 279
252 $self->response($code, $msg, $hdr, $content); 280 $self->response ($code, $msg, $hdr, $content);
253 281
254 die bless {}, err::; 282 die bless {}, err::
255} 283}
256 284
257sub handle { 285sub handle {
258 my $self = shift; 286 my $self = shift;
259 my $fh = $self->{fh}; 287 my $fh = $self->{fh};
260 288
261 my $host; 289 my $host;
262 290
263 $fh->timeout($::REQ_TIMEOUT); 291 $fh->timeout($::REQ_TIMEOUT);
264 while() { 292 while () {
265 $self->{reqs}++; 293 $self->{reqs}++;
266 294
267 # read request and parse first line 295 # read request and parse first line
268 my $req = $fh->readline("\015\012\015\012"); 296 my $req = $fh->readline("\015\012\015\012");
269 297
… …
298 my (%hdr, $h, $v); 326 my (%hdr, $h, $v);
299 327
300 $hdr{lc $1} .= ",$2" 328 $hdr{lc $1} .= ",$2"
301 while $req =~ /\G 329 while $req =~ /\G
302 ([^:\000-\040]+): 330 ([^:\000-\040]+):
303 [\010\040]* 331 [\011\040]*
304 ((?: [^\015\012]+ | \015\012[\010\040] )*) 332 ((?: [^\015\012]+ | \015\012[\011\040] )*)
305 \015\012 333 \015\012
306 /gxc; 334 /gxc;
307 335
308 $req =~ /\G\015\012$/ 336 $req =~ /\G\015\012$/
309 or $self->err(400, "bad request"); 337 or $self->err(400, "bad request");
… …
378# uri => path mapping 406# uri => path mapping
379sub map_uri { 407sub map_uri {
380 my $self = shift; 408 my $self = shift;
381 my $host = $self->{server_name}; 409 my $host = $self->{server_name};
382 my $uri = $self->{uri}; 410 my $uri = $self->{uri};
411
412 $host =~ /[\/\\]/
413 and $self->err(400, "bad request");
383 414
384 # some massaging, also makes it more secure 415 # some massaging, also makes it more secure
385 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 416 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
386 $uri =~ s%//+%/%g; 417 $uri =~ s%//+%/%g;
387 $uri =~ s%/\.(?=/|$)%%g; 418 $uri =~ s%/\.(?=/|$)%%g;
… …
431 462
432 if ($self->{name} =~ s%^/internal/([^/]+)%%) { 463 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
433 if ($::internal{$1}) { 464 if ($::internal{$1}) {
434 $::internal{$1}->($self); 465 $::internal{$1}->($self);
435 } else { 466 } else {
436 $self->err(404, "not found"); 467 $self->err (404, "not found");
437 } 468 }
438 } else { 469 } else {
439 470
440 stat $path 471 Coro::AIO::aio_stat $path
441 or $self->err(404, "not found"); 472 and $self->err (404, "not found");
442 473
443 $self->{stat} = [stat _]; 474 $self->{stat} = [stat _];
444 475
445 # idiotic netscape sends idiotic headers AGAIN 476 # idiotic netscape sends idiotic headers AGAIN
446 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/ 477 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
… …
449 if (-d _ && -r _) { 480 if (-d _ && -r _) {
450 # directory 481 # directory
451 if ($path !~ /\/$/) { 482 if ($path !~ /\/$/) {
452 # create a redirect to get the trailing "/" 483 # create a redirect to get the trailing "/"
453 # we don't try to avoid the :80 484 # we don't try to avoid the :80
454 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" }); 485 $self->err (301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
455 } else { 486 } else {
456 $ims < $self->{stat}[9] 487 $ims < $self->{stat}[9]
457 or $self->err(304, "not modified"); 488 or $self->err (304, "not modified");
458 489
459 if (-r "$path/index.html") { 490 if (-r "$path/index.html") {
460 # replace directory "size" by index.html filesize 491 # replace directory "size" by index.html filesize
461 $self->{stat} = [stat ($self->{path} .= "/index.html")]; 492 $self->{stat} = [stat ($self->{path} .= "/index.html")];
462 $self->handle_file($queue_index); 493 $self->handle_file ($queue_index, $tbf_top);
463 } else { 494 } else {
464 $self->handle_dir; 495 $self->handle_dir;
465 } 496 }
466 } 497 }
467 } elsif (-f _ && -r _) { 498 } elsif (-f _ && -r _) {
468 -x _ and $self->err(403, "forbidden"); 499 -x _ and $self->err (403, "forbidden");
469 500
470 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) { 501 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
471 my $timeout = $::NOW + 10; 502 my $timeout = $::NOW + 10;
472 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) { 503 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
473 if ($timeout < $::NOW) { 504 if ($timeout < $::NOW) {
… …
476 $httpevent->wait; 507 $httpevent->wait;
477 } 508 }
478 } 509 }
479 } 510 }
480 511
481 $self->handle_file($queue_file); 512 $self->handle_file ($queue_file, $tbf_top);
482 } else { 513 } else {
483 $self->err(404, "not found"); 514 $self->err (404, "not found");
484 } 515 }
485 } 516 }
486} 517}
487 518
488sub handle_dir { 519sub handle_dir {
489 my $self = shift; 520 my $self = shift;
490 my $idx = $self->diridx; 521 my $idx = $self->diridx;
491 522
492 $self->response(200, "ok", 523 $self->response (200, "ok",
493 { 524 {
494 "Content-Type" => "text/html", 525 "Content-Type" => "text/html; charset=utf-8",
495 "Content-Length" => length $idx, 526 "Content-Length" => length $idx,
496 "Last-Modified" => time2str ($self->{stat}[9]), 527 "Last-Modified" => time2str ($self->{stat}[9]),
497 }, 528 },
498 $idx); 529 $idx);
499} 530}
500 531
501sub handle_file { 532sub handle_file {
502 my ($self, $queue) = @_; 533 my ($self, $queue, $tbf) = @_;
503 my $length = $self->{stat}[7]; 534 my $length = $self->{stat}[7];
504 my $hdr = { 535 my $hdr = {
505 "Last-Modified" => time2str ((stat _)[9]), 536 "Last-Modified" => time2str ((stat _)[9]),
537 "Accept-Ranges" => "bytes",
506 }; 538 };
507 539
508 my @code = (200, "ok"); 540 my @code = (200, "ok");
509 my ($l, $h); 541 my ($l, $h);
510 542
511 if ($self->{h}{range} =~ /^bytes=(.*)$/) { 543 if ($self->{h}{range} =~ /^bytes=(.*)$/i) {
512 for (split /,/, $1) { 544 for (split /,/, $1) {
513 if (/^-(\d+)$/) { 545 if (/^-(\d+)$/) {
514 ($l, $h) = ($length - $1, $length - 1); 546 ($l, $h) = ($length - $1, $length - 1);
515 } elsif (/^(\d+)-(\d*)$/) { 547 } elsif (/^(\d+)-(\d*)$/) {
516 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 548 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
… …
520 } 552 }
521 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 553 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
522 } 554 }
523 $hdr->{"Content-Range"} = "bytes */$length"; 555 $hdr->{"Content-Range"} = "bytes */$length";
524 $hdr->{"Content-Length"} = $length; 556 $hdr->{"Content-Length"} = $length;
525 $self->err(416, "not satisfiable", $hdr, ""); 557 $self->err (416, "not satisfiable", $hdr, "");
526 558
527satisfiable: 559satisfiable:
528 # check for segmented downloads 560 # check for segmented downloads
529 if ($l && $::NO_SEGMENTED) { 561 if ($l && $::NO_SEGMENTED) {
530 my $timeout = $::NOW + 15; 562 my $timeout = $::NOW + 15;
531 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 563 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
532 if ($timeout <= $::NOW) { 564 if ($timeout <= $::NOW) {
533 $self->block($::BLOCKTIME, "segmented downloads are forbidden"); 565 $self->block ($::BLOCKTIME, "segmented downloads are forbidden");
534 #$self->err_segmented_download; 566 #$self->err_segmented_download;
535 } else { 567 } else {
536 $httpevent->wait; 568 $httpevent->wait;
537 } 569 }
538 } 570 }
… …
549 581
550 $self->{path} =~ /\.([^.]+)$/; 582 $self->{path} =~ /\.([^.]+)$/;
551 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream"; 583 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
552 $hdr->{"Content-Length"} = $length; 584 $hdr->{"Content-Length"} = $length;
553 585
554 $self->response(@code, $hdr, ""); 586 $self->response (@code, $hdr, "");
555 587
556 if ($self->{method} eq "GET") { 588 if ($self->{method} eq "GET") {
557 $self->{time} = $::NOW; 589 $self->{time} = $::NOW;
590 $self->{written} = 0;
558 591
559 my $current = $Coro::current;
560
561 my ($fh, $buf, $r);
562
563 open $fh, "<", $self->{path} 592 open my $fh, "<", $self->{path}
564 or die "$self->{path}: late open failure ($!)"; 593 or die "$self->{path}: late open failure ($!)";
565 594
566 $h -= $l - 1; 595 $h -= $l - 1;
567 596
568 if (0) { # !AIO
569 if ($l) {
570 sysseek $fh, $l, 0;
571 }
572 }
573
574 my $transfer = $queue->start_transfer($h); 597 my $transfer = $queue->start_transfer ($h);
575 my $locked; 598 my $locked;
576 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 599 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
577 600
578 while ($h > 0) { 601 while ($h > 0) {
579 unless ($locked) { 602 unless ($locked) {
580 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 603 if ($locked ||= $transfer->try ($::WAIT_INTERVAL)) {
581 $bufsize = $::BUFSIZE; 604 $bufsize = $::BUFSIZE;
582 $self->{time} = $::NOW; 605 $self->{time} = $::NOW;
606 $self->{written} = 0;
583 } 607 }
584 } 608 }
585 609
586 if ($blocked{$self->{remote_id}}) { 610 if ($blocked{$self->{remote_id}}) {
587 $self->{h}{connection} = "close"; 611 $self->{h}{connection} = "close";
588 die bless {}, err::; 612 die bless {}, err::;
589 } 613 }
590 614
591 if (0) { # !AIO 615 Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), my $buf, 0
592 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
593 or last; 616 or last;
594 } else { 617
595 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h), 618 $tbf->request (length $buf);
596 $buf, 0, sub { 619 my $w = $self->{fh}->syswrite ($buf)
597 $r = $_[0];
598 Coro::ready($current);
599 });
600 &Coro::schedule;
601 last unless $r;
602 }
603 my $w = syswrite $self->{fh}, $buf
604 or last; 620 or last;
605 $::written += $w; 621 $::written += $w;
606 $self->{written} += $w; 622 $self->{written} += $w;
607 $l += $r; 623 $l += $w;
608 } 624 }
609 625
610 close $fh; 626 close $fh;
611 } 627 }
612} 628}
613 629
6141; 6301
631

Diff Legend

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