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.53 by root, Fri Nov 30 05:14:12 2001 UTC vs.
Revision 1.76 by root, Wed Jul 13 13:58:51 2005 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 => $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;
… …
75 if (@pool) { 110 if (@pool) {
76 (pop @pool)->ready; 111 (pop @pool)->ready;
77 } else { 112 } else {
78 async \&handler; 113 async \&handler;
79 } 114 }
80
81 } 115 }
82 }; 116 };
83} 117}
84 118
85my $http_port = new Coro::Socket 119my $http_port = new Coro::Socket
… …
100 or die "unable to start server"; 134 or die "unable to start server";
101 135
102 listen_on $http_port; 136 listen_on $http_port;
103} 137}
104 138
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; 139package conn;
114 140
115use Socket; 141use Socket;
116use HTTP::Date; 142use HTTP::Date;
117use Convert::Scalar 'weaken'; 143use Convert::Scalar 'weaken';
… …
151 my (undef, $iaddr) = unpack_sockaddr_in $peername 177 my (undef, $iaddr) = unpack_sockaddr_in $peername
152 or $self->err(500, "unable to decode peername"); 178 or $self->err(500, "unable to decode peername");
153 179
154 $self->{remote_addr} = 180 $self->{remote_addr} =
155 $self->{remote_id} = inet_ntoa $iaddr; 181 $self->{remote_id} = inet_ntoa $iaddr;
182
156 $self->{time} = $::NOW; 183 $self->{time} = $::NOW;
157 184
158 weaken ($Coro::current->{conn} = $self); 185 weaken ($Coro::current->{conn} = $self);
159 186
160 $::conns++; 187 $::conns++;
… …
162 189
163 $self; 190 $self;
164} 191}
165 192
166sub DESTROY { 193sub DESTROY {
167 my $self = shift; 194 #my $self = shift;
168 $::conns--; 195 $::conns--;
169 $self->eoconn;
170} 196}
171 197
172# end of connection 198sub prune_cache {
173sub eoconn { 199 my $hash = $_[0];
174 my $self = shift;
175 200
176 # clean up hints 201 for (keys %$hash) {
177 delete $conn{$self->{remote_id}}{$self*1}; 202 if (ref $hash->{$_} eq HASH::) {
178 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1}; 203 prune_cache($hash->{$_});
179 204 unless (scalar keys %{$hash->{$_}}) {
180 $httpevent->broadcast; 205 delete $hash->{$_};
206 $d2++;
207 }
208 }
209 }
181} 210}
211
212sub prune_caches {
213 prune_cache \%conn;
214 prune_cache \%uri;
215
216 for (keys %blocked) {
217 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
218 }
219}
220
221Event->timer(interval => 60, cb => \&prune_caches);
182 222
183sub slog { 223sub slog {
184 my $self = shift; 224 my $self = shift;
185 main::slog($_[0], "$self->{remote_id}> $_[1]"); 225 main::slog($_[0], "$self->{remote_id}> $_[1]");
186} 226}
187 227
188sub response { 228sub response {
189 my ($self, $code, $msg, $hdr, $content) = @_; 229 my ($self, $code, $msg, $hdr, $content) = @_;
190 my $res = "HTTP/1.1 $code $msg\015\012"; 230 my $res = "HTTP/1.1 $code $msg\015\012";
231 my $GZ = "";
191 232
192 if (exists $hdr->{Connection}) { 233 if (exists $hdr->{Connection}) {
193 if ($hdr->{Connection} =~ /close/) { 234 if ($hdr->{Connection} =~ /close/) {
194 $self->{h}{connection} = "close" 235 $self->{h}{connection} = "close"
195 } 236 }
… …
201 $self->{h}{connection} = "close" 242 $self->{h}{connection} = "close"
202 } 243 }
203 } 244 }
204 } 245 }
205 246
247 if ($self->{method} ne "HEAD"
248 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
249 && 400 < length $content
250 && $hdr->{"Content-Length"} == length $content
251 && !exists $hdr->{"Content-Encoding"}
252 ) {
253 my $orig = length $content;
254 $hdr->{"Content-Encoding"} = "gzip";
255 $content = Compress::Zlib::memGzip(\$content);
256 $hdr->{"Content-Length"} = length $content;
257 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
258 }
259
206 $res .= "Date: $HTTP_NOW\015\012"; 260 $res .= "Date: $HTTP_NOW\015\012";
261 $res .= "Server: $::NAME\015\012";
207 262
208 while (my ($h, $v) = each %$hdr) { 263 while (my ($h, $v) = each %$hdr) {
209 $res .= "$h: $v\015\012" 264 $res .= "$h: $v\015\012"
210 } 265 }
211 $res .= "\015\012"; 266 $res .= "\015\012";
212 267
213 $res .= $content if defined $content and $self->{method} ne "HEAD"; 268 $res .= $content if defined $content and $self->{method} ne "HEAD";
214 269
215 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 270 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
216 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}. 271 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
217 " \"$self->{h}{referer}\"\n"; 272 " \"$self->{h}{referer}\"\n";
218 273
219 print $accesslog $log if $accesslog; 274 print $::accesslog $log if $::accesslog;
220 print STDERR $log; 275 print STDERR $log;
221 276
222 $self->{written} += 277 $tbf_top->request(length $res, 1e6);
223 print {$self->{fh}} $res; 278 $self->{written} += print {$self->{fh}} $res;
224} 279}
225 280
226sub err { 281sub err {
227 my $self = shift; 282 my $self = shift;
228 my ($code, $msg, $hdr, $content) = @_; 283 my ($code, $msg, $hdr, $content) = @_;
… …
283 my (%hdr, $h, $v); 338 my (%hdr, $h, $v);
284 339
285 $hdr{lc $1} .= ",$2" 340 $hdr{lc $1} .= ",$2"
286 while $req =~ /\G 341 while $req =~ /\G
287 ([^:\000-\040]+): 342 ([^:\000-\040]+):
288 [\008\040]* 343 [\011\040]*
289 ((?: [^\015\012]+ | \015\012[\008\040] )*) 344 ((?: [^\015\012]+ | \015\012[\011\040] )*)
290 \015\012 345 \015\012
291 /gxc; 346 /gxc;
292 347
293 $req =~ /\G\015\012$/ 348 $req =~ /\G\015\012$/
294 or $self->err(400, "bad request"); 349 or $self->err(400, "bad request");
… …
306 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 361 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
307 } 362 }
308 363
309 $self->{remote_id} = $id; 364 $self->{remote_id} = $id;
310 365
366 weaken (local $conn{$id}{$self*1} = $self);
367
311 if ($blocked{$id}) { 368 if ($blocked{$id}) {
312 $self->err_blocked($blocked{$id}) 369 $self->err_blocked
313 if $blocked{$id} > $::NOW; 370 if $blocked{$id}[0] > $::NOW;
314 371
315 delete $blocked{$id}; 372 delete $blocked{$id};
316 }
317
318 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
319 my $delay = $::PER_TIMEOUT + $::NOW + 15;
320 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
321 if ($delay < $::NOW) {
322 $self->slog(2, "blocked ip $id");
323 $self->err_blocked;
324 } else {
325 $httpevent->wait;
326 }
327 }
328 } 373 }
329 374
330 # find out server name and port 375 # find out server name and port
331 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 376 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
332 $host = $1; 377 $host = $1;
… …
343 $host = inet_ntoa $host; 388 $host = inet_ntoa $host;
344 } 389 }
345 390
346 $self->{server_name} = $host; 391 $self->{server_name} = $host;
347 392
348 # enter ourselves into various lists
349 weaken ($conn{$id}{$self*1} = $self);
350 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 393 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
351 394
352 eval { 395 eval {
353 $self->map_uri; 396 $self->map_uri;
354 $self->respond; 397 $self->respond;
355 }; 398 };
356 399
357 $self->eoconn;
358
359 die if $@ && !ref $@; 400 die if $@ && !ref $@;
360 401
361 last if $self->{h}{connection} =~ /close/; 402 last if $self->{h}{connection} =~ /close/i;
362 403
363 $httpevent->broadcast; 404 $httpevent->broadcast;
364 405
365 $fh->timeout($::PER_TIMEOUT); 406 $fh->timeout($::PER_TIMEOUT);
366 } 407 }
408}
409
410sub block {
411 my $self = shift;
412
413 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
414 $self->slog(2, "blocked ip $self->{remote_id}");
415 $self->err_blocked;
367} 416}
368 417
369# uri => path mapping 418# uri => path mapping
370sub map_uri { 419sub map_uri {
371 my $self = shift; 420 my $self = shift;
… …
447 $ims < $self->{stat}[9] 496 $ims < $self->{stat}[9]
448 or $self->err(304, "not modified"); 497 or $self->err(304, "not modified");
449 498
450 if (-r "$path/index.html") { 499 if (-r "$path/index.html") {
451 # replace directory "size" by index.html filesize 500 # replace directory "size" by index.html filesize
452 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 501 $self->{stat} = [stat ($self->{path} .= "/index.html")];
453 $self->handle_file($queue_index); 502 $self->handle_file($queue_index, $tbf_top);
454 } else { 503 } else {
455 $self->handle_dir; 504 $self->handle_dir;
456 } 505 }
457 } 506 }
458 } elsif (-f _ && -r _) { 507 } elsif (-f _ && -r _) {
459 -x _ and $self->err(403, "forbidden"); 508 -x _ and $self->err(403, "forbidden");
460 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small); 509
510 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
511 my $timeout = $::NOW + 10;
512 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
513 if ($timeout < $::NOW) {
514 $self->block($::BLOCKTIME, "too many connections");
515 } else {
516 $httpevent->wait;
517 }
518 }
519 }
520
521 $self->handle_file($queue_file, $tbf_top);
461 } else { 522 } else {
462 $self->err(404, "not found"); 523 $self->err(404, "not found");
463 } 524 }
464 } 525 }
465} 526}
… …
468 my $self = shift; 529 my $self = shift;
469 my $idx = $self->diridx; 530 my $idx = $self->diridx;
470 531
471 $self->response(200, "ok", 532 $self->response(200, "ok",
472 { 533 {
473 "Content-Type" => "text/html", 534 "Content-Type" => "text/html; charset=utf-8",
474 "Content-Length" => length $idx, 535 "Content-Length" => length $idx,
475 #d# directories change all the time, so X-
476 "X-Last-Modified" => time2str ((stat _)[9]), 536 "Last-Modified" => time2str ($self->{stat}[9]),
477 }, 537 },
478 $idx); 538 $idx);
479} 539}
480 540
481sub handle_file { 541sub handle_file {
482 my ($self, $queue) = @_; 542 my ($self, $queue, $tbf) = @_;
483 my $length = $self->{stat}[7]; 543 my $length = $self->{stat}[7];
484 my $hdr = { 544 my $hdr = {
485 "Last-Modified" => time2str ((stat _)[9]), 545 "Last-Modified" => time2str ((stat _)[9]),
546 "Accept-Ranges" => "bytes",
486 }; 547 };
487 548
488 my @code = (200, "ok"); 549 my @code = (200, "ok");
489 my ($l, $h); 550 my ($l, $h);
490 551
… …
505 $self->err(416, "not satisfiable", $hdr, ""); 566 $self->err(416, "not satisfiable", $hdr, "");
506 567
507satisfiable: 568satisfiable:
508 # check for segmented downloads 569 # check for segmented downloads
509 if ($l && $::NO_SEGMENTED) { 570 if ($l && $::NO_SEGMENTED) {
510 my $delay = $::NOW + $::PER_TIMEOUT + 15; 571 my $timeout = $::NOW + 15;
511 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 572 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
512 if ($delay <= $::NOW) { 573 if ($timeout <= $::NOW) {
574 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
513 $self->err_segmented_download; 575 #$self->err_segmented_download;
514 } else { 576 } else {
515 $httpevent->wait; 577 $httpevent->wait;
516 } 578 }
517 } 579 }
518 } 580 }
… …
532 594
533 $self->response(@code, $hdr, ""); 595 $self->response(@code, $hdr, "");
534 596
535 if ($self->{method} eq "GET") { 597 if ($self->{method} eq "GET") {
536 $self->{time} = $::NOW; 598 $self->{time} = $::NOW;
599 $self->{written} = 0;
537 600
538 my $current = $Coro::current; 601 my $current = $Coro::current;
539 602
540 my ($fh, $buf, $r); 603 my ($fh, $buf, $r);
541 604
… …
548 if ($l) { 611 if ($l) {
549 sysseek $fh, $l, 0; 612 sysseek $fh, $l, 0;
550 } 613 }
551 } 614 }
552 615
553 my $transfer = $queue->start_transfer; 616 my $transfer = $queue->start_transfer($h);
554 my $locked; 617 my $locked;
555 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 618 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
556 619
557 while ($h > 0) { 620 while ($h > 0) {
558 unless ($locked) { 621 unless ($locked) {
559 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 622 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
560 $bufsize = $::BUFSIZE; 623 $bufsize = $::BUFSIZE;
561 $self->{time} = $::NOW; 624 $self->{time} = $::NOW;
625 $self->{written} = 0;
562 } 626 }
627 }
628
629 if ($blocked{$self->{remote_id}}) {
630 $self->{h}{connection} = "close";
631 die bless {}, err::;
563 } 632 }
564 633
565 if (0) { # !AIO 634 if (0) { # !AIO
566 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 635 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
567 or last; 636 or last;
… …
572 Coro::ready($current); 641 Coro::ready($current);
573 }); 642 });
574 &Coro::schedule; 643 &Coro::schedule;
575 last unless $r; 644 last unless $r;
576 } 645 }
646
647 $tbf->request(length $buf);
577 my $w = syswrite $self->{fh}, $buf 648 my $w = syswrite $self->{fh}, $buf
578 or last; 649 or last;
579 $::written += $w; 650 $::written += $w;
580 $self->{written} += $w; 651 $self->{written} += $w;
581 $l += $r; 652 $l += $r;

Diff Legend

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