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.40 by root, Mon Sep 3 00:06:06 2001 UTC vs.
Revision 1.71 by root, Mon Jul 29 21:41:54 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 => 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;
… …
87 Listen => 50, 124 Listen => 50,
88 or die "unable to start server"; 125 or die "unable to start server";
89 126
90listen_on $http_port; 127listen_on $http_port;
91 128
129if ($SERVER_PORT2) {
92my $http_port = new Coro::Socket 130 my $http_port = new Coro::Socket
93 LocalAddr => $SERVER_HOST, 131 LocalAddr => $SERVER_HOST,
94 LocalPort => $SERVER_PORT2, 132 LocalPort => $SERVER_PORT2,
95 ReuseAddr => 1, 133 ReuseAddr => 1,
96 Listen => 50, 134 Listen => 50,
97 or die "unable to start server"; 135 or die "unable to start server";
98 136
99listen_on $http_port; 137 listen_on $http_port;
100 138}
101our $NOW;
102our $HTTP_NOW;
103
104Event->timer(interval => 1, hard => 1, cb => sub {
105 $NOW = time;
106 $HTTP_NOW = time2str $NOW;
107})->now;
108 139
109package conn; 140package conn;
110 141
111use Socket; 142use Socket;
112use HTTP::Date; 143use HTTP::Date;
… …
139 170
140read_mimetypes; 171read_mimetypes;
141 172
142sub new { 173sub new {
143 my $class = shift; 174 my $class = shift;
175 my $fh = shift;
144 my $peername = shift; 176 my $peername = shift;
145 my $fh = shift;
146 my $self = bless { fh => $fh }, $class; 177 my $self = bless { fh => $fh }, $class;
147 my (undef, $iaddr) = unpack_sockaddr_in $peername 178 my (undef, $iaddr) = unpack_sockaddr_in $peername
148 or $self->err(500, "unable to decode peername"); 179 or $self->err(500, "unable to decode peername");
149 180
181 $self->{remote_addr} =
150 $self->{remote_addr} = inet_ntoa $iaddr; 182 $self->{remote_id} = inet_ntoa $iaddr;
183
151 $self->{time} = $::NOW; 184 $self->{time} = $::NOW;
152 185
186 weaken ($Coro::current->{conn} = $self);
187
153 $::conns++; 188 $::conns++;
189 $::maxconns = $::conns if $::conns > $::maxconns;
154 190
155 $self; 191 $self;
156} 192}
157 193
158sub DESTROY { 194sub DESTROY {
159 my $self = shift; 195 #my $self = shift;
160 $::conns--; 196 $::conns--;
161 $self->eoconn;
162}
163
164# end of connection
165sub eoconn {
166 my $self = shift;
167
168 # clean up hints
169 delete $conn{$self->{remote_id}}{$self*1};
170 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
171} 197}
172 198
173sub slog { 199sub slog {
174 my $self = shift; 200 my $self = shift;
175 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 201 main::slog($_[0], "$self->{remote_id}> $_[1]");
176} 202}
177 203
178sub response { 204sub response {
179 my ($self, $code, $msg, $hdr, $content) = @_; 205 my ($self, $code, $msg, $hdr, $content) = @_;
180 my $res = "HTTP/1.1 $code $msg\015\012"; 206 my $res = "HTTP/1.1 $code $msg\015\012";
207 my $GZ = "";
181 208
182 $self->{h}{connection} ||= $hdr->{Connection}; 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 }
183 235
184 $res .= "Date: $HTTP_NOW\015\012"; 236 $res .= "Date: $HTTP_NOW\015\012";
237 $res .= "Server: $::NAME\015\012";
185 238
186 while (my ($h, $v) = each %$hdr) { 239 while (my ($h, $v) = each %$hdr) {
187 $res .= "$h: $v\015\012" 240 $res .= "$h: $v\015\012"
188 } 241 }
189 $res .= "\015\012"; 242 $res .= "\015\012";
190 243
191 $res .= $content if defined $content and $self->{method} ne "HEAD"; 244 $res .= $content if defined $content and $self->{method} ne "HEAD";
192 245
193 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 246 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
247 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
248 " \"$self->{h}{referer}\"\n";
194 249
195 print $accesslog $log if $accesslog; 250 print $::accesslog $log if $::accesslog;
196 print STDERR $log; 251 print STDERR $log;
197 252
198 $self->{written} += 253 $tbf_top->request(length $res, 1e6);
199 print {$self->{fh}} $res; 254 $self->{written} += print {$self->{fh}} $res;
200} 255}
201 256
202sub err { 257sub err {
203 my $self = shift; 258 my $self = shift;
204 my ($code, $msg, $hdr, $content) = @_; 259 my ($code, $msg, $hdr, $content) = @_;
… …
259 my (%hdr, $h, $v); 314 my (%hdr, $h, $v);
260 315
261 $hdr{lc $1} .= ",$2" 316 $hdr{lc $1} .= ",$2"
262 while $req =~ /\G 317 while $req =~ /\G
263 ([^:\000-\040]+): 318 ([^:\000-\040]+):
264 [\008\040]* 319 [\011\040]*
265 ((?: [^\015\012]+ | \015\012[\008\040] )*) 320 ((?: [^\015\012]+ | \015\012[\011\040] )*)
266 \015\012 321 \015\012
267 /gxc; 322 /gxc;
268 323
269 $req =~ /\G\015\012$/ 324 $req =~ /\G\015\012$/
270 or $self->err(400, "bad request"); 325 or $self->err(400, "bad request");
… …
282 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 337 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
283 } 338 }
284 339
285 $self->{remote_id} = $id; 340 $self->{remote_id} = $id;
286 341
342 weaken (local $conn{$id}{$self*1} = $self);
343
287 if ($blocked{$id}) { 344 if ($blocked{$id}) {
288 $self->err_blocked($blocked{$id}) 345 $self->err_blocked
289 if $blocked{$id} > $::NOW; 346 if $blocked{$id}[0] > $::NOW;
290 347
291 delete $blocked{$id}; 348 delete $blocked{$id};
292 }
293
294 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
295 my $delay = $::PER_TIMEOUT + 15;
296 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
297 if ($delay <= 0) {
298 $self->slog(2, "blocked ip $id");
299 $self->err_blocked;
300 } else {
301 Coro::Event::do_timer(after => 4); $delay -= 4;
302 }
303 }
304 } 349 }
305 350
306 # find out server name and port 351 # find out server name and port
307 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 352 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
308 $host = $1; 353 $host = $1;
… …
312 357
313 if (defined $host) { 358 if (defined $host) {
314 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 359 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
315 } else { 360 } else {
316 ($self->{server_port}, $host) 361 ($self->{server_port}, $host)
317 = unpack_sockaddr_in $self->{fh}->getsockname 362 = unpack_sockaddr_in $self->{fh}->sockname
318 or $self->err(500, "unable to get socket name"); 363 or $self->err(500, "unable to get socket name");
319 $host = inet_ntoa $host; 364 $host = inet_ntoa $host;
320 } 365 }
321 366
322 $self->{server_name} = $host; 367 $self->{server_name} = $host;
323 368
324 # enter ourselves into various lists
325 weaken ($conn{$id}{$self*1} = $self);
326 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 369 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
327 370
328 eval { 371 eval {
329 $self->map_uri; 372 $self->map_uri;
330 $self->respond; 373 $self->respond;
331 }; 374 };
332 375
333 $self->eoconn;
334
335 die if $@ && !ref $@; 376 die if $@ && !ref $@;
336 377
337 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 378 last if $self->{h}{connection} =~ /close/i;
379
380 $httpevent->broadcast;
338 381
339 $fh->timeout($::PER_TIMEOUT); 382 $fh->timeout($::PER_TIMEOUT);
340 } 383 }
384}
385
386sub block {
387 my $self = shift;
388
389 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
390 $self->slog(2, "blocked ip $self->{remote_id}");
391 $self->err_blocked;
341} 392}
342 393
343# uri => path mapping 394# uri => path mapping
344sub map_uri { 395sub map_uri {
345 my $self = shift; 396 my $self = shift;
… …
392 443
393sub respond { 444sub respond {
394 my $self = shift; 445 my $self = shift;
395 my $path = $self->{path}; 446 my $path = $self->{path};
396 447
397 stat $path 448 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
398 or $self->err(404, "not found"); 449 if ($::internal{$1}) {
399 450 $::internal{$1}->($self);
400 $self->{stat} = [stat _];
401
402 # idiotic netscape sends idiotic headers AGAIN
403 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
404 ? str2time $1 : 0;
405
406 if (-d _ && -r _) {
407 # directory
408 if ($path !~ /\/$/) {
409 # create a redirect to get the trailing "/"
410 # we don't try to avoid the :80
411 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
412 } else { 451 } else {
413 $ims < $self->{stat}[9] 452 $self->err(404, "not found");
453 }
454 } else {
455
456 stat $path
414 or $self->err(304, "not modified"); 457 or $self->err(404, "not found");
415 458
416 if (-r "$path/index.html") { 459 $self->{stat} = [stat _];
417 $self->{path} .= "/index.html"; 460
418 $self->handle_file; 461 # idiotic netscape sends idiotic headers AGAIN
462 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
463 ? str2time $1 : 0;
464
465 if (-d _ && -r _) {
466 # directory
467 if ($path !~ /\/$/) {
468 # create a redirect to get the trailing "/"
469 # we don't try to avoid the :80
470 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
419 } else { 471 } else {
472 $ims < $self->{stat}[9]
473 or $self->err(304, "not modified");
474
475 if (-r "$path/index.html") {
476 # replace directory "size" by index.html filesize
477 $self->{stat} = [stat ($self->{path} .= "/index.html")];
478 $self->handle_file($queue_index, $tbf_top);
479 } else {
420 $self->handle_dir; 480 $self->handle_dir;
421 } 481 }
422 } 482 }
423 } elsif (-f _ && -r _) { 483 } elsif (-f _ && -r _) {
424 -x _ and $self->err(403, "forbidden"); 484 -x _ and $self->err(403, "forbidden");
425 $self->handle_file; 485
486 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
487 my $timeout = $::NOW + 10;
488 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
489 if ($timeout < $::NOW) {
490 $self->block($::BLOCKTIME, "too many connections");
491 } else {
492 $httpevent->wait;
493 }
494 }
495 }
496
497 $self->handle_file($queue_file, $tbf_top);
426 } else { 498 } else {
427 $self->err(404, "not found"); 499 $self->err(404, "not found");
500 }
428 } 501 }
429} 502}
430 503
431sub handle_dir { 504sub handle_dir {
432 my $self = shift; 505 my $self = shift;
… …
434 507
435 $self->response(200, "ok", 508 $self->response(200, "ok",
436 { 509 {
437 "Content-Type" => "text/html", 510 "Content-Type" => "text/html",
438 "Content-Length" => length $idx, 511 "Content-Length" => length $idx,
512 "Last-Modified" => time2str ($self->{stat}[9]),
439 }, 513 },
440 $idx); 514 $idx);
441} 515}
442 516
443sub handle_file { 517sub handle_file {
444 my $self = shift; 518 my ($self, $queue, $tbf) = @_;
445 my $length = $self->{stat}[7]; 519 my $length = $self->{stat}[7];
446 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
447 my $hdr = { 520 my $hdr = {
448 "Last-Modified" => time2str ((stat _)[9]), 521 "Last-Modified" => time2str ((stat _)[9]),
449 }; 522 };
450 523
451 my @code = (200, "ok"); 524 my @code = (200, "ok");
… …
468 $self->err(416, "not satisfiable", $hdr, ""); 541 $self->err(416, "not satisfiable", $hdr, "");
469 542
470satisfiable: 543satisfiable:
471 # check for segmented downloads 544 # check for segmented downloads
472 if ($l && $::NO_SEGMENTED) { 545 if ($l && $::NO_SEGMENTED) {
473 my $delay = $::PER_TIMEOUT + 15; 546 my $timeout = $::NOW + 15;
474 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 547 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
475 if ($delay <= 0) { 548 if ($timeout <= $::NOW) {
549 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
476 $self->err_segmented_download; 550 #$self->err_segmented_download;
477 } else { 551 } else {
478 Coro::Event::do_timer(after => 4); $delay -= 4; 552 $httpevent->wait;
479 } 553 }
480 } 554 }
481 } 555 }
482 556
483 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 557 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
495 569
496 $self->response(@code, $hdr, ""); 570 $self->response(@code, $hdr, "");
497 571
498 if ($self->{method} eq "GET") { 572 if ($self->{method} eq "GET") {
499 $self->{time} = $::NOW; 573 $self->{time} = $::NOW;
500
501 my $fudge = $queue->[0]->waiters;
502 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
503
504 $queue->[1] *= $fudge;
505 my $transfer = $queue->[0]->guard;
506
507 if ($fudge != 1) {
508 $queue->[1] /= $fudge;
509 $queue->[1] = $queue->[1] * $::wait_factor
510 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
511 }
512 $self->{time} = $::NOW; 574 $self->{written} = 0;
513 575
514 $self->{fh}->writable or return; 576 my $current = $Coro::current;
515 577
516 my ($fh, $buf, $r); 578 my ($fh, $buf, $r);
517 my $current = $Coro::current; 579
518 open $fh, "<", $self->{path} 580 open $fh, "<", $self->{path}
519 or die "$self->{path}: late open failure ($!)"; 581 or die "$self->{path}: late open failure ($!)";
520 582
521 $h -= $l - 1; 583 $h -= $l - 1;
522 584
523 if (0) { 585 if (0) { # !AIO
524 if ($l) { 586 if ($l) {
525 sysseek $fh, $l, 0; 587 sysseek $fh, $l, 0;
526 } 588 }
527 } 589 }
590
591 my $transfer = $queue->start_transfer($h);
592 my $locked;
593 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
528 594
529 while ($h > 0) { 595 while ($h > 0) {
596 unless ($locked) {
597 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
598 $bufsize = $::BUFSIZE;
599 $self->{time} = $::NOW;
600 $self->{written} = 0;
601 }
602 }
603
604 if ($blocked{$self->{remote_id}}) {
605 $self->{h}{connection} = "close";
606 die bless {}, err::;
607 }
608
530 if (0) { 609 if (0) { # !AIO
531 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 610 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
532 or last; 611 or last;
533 } else { 612 } else {
534 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 613 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
535 $buf, 0, sub { 614 $buf, 0, sub {
536 $r = $_[0]; 615 $r = $_[0];
537 Coro::ready($current); 616 Coro::ready($current);
538 }); 617 });
539 &Coro::schedule; 618 &Coro::schedule;
540 last unless $r; 619 last unless $r;
541 } 620 }
621
622 $tbf->request(length $buf);
542 my $w = syswrite $self->{fh}, $buf 623 my $w = syswrite $self->{fh}, $buf
543 or last; 624 or last;
544 $::written += $w; 625 $::written += $w;
545 $self->{written} += $w; 626 $self->{written} += $w;
546 $l += $r; 627 $l += $r;

Diff Legend

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