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.43 by root, Wed Sep 12 20:29:43 2001 UTC vs.
Revision 1.72 by root, Tue Sep 10 03:08:03 2002 UTC

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

Diff Legend

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