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.51 by root, Thu Nov 29 01:50:41 2001 UTC vs.
Revision 1.70 by root, Wed May 22 00:41:44 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 => 100000;
40 (new transferqueue $MAX_TRANSFERS_SMALL), 61
41 (new transferqueue $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;
… …
101 or die "unable to start server"; 135 or die "unable to start server";
102 136
103 listen_on $http_port; 137 listen_on $http_port;
104} 138}
105 139
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; 140package conn;
115 141
116use Socket; 142use Socket;
117use HTTP::Date; 143use HTTP::Date;
118use Convert::Scalar 'weaken'; 144use Convert::Scalar 'weaken';
… …
152 my (undef, $iaddr) = unpack_sockaddr_in $peername 178 my (undef, $iaddr) = unpack_sockaddr_in $peername
153 or $self->err(500, "unable to decode peername"); 179 or $self->err(500, "unable to decode peername");
154 180
155 $self->{remote_addr} = 181 $self->{remote_addr} =
156 $self->{remote_id} = inet_ntoa $iaddr; 182 $self->{remote_id} = inet_ntoa $iaddr;
183
157 $self->{time} = $::NOW; 184 $self->{time} = $::NOW;
158 185
159 weaken ($Coro::current->{conn} = $self); 186 weaken ($Coro::current->{conn} = $self);
160 187
161 $::conns++; 188 $::conns++;
189 $::maxconns = $::conns if $::conns > $::maxconns;
162 190
163 $self; 191 $self;
164} 192}
165 193
166sub DESTROY { 194sub DESTROY {
167 my $self = shift; 195 #my $self = shift;
168 $::conns--; 196 $::conns--;
169 $self->eoconn;
170}
171
172# end of connection
173sub eoconn {
174 my $self = shift;
175
176 # clean up hints
177 delete $conn{$self->{remote_id}}{$self*1};
178 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
179
180 $httpevent->broadcast;
181} 197}
182 198
183sub slog { 199sub slog {
184 my $self = shift; 200 my $self = shift;
185 main::slog($_[0], "$self->{remote_id}> $_[1]"); 201 main::slog($_[0], "$self->{remote_id}> $_[1]");
186} 202}
187 203
188sub response { 204sub response {
189 my ($self, $code, $msg, $hdr, $content) = @_; 205 my ($self, $code, $msg, $hdr, $content) = @_;
190 my $res = "HTTP/1.1 $code $msg\015\012"; 206 my $res = "HTTP/1.1 $code $msg\015\012";
207 my $GZ = "";
191 208
192 if (exists $hdr->{Connection}) { 209 if (exists $hdr->{Connection}) {
193 if ($hdr->{Connection} =~ /close/) { 210 if ($hdr->{Connection} =~ /close/) {
194 $self->{h}{connection} = "close" 211 $self->{h}{connection} = "close"
195 } 212 }
… …
201 $self->{h}{connection} = "close" 218 $self->{h}{connection} = "close"
202 } 219 }
203 } 220 }
204 } 221 }
205 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
206 $res .= "Date: $HTTP_NOW\015\012"; 236 $res .= "Date: $HTTP_NOW\015\012";
207 237
208 while (my ($h, $v) = each %$hdr) { 238 while (my ($h, $v) = each %$hdr) {
209 $res .= "$h: $v\015\012" 239 $res .= "$h: $v\015\012"
210 } 240 }
211 $res .= "\015\012"; 241 $res .= "\015\012";
212 242
213 $res .= $content if defined $content and $self->{method} ne "HEAD"; 243 $res .= $content if defined $content and $self->{method} ne "HEAD";
214 244
215 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).
216 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}. 246 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
217 " \"$self->{h}{referer}\"\n"; 247 " \"$self->{h}{referer}\"\n";
218 248
219 print $accesslog $log if $accesslog; 249 print $::accesslog $log if $::accesslog;
220 print STDERR $log; 250 print STDERR $log;
221 251
222 $self->{written} += 252 $tbf_top->request(length $res, 1e6);
223 print {$self->{fh}} $res; 253 $self->{written} += print {$self->{fh}} $res;
224} 254}
225 255
226sub err { 256sub err {
227 my $self = shift; 257 my $self = shift;
228 my ($code, $msg, $hdr, $content) = @_; 258 my ($code, $msg, $hdr, $content) = @_;
… …
283 my (%hdr, $h, $v); 313 my (%hdr, $h, $v);
284 314
285 $hdr{lc $1} .= ",$2" 315 $hdr{lc $1} .= ",$2"
286 while $req =~ /\G 316 while $req =~ /\G
287 ([^:\000-\040]+): 317 ([^:\000-\040]+):
288 [\008\040]* 318 [\011\040]*
289 ((?: [^\015\012]+ | \015\012[\008\040] )*) 319 ((?: [^\015\012]+ | \015\012[\011\040] )*)
290 \015\012 320 \015\012
291 /gxc; 321 /gxc;
292 322
293 $req =~ /\G\015\012$/ 323 $req =~ /\G\015\012$/
294 or $self->err(400, "bad request"); 324 or $self->err(400, "bad request");
… …
306 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 336 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
307 } 337 }
308 338
309 $self->{remote_id} = $id; 339 $self->{remote_id} = $id;
310 340
341 weaken (local $conn{$id}{$self*1} = $self);
342
311 if ($blocked{$id}) { 343 if ($blocked{$id}) {
312 $self->err_blocked($blocked{$id}) 344 $self->err_blocked
313 if $blocked{$id} > $::NOW; 345 if $blocked{$id}[0] > $::NOW;
314 346
315 delete $blocked{$id}; 347 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 } 348 }
329 349
330 # find out server name and port 350 # find out server name and port
331 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 351 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
332 $host = $1; 352 $host = $1;
… …
343 $host = inet_ntoa $host; 363 $host = inet_ntoa $host;
344 } 364 }
345 365
346 $self->{server_name} = $host; 366 $self->{server_name} = $host;
347 367
348 # enter ourselves into various lists
349 weaken ($conn{$id}{$self*1} = $self);
350 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 368 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
351 369
352 eval { 370 eval {
353 $self->map_uri; 371 $self->map_uri;
354 $self->respond; 372 $self->respond;
355 }; 373 };
356 374
357 $self->eoconn;
358
359 die if $@ && !ref $@; 375 die if $@ && !ref $@;
360 376
361 last if $self->{h}{connection} =~ /close/; 377 last if $self->{h}{connection} =~ /close/i;
362 378
363 $httpevent->broadcast; 379 $httpevent->broadcast;
364 380
365 $fh->timeout($::PER_TIMEOUT); 381 $fh->timeout($::PER_TIMEOUT);
366 } 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;
367} 391}
368 392
369# uri => path mapping 393# uri => path mapping
370sub map_uri { 394sub map_uri {
371 my $self = shift; 395 my $self = shift;
… …
447 $ims < $self->{stat}[9] 471 $ims < $self->{stat}[9]
448 or $self->err(304, "not modified"); 472 or $self->err(304, "not modified");
449 473
450 if (-r "$path/index.html") { 474 if (-r "$path/index.html") {
451 # replace directory "size" by index.html filesize 475 # replace directory "size" by index.html filesize
452 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 476 $self->{stat} = [stat ($self->{path} .= "/index.html")];
453 $self->handle_file; 477 $self->handle_file($queue_index, $tbf_top);
454 } else { 478 } else {
455 $self->handle_dir; 479 $self->handle_dir;
456 } 480 }
457 } 481 }
458 } elsif (-f _ && -r _) { 482 } elsif (-f _ && -r _) {
459 -x _ and $self->err(403, "forbidden"); 483 -x _ and $self->err(403, "forbidden");
460 $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);
461 } else { 497 } else {
462 $self->err(404, "not found"); 498 $self->err(404, "not found");
463 } 499 }
464 } 500 }
465} 501}
… …
470 506
471 $self->response(200, "ok", 507 $self->response(200, "ok",
472 { 508 {
473 "Content-Type" => "text/html", 509 "Content-Type" => "text/html",
474 "Content-Length" => length $idx, 510 "Content-Length" => length $idx,
475 #d# directories change all the time, so X-
476 "X-Last-Modified" => time2str ((stat _)[9]), 511 "Last-Modified" => time2str ($self->{stat}[9]),
477 }, 512 },
478 $idx); 513 $idx);
479} 514}
480 515
481sub handle_file { 516sub handle_file {
482 my $self = shift; 517 my ($self, $queue, $tbf) = @_;
483 my $length = $self->{stat}[7]; 518 my $length = $self->{stat}[7];
484 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
485 my $hdr = { 519 my $hdr = {
486 "Last-Modified" => time2str ((stat _)[9]), 520 "Last-Modified" => time2str ((stat _)[9]),
487 }; 521 };
488 522
489 my @code = (200, "ok"); 523 my @code = (200, "ok");
… …
506 $self->err(416, "not satisfiable", $hdr, ""); 540 $self->err(416, "not satisfiable", $hdr, "");
507 541
508satisfiable: 542satisfiable:
509 # check for segmented downloads 543 # check for segmented downloads
510 if ($l && $::NO_SEGMENTED) { 544 if ($l && $::NO_SEGMENTED) {
511 my $delay = $::NOW + $::PER_TIMEOUT + 15; 545 my $timeout = $::NOW + 15;
512 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 546 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
513 if ($delay <= $::NOW) { 547 if ($timeout <= $::NOW) {
548 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
514 $self->err_segmented_download; 549 #$self->err_segmented_download;
515 } else { 550 } else {
516 $httpevent->wait; 551 $httpevent->wait;
517 } 552 }
518 } 553 }
519 } 554 }
… …
549 if ($l) { 584 if ($l) {
550 sysseek $fh, $l, 0; 585 sysseek $fh, $l, 0;
551 } 586 }
552 } 587 }
553 588
554 my $transfer = $queue->start_transfer; 589 my $transfer = $queue->start_transfer($h);
555 my $locked; 590 my $locked;
556 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 591 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
557 592
558 while ($h > 0) { 593 while ($h > 0) {
559 unless ($locked) { 594 unless ($locked) {
560 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 595 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
561 $bufsize = $::BUFSIZE; 596 $bufsize = $::BUFSIZE;
562 $self->{time} = $::NOW; 597 $self->{time} = $::NOW;
563 } 598 }
599 }
600
601 if ($blocked{$self->{remote_id}}) {
602 $self->{h}{connection} = "close";
603 die bless {}, err::;
564 } 604 }
565 605
566 if (0) { # !AIO 606 if (0) { # !AIO
567 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 607 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
568 or last; 608 or last;
… …
573 Coro::ready($current); 613 Coro::ready($current);
574 }); 614 });
575 &Coro::schedule; 615 &Coro::schedule;
576 last unless $r; 616 last unless $r;
577 } 617 }
618
619 $tbf->request(length $buf);
578 my $w = syswrite $self->{fh}, $buf 620 my $w = syswrite $self->{fh}, $buf
579 or last; 621 or last;
580 $::written += $w; 622 $::written += $w;
581 $self->{written} += $w; 623 $self->{written} += $w;
582 $l += $r; 624 $l += $r;

Diff Legend

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