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.52 by root, Fri Nov 30 05:11:23 2001 UTC vs.
Revision 1.71 by root, Mon Jul 29 21:41:54 2002 UTC

… …
5use Coro::Signal; 5use Coro::Signal;
6 6
7use HTTP::Date; 7use HTTP::Date;
8use POSIX (); 8use POSIX ();
9 9
10use Compress::Zlib ();
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
14# quite a bit faster than apache, ;) 16# quite a bit faster than apache, ;)
15# and quite a bit slower than thttpd :( 17# and quite a bit slower than thttpd :(
16 18
17$SIG{PIPE} = 'IGNORE'; 19$SIG{PIPE} = 'IGNORE';
18 20
19our $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}
20 38
21if ($ACCESS_LOG) { 39if ($ACCESS_LOG) {
22 use IO::Handle; 40 use IO::Handle;
23 open $accesslog, ">>$ACCESS_LOG" 41 open $accesslog, ">>$ACCESS_LOG"
24 or die "$ACCESS_LOG: $!"; 42 or die "$ACCESS_LOG: $!";
… …
26} 44}
27 45
28sub slog { 46sub slog {
29 my $level = shift; 47 my $level = shift;
30 my $format = shift; 48 my $format = shift;
49 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
31 printf "---: $format\n", @_; 50 printf "$NOW: $format\n", @_;
51 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
32} 52}
33 53
34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $httpevent = new Coro::Signal; 55our $httpevent = new Coro::Signal;
36 56
37our $wait_factor = 0.95;
38
39our $queue_small = new transferqueue $MAX_TRANSFERS_SMALL;
40our $queue_large = new transferqueue $MAX_TRANSFERS_LARGE; 57our $queue_file = new transferqueue $MAX_TRANSFERS;
41our $queue_index = new transferqueue 5; 58our $queue_index = new transferqueue 10;
59
60our $tbf_top = new 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}
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';
… …
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
154 $self->{remote_addr} = 181 $self->{remote_addr} =
155 $self->{remote_id} = inet_ntoa $iaddr; 182 $self->{remote_id} = inet_ntoa $iaddr;
183
156 $self->{time} = $::NOW; 184 $self->{time} = $::NOW;
157 185
158 weaken ($Coro::current->{conn} = $self); 186 weaken ($Coro::current->{conn} = $self);
159 187
160 $::conns++; 188 $::conns++;
189 $::maxconns = $::conns if $::conns > $::maxconns;
161 190
162 $self; 191 $self;
163} 192}
164 193
165sub DESTROY { 194sub DESTROY {
166 my $self = shift; 195 #my $self = shift;
167 $::conns--; 196 $::conns--;
168 $self->eoconn;
169}
170
171# end of connection
172sub eoconn {
173 my $self = shift;
174
175 # clean up hints
176 delete $conn{$self->{remote_id}}{$self*1};
177 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
178
179 $httpevent->broadcast;
180} 197}
181 198
182sub slog { 199sub slog {
183 my $self = shift; 200 my $self = shift;
184 main::slog($_[0], "$self->{remote_id}> $_[1]"); 201 main::slog($_[0], "$self->{remote_id}> $_[1]");
185} 202}
186 203
187sub response { 204sub response {
188 my ($self, $code, $msg, $hdr, $content) = @_; 205 my ($self, $code, $msg, $hdr, $content) = @_;
189 my $res = "HTTP/1.1 $code $msg\015\012"; 206 my $res = "HTTP/1.1 $code $msg\015\012";
207 my $GZ = "";
190 208
191 if (exists $hdr->{Connection}) { 209 if (exists $hdr->{Connection}) {
192 if ($hdr->{Connection} =~ /close/) { 210 if ($hdr->{Connection} =~ /close/) {
193 $self->{h}{connection} = "close" 211 $self->{h}{connection} = "close"
194 } 212 }
… …
200 $self->{h}{connection} = "close" 218 $self->{h}{connection} = "close"
201 } 219 }
202 } 220 }
203 } 221 }
204 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 }
235
205 $res .= "Date: $HTTP_NOW\015\012"; 236 $res .= "Date: $HTTP_NOW\015\012";
237 $res .= "Server: $::NAME\015\012";
206 238
207 while (my ($h, $v) = each %$hdr) { 239 while (my ($h, $v) = each %$hdr) {
208 $res .= "$h: $v\015\012" 240 $res .= "$h: $v\015\012"
209 } 241 }
210 $res .= "\015\012"; 242 $res .= "\015\012";
211 243
212 $res .= $content if defined $content and $self->{method} ne "HEAD"; 244 $res .= $content if defined $content and $self->{method} ne "HEAD";
213 245
214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 246 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
215 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}. 247 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
216 " \"$self->{h}{referer}\"\n"; 248 " \"$self->{h}{referer}\"\n";
217 249
218 print $accesslog $log if $accesslog; 250 print $::accesslog $log if $::accesslog;
219 print STDERR $log; 251 print STDERR $log;
220 252
221 $self->{written} += 253 $tbf_top->request(length $res, 1e6);
222 print {$self->{fh}} $res; 254 $self->{written} += print {$self->{fh}} $res;
223} 255}
224 256
225sub err { 257sub err {
226 my $self = shift; 258 my $self = shift;
227 my ($code, $msg, $hdr, $content) = @_; 259 my ($code, $msg, $hdr, $content) = @_;
… …
282 my (%hdr, $h, $v); 314 my (%hdr, $h, $v);
283 315
284 $hdr{lc $1} .= ",$2" 316 $hdr{lc $1} .= ",$2"
285 while $req =~ /\G 317 while $req =~ /\G
286 ([^:\000-\040]+): 318 ([^:\000-\040]+):
287 [\008\040]* 319 [\011\040]*
288 ((?: [^\015\012]+ | \015\012[\008\040] )*) 320 ((?: [^\015\012]+ | \015\012[\011\040] )*)
289 \015\012 321 \015\012
290 /gxc; 322 /gxc;
291 323
292 $req =~ /\G\015\012$/ 324 $req =~ /\G\015\012$/
293 or $self->err(400, "bad request"); 325 or $self->err(400, "bad request");
… …
305 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 337 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
306 } 338 }
307 339
308 $self->{remote_id} = $id; 340 $self->{remote_id} = $id;
309 341
342 weaken (local $conn{$id}{$self*1} = $self);
343
310 if ($blocked{$id}) { 344 if ($blocked{$id}) {
311 $self->err_blocked($blocked{$id}) 345 $self->err_blocked
312 if $blocked{$id} > $::NOW; 346 if $blocked{$id}[0] > $::NOW;
313 347
314 delete $blocked{$id}; 348 delete $blocked{$id};
315 }
316
317 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
318 my $delay = $::PER_TIMEOUT + $::NOW + 15;
319 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
320 if ($delay < $::NOW) {
321 $self->slog(2, "blocked ip $id");
322 $self->err_blocked;
323 } else {
324 $httpevent->wait;
325 }
326 }
327 } 349 }
328 350
329 # find out server name and port 351 # find out server name and port
330 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 352 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
331 $host = $1; 353 $host = $1;
… …
342 $host = inet_ntoa $host; 364 $host = inet_ntoa $host;
343 } 365 }
344 366
345 $self->{server_name} = $host; 367 $self->{server_name} = $host;
346 368
347 # enter ourselves into various lists
348 weaken ($conn{$id}{$self*1} = $self);
349 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 369 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
350 370
351 eval { 371 eval {
352 $self->map_uri; 372 $self->map_uri;
353 $self->respond; 373 $self->respond;
354 }; 374 };
355 375
356 $self->eoconn;
357
358 die if $@ && !ref $@; 376 die if $@ && !ref $@;
359 377
360 last if $self->{h}{connection} =~ /close/; 378 last if $self->{h}{connection} =~ /close/i;
361 379
362 $httpevent->broadcast; 380 $httpevent->broadcast;
363 381
364 $fh->timeout($::PER_TIMEOUT); 382 $fh->timeout($::PER_TIMEOUT);
365 } 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;
366} 392}
367 393
368# uri => path mapping 394# uri => path mapping
369sub map_uri { 395sub map_uri {
370 my $self = shift; 396 my $self = shift;
… …
446 $ims < $self->{stat}[9] 472 $ims < $self->{stat}[9]
447 or $self->err(304, "not modified"); 473 or $self->err(304, "not modified");
448 474
449 if (-r "$path/index.html") { 475 if (-r "$path/index.html") {
450 # replace directory "size" by index.html filesize 476 # replace directory "size" by index.html filesize
451 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 477 $self->{stat} = [stat ($self->{path} .= "/index.html")];
452 $self->handle_file($queue_index); 478 $self->handle_file($queue_index, $tbf_top);
453 } else { 479 } else {
454 $self->handle_dir; 480 $self->handle_dir;
455 } 481 }
456 } 482 }
457 } elsif (-f _ && -r _) { 483 } elsif (-f _ && -r _) {
458 -x _ and $self->err(403, "forbidden"); 484 -x _ and $self->err(403, "forbidden");
459 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small); 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);
460 } else { 498 } else {
461 $self->err(404, "not found"); 499 $self->err(404, "not found");
462 } 500 }
463 } 501 }
464} 502}
… …
469 507
470 $self->response(200, "ok", 508 $self->response(200, "ok",
471 { 509 {
472 "Content-Type" => "text/html", 510 "Content-Type" => "text/html",
473 "Content-Length" => length $idx, 511 "Content-Length" => length $idx,
474 #d# directories change all the time, so X-
475 "X-Last-Modified" => time2str ((stat _)[9]), 512 "Last-Modified" => time2str ($self->{stat}[9]),
476 }, 513 },
477 $idx); 514 $idx);
478} 515}
479 516
480sub handle_file { 517sub handle_file {
481 my ($self, $queue) = @_; 518 my ($self, $queue, $tbf) = @_;
482 my $length = $self->{stat}[7]; 519 my $length = $self->{stat}[7];
483 my $hdr = { 520 my $hdr = {
484 "Last-Modified" => time2str ((stat _)[9]), 521 "Last-Modified" => time2str ((stat _)[9]),
485 }; 522 };
486 523
… …
504 $self->err(416, "not satisfiable", $hdr, ""); 541 $self->err(416, "not satisfiable", $hdr, "");
505 542
506satisfiable: 543satisfiable:
507 # check for segmented downloads 544 # check for segmented downloads
508 if ($l && $::NO_SEGMENTED) { 545 if ($l && $::NO_SEGMENTED) {
509 my $delay = $::NOW + $::PER_TIMEOUT + 15; 546 my $timeout = $::NOW + 15;
510 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 547 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
511 if ($delay <= $::NOW) { 548 if ($timeout <= $::NOW) {
549 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
512 $self->err_segmented_download; 550 #$self->err_segmented_download;
513 } else { 551 } else {
514 $httpevent->wait; 552 $httpevent->wait;
515 } 553 }
516 } 554 }
517 } 555 }
… …
531 569
532 $self->response(@code, $hdr, ""); 570 $self->response(@code, $hdr, "");
533 571
534 if ($self->{method} eq "GET") { 572 if ($self->{method} eq "GET") {
535 $self->{time} = $::NOW; 573 $self->{time} = $::NOW;
574 $self->{written} = 0;
536 575
537 my $current = $Coro::current; 576 my $current = $Coro::current;
538 577
539 my ($fh, $buf, $r); 578 my ($fh, $buf, $r);
540 579
… …
547 if ($l) { 586 if ($l) {
548 sysseek $fh, $l, 0; 587 sysseek $fh, $l, 0;
549 } 588 }
550 } 589 }
551 590
552 my $transfer = $queue->start_transfer; 591 my $transfer = $queue->start_transfer($h);
553 my $locked; 592 my $locked;
554 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 593 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
555 594
556 while ($h > 0) { 595 while ($h > 0) {
557 unless ($locked) { 596 unless ($locked) {
558 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 597 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
559 $bufsize = $::BUFSIZE; 598 $bufsize = $::BUFSIZE;
560 $self->{time} = $::NOW; 599 $self->{time} = $::NOW;
600 $self->{written} = 0;
561 } 601 }
602 }
603
604 if ($blocked{$self->{remote_id}}) {
605 $self->{h}{connection} = "close";
606 die bless {}, err::;
562 } 607 }
563 608
564 if (0) { # !AIO 609 if (0) { # !AIO
565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 610 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
566 or last; 611 or last;
… …
571 Coro::ready($current); 616 Coro::ready($current);
572 }); 617 });
573 &Coro::schedule; 618 &Coro::schedule;
574 last unless $r; 619 last unless $r;
575 } 620 }
621
622 $tbf->request(length $buf);
576 my $w = syswrite $self->{fh}, $buf 623 my $w = syswrite $self->{fh}, $buf
577 or last; 624 or last;
578 $::written += $w; 625 $::written += $w;
579 $self->{written} += $w; 626 $self->{written} += $w;
580 $l += $r; 627 $l += $r;

Diff Legend

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