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

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.44 by root, Fri Sep 14 12:38:18 2001 UTC vs.
Revision 1.68 by root, Mon May 20 04:08:03 2002 UTC

… …
3use Coro::Event; 3use Coro::Event;
4use Coro::Socket; 4use Coro::Socket;
5use Coro::Signal; 5use Coro::Signal;
6 6
7use HTTP::Date; 7use HTTP::Date;
8use POSIX ();
9
10use Compress::Zlib ();
8 11
9no utf8; 12no utf8;
10use bytes; 13use bytes;
11 14
12# at least on my machine, this thingy serves files 15# at least on my machine, this thingy serves files
… …
14# and quite a bit slower than thttpd :( 17# and quite a bit slower than thttpd :(
15 18
16$SIG{PIPE} = 'IGNORE'; 19$SIG{PIPE} = 'IGNORE';
17 20
18our $accesslog; 21our $accesslog;
22our $errorlog;
23
24our $NOW;
25our $HTTP_NOW;
26
27Event->timer(interval => 1, hard => 1, cb => sub {
28 $NOW = time;
29 $HTTP_NOW = time2str $NOW;
30})->now;
31
32if ($ERROR_LOG) {
33 use IO::Handle;
34 open $errorlog, ">>$ERROR_LOG"
35 or die "$ERROR_LOG: $!";
36 $errorlog->autoflush(1);
37}
19 38
20if ($ACCESS_LOG) { 39if ($ACCESS_LOG) {
21 use IO::Handle; 40 use IO::Handle;
22 open $accesslog, ">>$ACCESS_LOG" 41 open $accesslog, ">>$ACCESS_LOG"
23 or die "$ACCESS_LOG: $!"; 42 or die "$ACCESS_LOG: $!";
… …
25} 44}
26 45
27sub slog { 46sub slog {
28 my $level = shift; 47 my $level = shift;
29 my $format = shift; 48 my $format = shift;
49 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
30 printf "---: $format\n", @_; 50 printf "$NOW: $format\n", @_;
51 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
31} 52}
32 53
33our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
34our $httpevent = new Coro::Signal; 55our $httpevent = new Coro::Signal;
35 56
36our $wait_factor = 0.95; 57our $queue_file = new transferqueue $MAX_TRANSFERS;
58our $queue_index = new transferqueue 10;
37 59
38our @transfers = ( 60our $tbf_top = new tbf rate => 200000;
39 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1], 61
40 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1], 62my $unused_bytes = 0;
41); 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}
42 74
43my @newcons; 75my @newcons;
44my @pool; 76my @pool;
45 77
46# one "execution thread" 78# one "execution thread"
… …
49 if (@newcons) { 81 if (@newcons) {
50 eval { 82 eval {
51 conn->new(@{pop @newcons})->handle; 83 conn->new(@{pop @newcons})->handle;
52 }; 84 };
53 slog 1, "$@" if $@ && !ref $@; 85 slog 1, "$@" if $@ && !ref $@;
86
87 $httpevent->broadcast; # only for testing, but doesn't matter much
88
54 $connections->up; 89 $connections->up;
55 } else { 90 } else {
56 last if @pool >= $MAX_POOL; 91 last if @pool >= $MAX_POOL;
57 push @pool, $Coro::current; 92 push @pool, $Coro::current;
58 schedule; 93 schedule;
… …
100 or die "unable to start server"; 135 or die "unable to start server";
101 136
102 listen_on $http_port; 137 listen_on $http_port;
103} 138}
104 139
105our $NOW;
106our $HTTP_NOW;
107
108Event->timer(interval => 1, hard => 1, cb => sub {
109 $NOW = time;
110 $HTTP_NOW = time2str $NOW;
111})->now;
112
113package conn; 140package conn;
114 141
115use Socket; 142use Socket;
116use HTTP::Date; 143use HTTP::Date;
117use Convert::Scalar 'weaken'; 144use Convert::Scalar 'weaken';
… …
149 my $peername = shift; 176 my $peername = shift;
150 my $self = bless { fh => $fh }, $class; 177 my $self = bless { fh => $fh }, $class;
151 my (undef, $iaddr) = unpack_sockaddr_in $peername 178 my (undef, $iaddr) = unpack_sockaddr_in $peername
152 or $self->err(500, "unable to decode peername"); 179 or $self->err(500, "unable to decode peername");
153 180
181 $self->{remote_addr} =
154 $self->{remote_addr} = inet_ntoa $iaddr; 182 $self->{remote_id} = inet_ntoa $iaddr;
183
155 $self->{time} = $::NOW; 184 $self->{time} = $::NOW;
156 185
186 weaken ($Coro::current->{conn} = $self);
187
157 $::conns++; 188 $::conns++;
189 $::maxconns = $::conns if $::conns > $::maxconns;
158 190
159 $self; 191 $self;
160} 192}
161 193
162sub DESTROY { 194sub DESTROY {
163 my $self = shift; 195 #my $self = shift;
164 $::conns--; 196 $::conns--;
165 $self->eoconn;
166}
167
168# end of connection
169sub eoconn {
170 my $self = shift;
171
172 # clean up hints
173 delete $conn{$self->{remote_id}}{$self*1};
174 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
175
176 $httpevent->broadcast;
177} 197}
178 198
179sub slog { 199sub slog {
180 my $self = shift; 200 my $self = shift;
181 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 201 main::slog($_[0], "$self->{remote_id}> $_[1]");
182} 202}
183 203
184sub response { 204sub response {
185 my ($self, $code, $msg, $hdr, $content) = @_; 205 my ($self, $code, $msg, $hdr, $content) = @_;
186 my $res = "HTTP/1.1 $code $msg\015\012"; 206 my $res = "HTTP/1.1 $code $msg\015\012";
207 my $GZ = "";
187 208
188 $self->{h}{connection} = "close" if $hdr->{Connection} =~ /close/; 209 if (exists $hdr->{Connection}) {
210 if ($hdr->{Connection} =~ /close/) {
211 $self->{h}{connection} = "close"
212 }
213 } else {
214 if ($self->{version} < 1.1) {
215 if ($self->{h}{connection} =~ /keep-alive/i) {
216 $hdr->{Connection} = "Keep-Alive";
217 } else {
218 $self->{h}{connection} = "close"
219 }
220 }
221 }
222
223 if ($self->{method} ne "HEAD"
224 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
225 && 400 < length $content
226 && $hdr->{"Content-Length"} == length $content
227 && !exists $hdr->{"Content-Encoding"}
228 ) {
229 my $orig = length $content;
230 $hdr->{"Content-Encoding"} = "gzip";
231 $content = Compress::Zlib::memGzip(\$content);
232 $hdr->{"Content-Length"} = length $content;
233 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
234 }
189 235
190 $res .= "Date: $HTTP_NOW\015\012"; 236 $res .= "Date: $HTTP_NOW\015\012";
191 237
192 while (my ($h, $v) = each %$hdr) { 238 while (my ($h, $v) = each %$hdr) {
193 $res .= "$h: $v\015\012" 239 $res .= "$h: $v\015\012"
194 } 240 }
195 $res .= "\015\012"; 241 $res .= "\015\012";
196 242
197 $res .= $content if defined $content and $self->{method} ne "HEAD"; 243 $res .= $content if defined $content and $self->{method} ne "HEAD";
198 244
199 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 245 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
246 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
247 " \"$self->{h}{referer}\"\n";
200 248
201 print $accesslog $log if $accesslog; 249 print $::accesslog $log if $::accesslog;
202 print STDERR $log; 250 print STDERR $log;
203 251
204 $self->{written} += 252 $tbf_top->request(length $res, 1e6);
205 print {$self->{fh}} $res; 253 $self->{written} += print {$self->{fh}} $res;
206} 254}
207 255
208sub err { 256sub err {
209 my $self = shift; 257 my $self = shift;
210 my ($code, $msg, $hdr, $content) = @_; 258 my ($code, $msg, $hdr, $content) = @_;
… …
265 my (%hdr, $h, $v); 313 my (%hdr, $h, $v);
266 314
267 $hdr{lc $1} .= ",$2" 315 $hdr{lc $1} .= ",$2"
268 while $req =~ /\G 316 while $req =~ /\G
269 ([^:\000-\040]+): 317 ([^:\000-\040]+):
270 [\008\040]* 318 [\011\040]*
271 ((?: [^\015\012]+ | \015\012[\008\040] )*) 319 ((?: [^\015\012]+ | \015\012[\011\040] )*)
272 \015\012 320 \015\012
273 /gxc; 321 /gxc;
274 322
275 $req =~ /\G\015\012$/ 323 $req =~ /\G\015\012$/
276 or $self->err(400, "bad request"); 324 or $self->err(400, "bad request");
… …
288 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 336 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
289 } 337 }
290 338
291 $self->{remote_id} = $id; 339 $self->{remote_id} = $id;
292 340
341 weaken (local $conn{$id}{$self*1} = $self);
342
293 if ($blocked{$id}) { 343 if ($blocked{$id}) {
294 $self->err_blocked($blocked{$id}) 344 $self->err_blocked
295 if $blocked{$id} > $::NOW; 345 if $blocked{$id}[0] > $::NOW;
296 346
297 delete $blocked{$id}; 347 delete $blocked{$id};
298 }
299
300 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
301 my $delay = $::PER_TIMEOUT + $::NOW + 15;
302 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
303 if ($delay < $::NOW) {
304 $self->slog(2, "blocked ip $id");
305 $self->err_blocked;
306 } else {
307 $httpevent->wait;
308 }
309 }
310 } 348 }
311 349
312 # find out server name and port 350 # find out server name and port
313 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 351 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
314 $host = $1; 352 $host = $1;
… …
325 $host = inet_ntoa $host; 363 $host = inet_ntoa $host;
326 } 364 }
327 365
328 $self->{server_name} = $host; 366 $self->{server_name} = $host;
329 367
330 # enter ourselves into various lists
331 weaken ($conn{$id}{$self*1} = $self);
332 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 368 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
333 369
334 eval { 370 eval {
335 $self->map_uri; 371 $self->map_uri;
336 $self->respond; 372 $self->respond;
337 }; 373 };
338 374
339 $self->eoconn;
340
341 die if $@ && !ref $@; 375 die if $@ && !ref $@;
342 376
343 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 377 last if $self->{h}{connection} =~ /close/i;
344 378
345 $httpevent->broadcast; 379 $httpevent->broadcast;
346 380
347 $fh->timeout($::PER_TIMEOUT); 381 $fh->timeout($::PER_TIMEOUT);
348 } 382 }
383}
384
385sub block {
386 my $self = shift;
387
388 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
389 $self->slog(2, "blocked ip $self->{remote_id}");
390 $self->err_blocked;
349} 391}
350 392
351# uri => path mapping 393# uri => path mapping
352sub map_uri { 394sub map_uri {
353 my $self = shift; 395 my $self = shift;
… …
400 442
401sub respond { 443sub respond {
402 my $self = shift; 444 my $self = shift;
403 my $path = $self->{path}; 445 my $path = $self->{path};
404 446
405 stat $path 447 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
406 or $self->err(404, "not found"); 448 if ($::internal{$1}) {
407 449 $::internal{$1}->($self);
408 $self->{stat} = [stat _];
409
410 # idiotic netscape sends idiotic headers AGAIN
411 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
412 ? str2time $1 : 0;
413
414 if (-d _ && -r _) {
415 # directory
416 if ($path !~ /\/$/) {
417 # create a redirect to get the trailing "/"
418 # we don't try to avoid the :80
419 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
420 } else { 450 } else {
421 $ims < $self->{stat}[9] 451 $self->err(404, "not found");
452 }
453 } else {
454
455 stat $path
422 or $self->err(304, "not modified"); 456 or $self->err(404, "not found");
423 457
424 if (-r "$path/index.html") { 458 $self->{stat} = [stat _];
425 $self->{path} .= "/index.html"; 459
426 $self->handle_file; 460 # idiotic netscape sends idiotic headers AGAIN
461 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
462 ? str2time $1 : 0;
463
464 if (-d _ && -r _) {
465 # directory
466 if ($path !~ /\/$/) {
467 # create a redirect to get the trailing "/"
468 # we don't try to avoid the :80
469 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
427 } else { 470 } else {
471 $ims < $self->{stat}[9]
472 or $self->err(304, "not modified");
473
474 if (-r "$path/index.html") {
475 # replace directory "size" by index.html filesize
476 $self->{stat} = [stat ($self->{path} .= "/index.html")];
477 $self->handle_file($queue_index, $tbf_top);
478 } else {
428 $self->handle_dir; 479 $self->handle_dir;
429 } 480 }
430 } 481 }
431 } elsif (-f _ && -r _) { 482 } elsif (-f _ && -r _) {
432 -x _ and $self->err(403, "forbidden"); 483 -x _ and $self->err(403, "forbidden");
433 $self->handle_file; 484
485 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
486 my $timeout = $::NOW + 10;
487 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
488 if ($timeout < $::NOW) {
489 $self->block($::BLOCKTIME, "too many connections");
490 } else {
491 $httpevent->wait;
492 }
493 }
494 }
495
496 $self->handle_file($queue_file, $tbf_top);
434 } else { 497 } else {
435 $self->err(404, "not found"); 498 $self->err(404, "not found");
499 }
436 } 500 }
437} 501}
438 502
439sub handle_dir { 503sub handle_dir {
440 my $self = shift; 504 my $self = shift;
… …
442 506
443 $self->response(200, "ok", 507 $self->response(200, "ok",
444 { 508 {
445 "Content-Type" => "text/html", 509 "Content-Type" => "text/html",
446 "Content-Length" => length $idx, 510 "Content-Length" => length $idx,
511 "Last-Modified" => time2str ($self->{stat}[9]),
447 }, 512 },
448 $idx); 513 $idx);
449} 514}
450 515
451sub handle_file { 516sub handle_file {
452 my $self = shift; 517 my ($self, $queue, $tbf) = @_;
453 my $length = $self->{stat}[7]; 518 my $length = $self->{stat}[7];
454 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
455 my $hdr = { 519 my $hdr = {
456 "Last-Modified" => time2str ((stat _)[9]), 520 "Last-Modified" => time2str ((stat _)[9]),
457 }; 521 };
458 522
459 my @code = (200, "ok"); 523 my @code = (200, "ok");
… …
476 $self->err(416, "not satisfiable", $hdr, ""); 540 $self->err(416, "not satisfiable", $hdr, "");
477 541
478satisfiable: 542satisfiable:
479 # check for segmented downloads 543 # check for segmented downloads
480 if ($l && $::NO_SEGMENTED) { 544 if ($l && $::NO_SEGMENTED) {
481 my $delay = $::NOW + $::PER_TIMEOUT + 15; 545 my $timeout = $::NOW + 15;
482 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 546 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
483 if ($delay <= $::NOW) { 547 if ($timeout <= $::NOW) {
548 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
484 $self->err_segmented_download; 549 #$self->err_segmented_download;
485 } else { 550 } else {
486 $httpevent->broadcast; 551 $httpevent->wait;
487 } 552 }
488 } 553 }
489 } 554 }
490 555
491 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 556 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
504 $self->response(@code, $hdr, ""); 569 $self->response(@code, $hdr, "");
505 570
506 if ($self->{method} eq "GET") { 571 if ($self->{method} eq "GET") {
507 $self->{time} = $::NOW; 572 $self->{time} = $::NOW;
508 573
509 my $fudge = $queue->[0]->waiters; 574 my $current = $Coro::current;
510 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
511
512 $queue->[1] *= $fudge;
513 my $transfer = $queue->[0]->guard;
514
515 if ($fudge != 1) {
516 $queue->[1] /= $fudge;
517 $queue->[1] = $queue->[1] * $::wait_factor
518 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
519 }
520 $self->{time} = $::NOW;
521
522 $self->{fh}->writable or return;
523 575
524 my ($fh, $buf, $r); 576 my ($fh, $buf, $r);
525 my $current = $Coro::current; 577
526 open $fh, "<", $self->{path} 578 open $fh, "<", $self->{path}
527 or die "$self->{path}: late open failure ($!)"; 579 or die "$self->{path}: late open failure ($!)";
528 580
529 $h -= $l - 1; 581 $h -= $l - 1;
530 582
531 if (0) { 583 if (0) { # !AIO
532 if ($l) { 584 if ($l) {
533 sysseek $fh, $l, 0; 585 sysseek $fh, $l, 0;
534 } 586 }
535 } 587 }
588
589 my $transfer = $queue->start_transfer($h);
590 my $locked;
591 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
536 592
537 while ($h > 0) { 593 while ($h > 0) {
594 unless ($locked) {
595 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
596 $bufsize = $::BUFSIZE;
597 $self->{time} = $::NOW;
598 }
599 }
600
601 if ($blocked{$self->{remote_id}}) {
602 $self->{h}{connection} = "close";
603 die bless {}, err::;
604 }
605
538 if (0) { 606 if (0) { # !AIO
539 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 607 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
540 or last; 608 or last;
541 } else { 609 } else {
542 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 610 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
543 $buf, 0, sub { 611 $buf, 0, sub {
544 $r = $_[0]; 612 $r = $_[0];
545 Coro::ready($current); 613 Coro::ready($current);
546 }); 614 });
547 &Coro::schedule; 615 &Coro::schedule;
548 last unless $r; 616 last unless $r;
549 } 617 }
618
619 $tbf->request(length $buf);
550 my $w = syswrite $self->{fh}, $buf 620 my $w = syswrite $self->{fh}, $buf
551 or last; 621 or last;
552 $::written += $w; 622 $::written += $w;
553 $self->{written} += $w; 623 $self->{written} += $w;
554 $l += $r; 624 $l += $r;

Diff Legend

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