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.49 by root, Wed Nov 28 03:39:46 2001 UTC vs.
Revision 1.72 by root, Tue Sep 10 03:08:03 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; 57our $queue_file = new transferqueue $MAX_TRANSFERS;
58our $queue_index = new transferqueue 10;
38 59
39our @transfers = ( 60our $tbf_top = new tbf rate => $TBF_RATE || 100000;
40 (new Coro::Semaphore $MAX_TRANSFERS_SMALL), 61
41 (new Coro::Semaphore $MAX_TRANSFERS_LARGE), 62my $unused_bytes = 0;
42); 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}
43 74
44my @newcons; 75my @newcons;
45my @pool; 76my @pool;
46 77
47# one "execution thread" 78# one "execution thread"
… …
50 if (@newcons) { 81 if (@newcons) {
51 eval { 82 eval {
52 conn->new(@{pop @newcons})->handle; 83 conn->new(@{pop @newcons})->handle;
53 }; 84 };
54 slog 1, "$@" if $@ && !ref $@; 85 slog 1, "$@" if $@ && !ref $@;
86
87 $httpevent->broadcast; # only for testing, but doesn't matter much
88
55 $connections->up; 89 $connections->up;
56 } else { 90 } else {
57 last if @pool >= $MAX_POOL; 91 last if @pool >= $MAX_POOL;
58 push @pool, $Coro::current; 92 push @pool, $Coro::current;
59 schedule; 93 schedule;
… …
76 if (@pool) { 110 if (@pool) {
77 (pop @pool)->ready; 111 (pop @pool)->ready;
78 } else { 112 } else {
79 async \&handler; 113 async \&handler;
80 } 114 }
81
82 } 115 }
83 }; 116 };
84} 117}
85 118
86my $http_port = new Coro::Socket 119my $http_port = new Coro::Socket
… …
101 or die "unable to start server"; 134 or die "unable to start server";
102 135
103 listen_on $http_port; 136 listen_on $http_port;
104} 137}
105 138
106our $NOW;
107our $HTTP_NOW;
108
109Event->timer(interval => 1, hard => 1, cb => sub {
110 $NOW = time;
111 $HTTP_NOW = time2str $NOW;
112})->now;
113
114package conn; 139package conn;
115 140
116use Socket; 141use Socket;
117use HTTP::Date; 142use HTTP::Date;
118use Convert::Scalar 'weaken'; 143use Convert::Scalar 'weaken';
… …
150 my $peername = shift; 175 my $peername = shift;
151 my $self = bless { fh => $fh }, $class; 176 my $self = bless { fh => $fh }, $class;
152 my (undef, $iaddr) = unpack_sockaddr_in $peername 177 my (undef, $iaddr) = unpack_sockaddr_in $peername
153 or $self->err(500, "unable to decode peername"); 178 or $self->err(500, "unable to decode peername");
154 179
180 $self->{remote_addr} =
155 $self->{remote_addr} = 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++;
188 $::maxconns = $::conns if $::conns > $::maxconns;
161 189
162 $self; 190 $self;
163} 191}
164 192
165sub DESTROY { 193sub DESTROY {
166 my $self = shift; 194 #my $self = shift;
167 $::conns--; 195 $::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} 196}
181 197
182sub slog { 198sub slog {
183 my $self = shift; 199 my $self = shift;
184 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 200 main::slog($_[0], "$self->{remote_id}> $_[1]");
185} 201}
186 202
187sub response { 203sub response {
188 my ($self, $code, $msg, $hdr, $content) = @_; 204 my ($self, $code, $msg, $hdr, $content) = @_;
189 my $res = "HTTP/1.1 $code $msg\015\012"; 205 my $res = "HTTP/1.1 $code $msg\015\012";
206 my $GZ = "";
190 207
191 if (exists $hdr->{Connection}) { 208 if (exists $hdr->{Connection}) {
192 if ($hdr->{Connection} =~ /close/) { 209 if ($hdr->{Connection} =~ /close/) {
193 $self->{h}{connection} = "close" 210 $self->{h}{connection} = "close"
194 } 211 }
… …
200 $self->{h}{connection} = "close" 217 $self->{h}{connection} = "close"
201 } 218 }
202 } 219 }
203 } 220 }
204 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 }
234
205 $res .= "Date: $HTTP_NOW\015\012"; 235 $res .= "Date: $HTTP_NOW\015\012";
236 $res .= "Server: $::NAME\015\012";
206 237
207 while (my ($h, $v) = each %$hdr) { 238 while (my ($h, $v) = each %$hdr) {
208 $res .= "$h: $v\015\012" 239 $res .= "$h: $v\015\012"
209 } 240 }
210 $res .= "\015\012"; 241 $res .= "\015\012";
211 242
212 $res .= $content if defined $content and $self->{method} ne "HEAD"; 243 $res .= $content if defined $content and $self->{method} ne "HEAD";
213 244
214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 245 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
215 " $self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 246 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
247 " \"$self->{h}{referer}\"\n";
216 248
217 print $accesslog $log if $accesslog; 249 print $::accesslog $log if $::accesslog;
218 print STDERR $log; 250 print STDERR $log;
219 251
220 $self->{written} += 252 $tbf_top->request(length $res, 1e6);
221 print {$self->{fh}} $res; 253 $self->{written} += print {$self->{fh}} $res;
222} 254}
223 255
224sub err { 256sub err {
225 my $self = shift; 257 my $self = shift;
226 my ($code, $msg, $hdr, $content) = @_; 258 my ($code, $msg, $hdr, $content) = @_;
… …
281 my (%hdr, $h, $v); 313 my (%hdr, $h, $v);
282 314
283 $hdr{lc $1} .= ",$2" 315 $hdr{lc $1} .= ",$2"
284 while $req =~ /\G 316 while $req =~ /\G
285 ([^:\000-\040]+): 317 ([^:\000-\040]+):
286 [\008\040]* 318 [\011\040]*
287 ((?: [^\015\012]+ | \015\012[\008\040] )*) 319 ((?: [^\015\012]+ | \015\012[\011\040] )*)
288 \015\012 320 \015\012
289 /gxc; 321 /gxc;
290 322
291 $req =~ /\G\015\012$/ 323 $req =~ /\G\015\012$/
292 or $self->err(400, "bad request"); 324 or $self->err(400, "bad request");
… …
304 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 336 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
305 } 337 }
306 338
307 $self->{remote_id} = $id; 339 $self->{remote_id} = $id;
308 340
341 weaken (local $conn{$id}{$self*1} = $self);
342
309 if ($blocked{$id}) { 343 if ($blocked{$id}) {
310 $self->err_blocked($blocked{$id}) 344 $self->err_blocked
311 if $blocked{$id} > $::NOW; 345 if $blocked{$id}[0] > $::NOW;
312 346
313 delete $blocked{$id}; 347 delete $blocked{$id};
314 }
315
316 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
317 my $delay = $::PER_TIMEOUT + $::NOW + 15;
318 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
319 if ($delay < $::NOW) {
320 $self->slog(2, "blocked ip $id");
321 $self->err_blocked;
322 } else {
323 $httpevent->wait;
324 }
325 }
326 } 348 }
327 349
328 # find out server name and port 350 # find out server name and port
329 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 351 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
330 $host = $1; 352 $host = $1;
… …
341 $host = inet_ntoa $host; 363 $host = inet_ntoa $host;
342 } 364 }
343 365
344 $self->{server_name} = $host; 366 $self->{server_name} = $host;
345 367
346 # enter ourselves into various lists
347 weaken ($conn{$id}{$self*1} = $self);
348 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 368 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
349 369
350 eval { 370 eval {
351 $self->map_uri; 371 $self->map_uri;
352 $self->respond; 372 $self->respond;
353 }; 373 };
354 374
355 $self->eoconn;
356
357 die if $@ && !ref $@; 375 die if $@ && !ref $@;
358 376
359 last if $self->{h}{connection} =~ /close/; 377 last if $self->{h}{connection} =~ /close/i;
360 378
361 $httpevent->broadcast; 379 $httpevent->broadcast;
362 380
363 $fh->timeout($::PER_TIMEOUT); 381 $fh->timeout($::PER_TIMEOUT);
364 } 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;
365} 391}
366 392
367# uri => path mapping 393# uri => path mapping
368sub map_uri { 394sub map_uri {
369 my $self = shift; 395 my $self = shift;
… …
445 $ims < $self->{stat}[9] 471 $ims < $self->{stat}[9]
446 or $self->err(304, "not modified"); 472 or $self->err(304, "not modified");
447 473
448 if (-r "$path/index.html") { 474 if (-r "$path/index.html") {
449 # replace directory "size" by index.html filesize 475 # replace directory "size" by index.html filesize
450 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 476 $self->{stat} = [stat ($self->{path} .= "/index.html")];
451 $self->handle_file; 477 $self->handle_file($queue_index, $tbf_top);
452 } else { 478 } else {
453 $self->handle_dir; 479 $self->handle_dir;
454 } 480 }
455 } 481 }
456 } elsif (-f _ && -r _) { 482 } elsif (-f _ && -r _) {
457 -x _ and $self->err(403, "forbidden"); 483 -x _ and $self->err(403, "forbidden");
458 $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);
459 } else { 497 } else {
460 $self->err(404, "not found"); 498 $self->err(404, "not found");
461 } 499 }
462 } 500 }
463} 501}
… …
468 506
469 $self->response(200, "ok", 507 $self->response(200, "ok",
470 { 508 {
471 "Content-Type" => "text/html", 509 "Content-Type" => "text/html",
472 "Content-Length" => length $idx, 510 "Content-Length" => length $idx,
473 "Last-Modified" => time2str ((stat _)[9]), 511 "Last-Modified" => time2str ($self->{stat}[9]),
474 }, 512 },
475 $idx); 513 $idx);
476} 514}
477 515
478sub handle_file { 516sub handle_file {
479 my $self = shift; 517 my ($self, $queue, $tbf) = @_;
480 my $length = $self->{stat}[7]; 518 my $length = $self->{stat}[7];
481 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
482 my $hdr = { 519 my $hdr = {
483 "Last-Modified" => time2str ((stat _)[9]), 520 "Last-Modified" => time2str ((stat _)[9]),
484 }; 521 };
485 522
486 my @code = (200, "ok"); 523 my @code = (200, "ok");
… …
503 $self->err(416, "not satisfiable", $hdr, ""); 540 $self->err(416, "not satisfiable", $hdr, "");
504 541
505satisfiable: 542satisfiable:
506 # check for segmented downloads 543 # check for segmented downloads
507 if ($l && $::NO_SEGMENTED) { 544 if ($l && $::NO_SEGMENTED) {
508 my $delay = $::NOW + $::PER_TIMEOUT + 15; 545 my $timeout = $::NOW + 15;
509 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 546 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
510 if ($delay <= $::NOW) { 547 if ($timeout <= $::NOW) {
548 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
511 $self->err_segmented_download; 549 #$self->err_segmented_download;
512 } else { 550 } else {
513 $httpevent->wait; 551 $httpevent->wait;
514 } 552 }
515 } 553 }
516 } 554 }
… …
530 568
531 $self->response(@code, $hdr, ""); 569 $self->response(@code, $hdr, "");
532 570
533 if ($self->{method} eq "GET") { 571 if ($self->{method} eq "GET") {
534 $self->{time} = $::NOW; 572 $self->{time} = $::NOW;
573 $self->{written} = 0;
535 574
536 my $current = $Coro::current; 575 my $current = $Coro::current;
537 576
538 my ($fh, $buf, $r); 577 my ($fh, $buf, $r);
539 578
… …
546 if ($l) { 585 if ($l) {
547 sysseek $fh, $l, 0; 586 sysseek $fh, $l, 0;
548 } 587 }
549 } 588 }
550 589
551 my $transfer; # transfer guard 590 my $transfer = $queue->start_transfer($h);
591 my $locked;
552 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 592 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
553 593
554 $self->{time} = $::NOW;
555
556 while ($h > 0) { 594 while ($h > 0) {
557 unless ($transfer) { 595 unless ($locked) {
558 if ($transfer ||= $queue->timed_guard($::WAIT_INTERVAL)) { 596 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
559 $bufsize = $::BUFSIZE; 597 $bufsize = $::BUFSIZE;
560 $self->{time} = $::NOW; 598 $self->{time} = $::NOW;
599 $self->{written} = 0;
561 } 600 }
601 }
602
603 if ($blocked{$self->{remote_id}}) {
604 $self->{h}{connection} = "close";
605 die bless {}, err::;
562 } 606 }
563 607
564 if (0) { # !AIO 608 if (0) { # !AIO
565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 609 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
566 or last; 610 or last;
… …
571 Coro::ready($current); 615 Coro::ready($current);
572 }); 616 });
573 &Coro::schedule; 617 &Coro::schedule;
574 last unless $r; 618 last unless $r;
575 } 619 }
620
621 $tbf->request(length $buf);
576 my $w = syswrite $self->{fh}, $buf 622 my $w = syswrite $self->{fh}, $buf
577 or last; 623 or last;
578 $::written += $w; 624 $::written += $w;
579 $self->{written} += $w; 625 $self->{written} += $w;
580 $l += $r; 626 $l += $r;

Diff Legend

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