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.65 by root, Fri Jan 25 09:26:13 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;
42 59
43my @newcons; 60my @newcons;
44my @pool; 61my @pool;
45 62
46# one "execution thread" 63# one "execution thread"
… …
49 if (@newcons) { 66 if (@newcons) {
50 eval { 67 eval {
51 conn->new(@{pop @newcons})->handle; 68 conn->new(@{pop @newcons})->handle;
52 }; 69 };
53 slog 1, "$@" if $@ && !ref $@; 70 slog 1, "$@" if $@ && !ref $@;
71
72 $httpevent->broadcast; # only for testing, but doesn't matter much
73
54 $connections->up; 74 $connections->up;
55 } else { 75 } else {
56 last if @pool >= $MAX_POOL; 76 last if @pool >= $MAX_POOL;
57 push @pool, $Coro::current; 77 push @pool, $Coro::current;
58 schedule; 78 schedule;
… …
100 or die "unable to start server"; 120 or die "unable to start server";
101 121
102 listen_on $http_port; 122 listen_on $http_port;
103} 123}
104 124
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; 125package conn;
114 126
115use Socket; 127use Socket;
116use HTTP::Date; 128use HTTP::Date;
117use Convert::Scalar 'weaken'; 129use Convert::Scalar 'weaken';
… …
151 my (undef, $iaddr) = unpack_sockaddr_in $peername 163 my (undef, $iaddr) = unpack_sockaddr_in $peername
152 or $self->err(500, "unable to decode peername"); 164 or $self->err(500, "unable to decode peername");
153 165
154 $self->{remote_addr} = 166 $self->{remote_addr} =
155 $self->{remote_id} = inet_ntoa $iaddr; 167 $self->{remote_id} = inet_ntoa $iaddr;
168
156 $self->{time} = $::NOW; 169 $self->{time} = $::NOW;
157 170
158 weaken ($Coro::current->{conn} = $self); 171 weaken ($Coro::current->{conn} = $self);
159 172
160 $::conns++; 173 $::conns++;
174 $::maxconns = $::conns if $::conns > $::maxconns;
161 175
162 $self; 176 $self;
163} 177}
164 178
165sub DESTROY { 179sub DESTROY {
166 my $self = shift; 180 #my $self = shift;
167 $::conns--; 181 $::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} 182}
181 183
182sub slog { 184sub slog {
183 my $self = shift; 185 my $self = shift;
184 main::slog($_[0], "$self->{remote_id}> $_[1]"); 186 main::slog($_[0], "$self->{remote_id}> $_[1]");
185} 187}
186 188
187sub response { 189sub response {
188 my ($self, $code, $msg, $hdr, $content) = @_; 190 my ($self, $code, $msg, $hdr, $content) = @_;
189 my $res = "HTTP/1.1 $code $msg\015\012"; 191 my $res = "HTTP/1.1 $code $msg\015\012";
192 my $GZ = "";
190 193
191 if (exists $hdr->{Connection}) { 194 if (exists $hdr->{Connection}) {
192 if ($hdr->{Connection} =~ /close/) { 195 if ($hdr->{Connection} =~ /close/) {
193 $self->{h}{connection} = "close" 196 $self->{h}{connection} = "close"
194 } 197 }
… …
200 $self->{h}{connection} = "close" 203 $self->{h}{connection} = "close"
201 } 204 }
202 } 205 }
203 } 206 }
204 207
208 if ($self->{method} ne "HEAD"
209 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
210 && 400 < length $content
211 && $hdr->{"Content-Length"} == length $content
212 && !exists $hdr->{"Content-Encoding"}
213 ) {
214 my $orig = length $content;
215 $hdr->{"Content-Encoding"} = "gzip";
216 $content = Compress::Zlib::memGzip(\$content);
217 $hdr->{"Content-Length"} = length $content;
218 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
219 }
220
205 $res .= "Date: $HTTP_NOW\015\012"; 221 $res .= "Date: $HTTP_NOW\015\012";
206 222
207 while (my ($h, $v) = each %$hdr) { 223 while (my ($h, $v) = each %$hdr) {
208 $res .= "$h: $v\015\012" 224 $res .= "$h: $v\015\012"
209 } 225 }
210 $res .= "\015\012"; 226 $res .= "\015\012";
211 227
212 $res .= $content if defined $content and $self->{method} ne "HEAD"; 228 $res .= $content if defined $content and $self->{method} ne "HEAD";
213 229
214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 230 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
215 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}. 231 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
216 " \"$self->{h}{referer}\"\n"; 232 " \"$self->{h}{referer}\"\n";
217 233
218 print $accesslog $log if $accesslog; 234 print $::accesslog $log if $::accesslog;
219 print STDERR $log; 235 print STDERR $log;
220 236
221 $self->{written} += 237 $self->{written} +=
222 print {$self->{fh}} $res; 238 print {$self->{fh}} $res;
223} 239}
… …
282 my (%hdr, $h, $v); 298 my (%hdr, $h, $v);
283 299
284 $hdr{lc $1} .= ",$2" 300 $hdr{lc $1} .= ",$2"
285 while $req =~ /\G 301 while $req =~ /\G
286 ([^:\000-\040]+): 302 ([^:\000-\040]+):
287 [\008\040]* 303 [\010\040]*
288 ((?: [^\015\012]+ | \015\012[\008\040] )*) 304 ((?: [^\015\012]+ | \015\012[\010\040] )*)
289 \015\012 305 \015\012
290 /gxc; 306 /gxc;
291 307
292 $req =~ /\G\015\012$/ 308 $req =~ /\G\015\012$/
293 or $self->err(400, "bad request"); 309 or $self->err(400, "bad request");
… …
305 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 321 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
306 } 322 }
307 323
308 $self->{remote_id} = $id; 324 $self->{remote_id} = $id;
309 325
326 weaken (local $conn{$id}{$self*1} = $self);
327
310 if ($blocked{$id}) { 328 if ($blocked{$id}) {
311 $self->err_blocked($blocked{$id}) 329 $self->err_blocked
312 if $blocked{$id} > $::NOW; 330 if $blocked{$id}[0] > $::NOW;
313 331
314 delete $blocked{$id}; 332 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 } 333 }
328 334
329 # find out server name and port 335 # find out server name and port
330 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 336 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
331 $host = $1; 337 $host = $1;
… …
342 $host = inet_ntoa $host; 348 $host = inet_ntoa $host;
343 } 349 }
344 350
345 $self->{server_name} = $host; 351 $self->{server_name} = $host;
346 352
347 # enter ourselves into various lists
348 weaken ($conn{$id}{$self*1} = $self);
349 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 353 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
350 354
351 eval { 355 eval {
352 $self->map_uri; 356 $self->map_uri;
353 $self->respond; 357 $self->respond;
354 }; 358 };
355 359
356 $self->eoconn;
357
358 die if $@ && !ref $@; 360 die if $@ && !ref $@;
359 361
360 last if $self->{h}{connection} =~ /close/; 362 last if $self->{h}{connection} =~ /close/i;
361 363
362 $httpevent->broadcast; 364 $httpevent->broadcast;
363 365
364 $fh->timeout($::PER_TIMEOUT); 366 $fh->timeout($::PER_TIMEOUT);
365 } 367 }
368}
369
370sub block {
371 my $self = shift;
372
373 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
374 $self->slog(2, "blocked ip $self->{remote_id}");
375 $self->err_blocked;
366} 376}
367 377
368# uri => path mapping 378# uri => path mapping
369sub map_uri { 379sub map_uri {
370 my $self = shift; 380 my $self = shift;
… …
446 $ims < $self->{stat}[9] 456 $ims < $self->{stat}[9]
447 or $self->err(304, "not modified"); 457 or $self->err(304, "not modified");
448 458
449 if (-r "$path/index.html") { 459 if (-r "$path/index.html") {
450 # replace directory "size" by index.html filesize 460 # replace directory "size" by index.html filesize
451 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 461 $self->{stat} = [stat ($self->{path} .= "/index.html")];
452 $self->handle_file($queue_index); 462 $self->handle_file($queue_index);
453 } else { 463 } else {
454 $self->handle_dir; 464 $self->handle_dir;
455 } 465 }
456 } 466 }
457 } elsif (-f _ && -r _) { 467 } elsif (-f _ && -r _) {
458 -x _ and $self->err(403, "forbidden"); 468 -x _ and $self->err(403, "forbidden");
459 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small); 469
470 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
471 my $timeout = $::NOW + 10;
472 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
473 if ($timeout < $::NOW) {
474 $self->block($::BLOCKTIME, "too many connections");
475 } else {
476 $httpevent->wait;
477 }
478 }
479 }
480
481 $self->handle_file($queue_file);
460 } else { 482 } else {
461 $self->err(404, "not found"); 483 $self->err(404, "not found");
462 } 484 }
463 } 485 }
464} 486}
… …
469 491
470 $self->response(200, "ok", 492 $self->response(200, "ok",
471 { 493 {
472 "Content-Type" => "text/html", 494 "Content-Type" => "text/html",
473 "Content-Length" => length $idx, 495 "Content-Length" => length $idx,
474 #d# directories change all the time, so X-
475 "X-Last-Modified" => time2str ((stat _)[9]), 496 "Last-Modified" => time2str ($self->{stat}[9]),
476 }, 497 },
477 $idx); 498 $idx);
478} 499}
479 500
480sub handle_file { 501sub handle_file {
… …
504 $self->err(416, "not satisfiable", $hdr, ""); 525 $self->err(416, "not satisfiable", $hdr, "");
505 526
506satisfiable: 527satisfiable:
507 # check for segmented downloads 528 # check for segmented downloads
508 if ($l && $::NO_SEGMENTED) { 529 if ($l && $::NO_SEGMENTED) {
509 my $delay = $::NOW + $::PER_TIMEOUT + 15; 530 my $timeout = $::NOW + 15;
510 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 531 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
511 if ($delay <= $::NOW) { 532 if ($timeout <= $::NOW) {
533 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
512 $self->err_segmented_download; 534 #$self->err_segmented_download;
513 } else { 535 } else {
514 $httpevent->wait; 536 $httpevent->wait;
515 } 537 }
516 } 538 }
517 } 539 }
… …
547 if ($l) { 569 if ($l) {
548 sysseek $fh, $l, 0; 570 sysseek $fh, $l, 0;
549 } 571 }
550 } 572 }
551 573
552 my $transfer = $queue->start_transfer; 574 my $transfer = $queue->start_transfer($h);
553 my $locked; 575 my $locked;
554 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 576 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
555 577
556 while ($h > 0) { 578 while ($h > 0) {
557 unless ($locked) { 579 unless ($locked) {
558 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 580 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
559 $bufsize = $::BUFSIZE; 581 $bufsize = $::BUFSIZE;
560 $self->{time} = $::NOW; 582 $self->{time} = $::NOW;
561 } 583 }
584 }
585
586 if ($blocked{$self->{remote_id}}) {
587 $self->{h}{connection} = "close";
588 die bless {}, err::;
562 } 589 }
563 590
564 if (0) { # !AIO 591 if (0) { # !AIO
565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 592 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
566 or last; 593 or last;

Diff Legend

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