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.32 by root, Wed Aug 29 01:32:50 2001 UTC vs.
Revision 1.61 by root, Thu Jan 3 01:20:17 2002 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::Event; 3use Coro::Event;
4use Coro::Socket; 4use Coro::Socket;
5use Coro::Signal;
5 6
6use HTTP::Date; 7use HTTP::Date;
8use POSIX ();
7 9
8no utf8; 10no utf8;
9use bytes; 11use bytes;
10
11our @wait_time = (0); # used to calculcate avg. waiting time
12 12
13# at least on my machine, this thingy serves files 13# at least on my machine, this thingy serves files
14# quite a bit faster than apache, ;) 14# quite a bit faster than apache, ;)
15# and quite a bit slower than thttpd :( 15# and quite a bit slower than thttpd :(
16 16
17$SIG{PIPE} = 'IGNORE'; 17$SIG{PIPE} = 'IGNORE';
18 18
19our $accesslog; 19our $accesslog;
20our $errorlog;
21
22our $NOW;
23our $HTTP_NOW;
24
25Event->timer(interval => 1, hard => 1, cb => sub {
26 $NOW = time;
27 $HTTP_NOW = time2str $NOW;
28})->now;
29
30if ($ERROR_LOG) {
31 use IO::Handle;
32 open $errorlog, ">>$ERROR_LOG"
33 or die "$ERROR_LOG: $!";
34 $errorlog->autoflush(1);
35}
20 36
21if ($ACCESS_LOG) { 37if ($ACCESS_LOG) {
22 use IO::Handle; 38 use IO::Handle;
23 open $accesslog, ">>$ACCESS_LOG" 39 open $accesslog, ">>$ACCESS_LOG"
24 or die "$ACCESS_LOG: $!"; 40 or die "$ACCESS_LOG: $!";
… …
26} 42}
27 43
28sub slog { 44sub slog {
29 my $level = shift; 45 my $level = shift;
30 my $format = shift; 46 my $format = shift;
47 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
31 printf "---: $format\n", @_; 48 printf "$NOW: $format\n", @_;
49 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
32} 50}
33 51
34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 52our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $transfers = new Coro::Semaphore $MAX_TRANSFER || 50; 53our $httpevent = new Coro::Signal;
54
55our $queue_file = new transferqueue slots => $MAX_TRANSFERS, maxsize => 256*1024*1024;
56our $queue_index = new transferqueue slots => 10;
36 57
37my @newcons; 58my @newcons;
38my @pool; 59my @pool;
39 60
40# one "execution thread" 61# one "execution thread"
41sub handler { 62sub handler {
42 while () { 63 while () {
43 my $new = pop @newcons;
44 if ($new) { 64 if (@newcons) {
45 eval { 65 eval {
46 conn->new(@$new)->handle; 66 conn->new(@{pop @newcons})->handle;
47 }; 67 };
48 slog 1, "$@" if $@ && !ref $@; 68 slog 1, "$@" if $@ && !ref $@;
69
70 $httpevent->broadcast; # only for testing, but doesn't matter much
71
49 $connections->up; 72 $connections->up;
50 } else { 73 } else {
51 last if @pool >= $MAX_POOL; 74 last if @pool >= $MAX_POOL;
52 push @pool, $Coro::current; 75 push @pool, $Coro::current;
53 schedule; 76 schedule;
54 } 77 }
55 } 78 }
79}
80
81sub listen_on {
82 my $listen = $_[0];
83
84 push @listen_sockets, $listen;
85
86 # the "main thread"
87 async {
88 slog 1, "accepting connections";
89 while () {
90 $connections->down;
91 push @newcons, [$listen->accept];
92 #slog 3, "accepted @$connections ".scalar(@pool);
93 if (@pool) {
94 (pop @pool)->ready;
95 } else {
96 async \&handler;
97 }
98
99 }
100 };
56} 101}
57 102
58my $http_port = new Coro::Socket 103my $http_port = new Coro::Socket
59 LocalAddr => $SERVER_HOST, 104 LocalAddr => $SERVER_HOST,
60 LocalPort => $SERVER_PORT, 105 LocalPort => $SERVER_PORT,
61 ReuseAddr => 1, 106 ReuseAddr => 1,
62 Listen => 50, 107 Listen => 50,
63 or die "unable to start server"; 108 or die "unable to start server";
64 109
65push @listen_sockets, $http_port; 110listen_on $http_port;
66 111
67our $NOW; 112if ($SERVER_PORT2) {
68our $HTTP_NOW; 113 my $http_port = new Coro::Socket
114 LocalAddr => $SERVER_HOST,
115 LocalPort => $SERVER_PORT2,
116 ReuseAddr => 1,
117 Listen => 50,
118 or die "unable to start server";
69 119
70Event->timer(interval => 1, hard => 1, cb => sub { 120 listen_on $http_port;
71 $NOW = time; 121}
72 $HTTP_NOW = time2str $NOW;
73});
74
75# the "main thread"
76async {
77 slog 1, "accepting connections";
78 while () {
79 $connections->down;
80 push @newcons, [$http_port->accept];
81 #slog 3, "accepted @$connections ".scalar(@pool);
82 if (@pool) {
83 (pop @pool)->ready;
84 } else {
85 async \&handler;
86 }
87
88 }
89};
90 122
91package conn; 123package conn;
92 124
93use Socket; 125use Socket;
94use HTTP::Date; 126use HTTP::Date;
95use Convert::Scalar 'weaken'; 127use Convert::Scalar 'weaken';
96use Linux::AIO; 128use Linux::AIO;
97 129
98Linux::AIO::min_parallel $::AIO_PARALLEL; 130Linux::AIO::min_parallel $::AIO_PARALLEL;
99
100my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
101 131
102Event->io(fd => Linux::AIO::poll_fileno, 132Event->io(fd => Linux::AIO::poll_fileno,
103 poll => 'r', async => 1, 133 poll => 'r', async => 1,
104 cb => \&Linux::AIO::poll_cb); 134 cb => \&Linux::AIO::poll_cb);
105 135
… …
123 153
124read_mimetypes; 154read_mimetypes;
125 155
126sub new { 156sub new {
127 my $class = shift; 157 my $class = shift;
158 my $fh = shift;
128 my $peername = shift; 159 my $peername = shift;
129 my $fh = shift;
130 my $self = bless { fh => $fh }, $class; 160 my $self = bless { fh => $fh }, $class;
131 my (undef, $iaddr) = unpack_sockaddr_in $peername 161 my (undef, $iaddr) = unpack_sockaddr_in $peername
132 or $self->err(500, "unable to decode peername"); 162 or $self->err(500, "unable to decode peername");
133 163
164 $self->{remote_addr} =
134 $self->{remote_addr} = inet_ntoa $iaddr; 165 $self->{remote_id} = inet_ntoa $iaddr;
166
135 $self->{time} = $::NOW; 167 $self->{time} = $::NOW;
136 168
137 # enter ourselves into various lists 169 weaken ($Coro::current->{conn} = $self);
138 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
139 170
140 $::conns++; 171 $::conns++;
172 $::maxconns = $::conns if $::conns > $::maxconns;
141 173
142 $self; 174 $self;
143} 175}
144 176
145sub DESTROY { 177sub DESTROY {
146 my $self = shift; 178 #my $self = shift;
147
148 $::conns--; 179 $::conns--;
149
150 $self->eoconn;
151 delete $conn{$self->{remote_addr}}{$self*1};
152}
153
154# end of connection
155sub eoconn {
156 my $self = shift;
157 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};
158} 180}
159 181
160sub slog { 182sub slog {
161 my $self = shift; 183 my $self = shift;
162 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 184 main::slog($_[0], "$self->{remote_id}> $_[1]");
163} 185}
164 186
165sub response { 187sub response {
166 my ($self, $code, $msg, $hdr, $content) = @_; 188 my ($self, $code, $msg, $hdr, $content) = @_;
167 my $res = "HTTP/1.1 $code $msg\015\012"; 189 my $res = "HTTP/1.1 $code $msg\015\012";
168 190
169 $self->{h}{connection} ||= $hdr->{Connection}; 191 if (exists $hdr->{Connection}) {
192 if ($hdr->{Connection} =~ /close/) {
193 $self->{h}{connection} = "close"
194 }
195 } else {
196 if ($self->{version} < 1.1) {
197 if ($self->{h}{connection} =~ /keep-alive/i) {
198 $hdr->{Connection} = "Keep-Alive";
199 } else {
200 $self->{h}{connection} = "close"
201 }
202 }
203 }
170 204
171 $res .= "Date: $HTTP_NOW\015\012"; 205 $res .= "Date: $HTTP_NOW\015\012";
172 206
173 while (my ($h, $v) = each %$hdr) { 207 while (my ($h, $v) = each %$hdr) {
174 $res .= "$h: $v\015\012" 208 $res .= "$h: $v\015\012"
175 } 209 }
176 $res .= "\015\012"; 210 $res .= "\015\012";
177 211
178 $res .= $content if defined $content and $self->{method} ne "HEAD"; 212 $res .= $content if defined $content and $self->{method} ne "HEAD";
179 213
180 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
215 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
216 " \"$self->{h}{referer}\"\n";
181 217
182 print $accesslog $log if $accesslog; 218 print $accesslog $log if $accesslog;
183 print STDERR $log; 219 print STDERR $log;
184 220
185 $self->{written} += 221 $self->{written} +=
… …
189sub err { 225sub err {
190 my $self = shift; 226 my $self = shift;
191 my ($code, $msg, $hdr, $content) = @_; 227 my ($code, $msg, $hdr, $content) = @_;
192 228
193 unless (defined $content) { 229 unless (defined $content) {
194 $content = "$code $msg"; 230 $content = "$code $msg\n";
195 $hdr->{"Content-Type"} = "text/plain"; 231 $hdr->{"Content-Type"} = "text/plain";
196 $hdr->{"Content-Length"} = length $content; 232 $hdr->{"Content-Length"} = length $content;
197 } 233 }
198 $hdr->{"Connection"} = "close"; 234 $hdr->{"Connection"} = "close";
199 235
… …
224 } 260 }
225 261
226 $self->{h} = {}; 262 $self->{h} = {};
227 263
228 $fh->timeout($::RES_TIMEOUT); 264 $fh->timeout($::RES_TIMEOUT);
229 my $ip = $self->{remote_addr};
230
231 if ($blocked{$ip}) {
232 $self->err_blocked($blocked{$ip})
233 if $blocked{$ip} > $::NOW;
234
235 delete $blocked{$ip};
236 }
237
238 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
239 my $delay = 120;
240 while (%{$conn{$ip}} > $::MAX_CONN_IP) {
241 if ($delay <= 0) {
242 $self->slog(2, "blocked ip $ip");
243 $self->err_blocked;
244 } else {
245 Coro::Event::do_timer(after => 3);
246 $delay -= 3;
247 }
248 }
249 }
250 265
251 $req =~ /^(?:\015\012)? 266 $req =~ /^(?:\015\012)?
252 (GET|HEAD) \040+ 267 (GET|HEAD) \040+
253 ([^\040]+) \040+ 268 ([^\040]+) \040+
254 HTTP\/([0-9]+\.[0-9]+) 269 HTTP\/([0-9]+\.[0-9]+)
… …
279 294
280 $self->{h}{$h} = substr $v, 1 295 $self->{h}{$h} = substr $v, 1
281 while ($h, $v) = each %hdr; 296 while ($h, $v) = each %hdr;
282 } 297 }
283 298
299 # remote id should be unique per user
300 my $id = $self->{remote_addr};
301
302 if (exists $self->{h}{"client-ip"}) {
303 $id .= "[".$self->{h}{"client-ip"}."]";
304 } elsif (exists $self->{h}{"x-forwarded-for"}) {
305 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
306 }
307
308 $self->{remote_id} = $id;
309
310 weaken (local $conn{$id}{$self*1} = $self);
311
312 if ($blocked{$id}) {
313 $self->err_blocked
314 if $blocked{$id}[0] > $::NOW;
315
316 delete $blocked{$id};
317 }
318
284 # find out server name and port 319 # find out server name and port
285 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 320 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
286 $host = $1; 321 $host = $1;
287 } else { 322 } else {
288 $host = $self->{h}{host}; 323 $host = $self->{h}{host};
… …
290 325
291 if (defined $host) { 326 if (defined $host) {
292 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 327 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
293 } else { 328 } else {
294 ($self->{server_port}, $host) 329 ($self->{server_port}, $host)
295 = unpack_sockaddr_in $self->{fh}->getsockname 330 = unpack_sockaddr_in $self->{fh}->sockname
296 or $self->err(500, "unable to get socket name"); 331 or $self->err(500, "unable to get socket name");
297 $host = inet_ntoa $host; 332 $host = inet_ntoa $host;
298 } 333 }
299 334
300 $self->{server_name} = $host; 335 $self->{server_name} = $host;
301 336
302 # remote id should be unique per user
303 $self->{remote_id} = $self->{remote_addr};
304
305 if (exists $self->{h}{"client-ip"}) {
306 $self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
307 } elsif (exists $self->{h}{"x-forwarded-for"}) {
308 $self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
309 }
310
311 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 337 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
312 338
313 eval { 339 eval {
314 $self->map_uri; 340 $self->map_uri;
315 $self->respond; 341 $self->respond;
316 }; 342 };
317 343
318 $self->eoconn;
319
320 die if $@ && !ref $@; 344 die if $@ && !ref $@;
321 345
322 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 346 last if $self->{h}{connection} =~ /close/i;
347
348 $httpevent->broadcast;
323 349
324 $fh->timeout($::PER_TIMEOUT); 350 $fh->timeout($::PER_TIMEOUT);
325 } 351 }
352}
353
354sub block {
355 my $self = shift;
356
357 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
358 $self->slog(2, "blocked ip $self->{remote_id}");
359 $self->err_blocked;
326} 360}
327 361
328# uri => path mapping 362# uri => path mapping
329sub map_uri { 363sub map_uri {
330 my $self = shift; 364 my $self = shift;
… …
377 411
378sub respond { 412sub respond {
379 my $self = shift; 413 my $self = shift;
380 my $path = $self->{path}; 414 my $path = $self->{path};
381 415
382 stat $path 416 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
383 or $self->err(404, "not found"); 417 if ($::internal{$1}) {
384 418 $::internal{$1}->($self);
385 $self->{stat} = [stat _];
386
387 # idiotic netscape sends idiotic headers AGAIN
388 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
389 ? str2time $1 : 0;
390
391 if (-d _ && -r _) {
392 # directory
393 if ($path !~ /\/$/) {
394 # create a redirect to get the trailing "/"
395 # we don't try to avoid the :80
396 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
397 } else { 419 } else {
398 $ims < $self->{stat}[9] 420 $self->err(404, "not found");
421 }
422 } else {
423
424 stat $path
399 or $self->err(304, "not modified"); 425 or $self->err(404, "not found");
400 426
401 if (-r "$path/index.html") { 427 $self->{stat} = [stat _];
402 $self->{path} .= "/index.html"; 428
403 $self->handle_file; 429 # idiotic netscape sends idiotic headers AGAIN
430 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
431 ? str2time $1 : 0;
432
433 if (-d _ && -r _) {
434 # directory
435 if ($path !~ /\/$/) {
436 # create a redirect to get the trailing "/"
437 # we don't try to avoid the :80
438 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
404 } else { 439 } else {
440 $ims < $self->{stat}[9]
441 or $self->err(304, "not modified");
442
443 if (-r "$path/index.html") {
444 # replace directory "size" by index.html filesize
445 $self->{stat} = [stat ($self->{path} .= "/index.html")];
446 $self->handle_file($queue_index);
447 } else {
405 $self->handle_dir; 448 $self->handle_dir;
406 } 449 }
407 } 450 }
408 } elsif (-f _ && -r _) { 451 } elsif (-f _ && -r _) {
409 -x _ and $self->err(403, "forbidden"); 452 -x _ and $self->err(403, "forbidden");
453
454 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
455 my $timeout = $::NOW + 10;
456 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
457 if ($timeout < $::NOW) {
458 $self->block($::BLOCKTIME, "too many connections");
459 } else {
460 $httpevent->wait;
461 }
462 }
463 }
464
410 $self->handle_file; 465 $self->handle_file($queue_file);
411 } else { 466 } else {
412 $self->err(404, "not found"); 467 $self->err(404, "not found");
468 }
413 } 469 }
414} 470}
415 471
416sub handle_dir { 472sub handle_dir {
417 my $self = shift; 473 my $self = shift;
… …
419 475
420 $self->response(200, "ok", 476 $self->response(200, "ok",
421 { 477 {
422 "Content-Type" => "text/html", 478 "Content-Type" => "text/html",
423 "Content-Length" => length $idx, 479 "Content-Length" => length $idx,
480 "Last-Modified" => time2str ($self->{stat}[9]),
424 }, 481 },
425 $idx); 482 $idx);
426} 483}
427 484
428sub handle_file { 485sub handle_file {
429 my $self = shift; 486 my ($self, $queue) = @_;
430 my $length = -s _; 487 my $length = $self->{stat}[7];
431 my $hdr = { 488 my $hdr = {
432 "Last-Modified" => time2str ((stat _)[9]), 489 "Last-Modified" => time2str ((stat _)[9]),
433 }; 490 };
434 491
435 my @code = (200, "ok"); 492 my @code = (200, "ok");
… …
447 } 504 }
448 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 505 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
449 } 506 }
450 $hdr->{"Content-Range"} = "bytes */$length"; 507 $hdr->{"Content-Range"} = "bytes */$length";
451 $hdr->{"Content-Length"} = $length; 508 $hdr->{"Content-Length"} = $length;
452 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
453 $self->err(416, "not satisfiable", $hdr, ""); 509 $self->err(416, "not satisfiable", $hdr, "");
454 510
455satisfiable: 511satisfiable:
456 # check for segmented downloads 512 # check for segmented downloads
457 if ($l && $::NO_SEGMENTED) { 513 if ($l && $::NO_SEGMENTED) {
458 my $delay = 180; 514 my $timeout = $::NOW + 15;
459 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 515 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
460 if ($delay <= 0) { 516 if ($timeout <= $::NOW) {
517 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
461 $self->err_segmented_download; 518 #$self->err_segmented_download;
462 } else { 519 } else {
463 Coro::Event::do_timer(after => 3); $delay -= 3; 520 $httpevent->wait;
464 } 521 }
465 } 522 }
466 } 523 }
467 524
468 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 525 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
481 $self->response(@code, $hdr, ""); 538 $self->response(@code, $hdr, "");
482 539
483 if ($self->{method} eq "GET") { 540 if ($self->{method} eq "GET") {
484 $self->{time} = $::NOW; 541 $self->{time} = $::NOW;
485 542
486 my $transfer = $::transfers->guard; 543 my $current = $Coro::current;
487 $self->{fh}->writable or return;
488
489 push @::wait_time, $::NOW - $self->{time};
490 shift @::wait_time if @wait_time > 25;
491 $self->{time} = $::NOW;
492 544
493 my ($fh, $buf, $r); 545 my ($fh, $buf, $r);
494 my $current = $Coro::current; 546
495 open $fh, "<", $self->{path} 547 open $fh, "<", $self->{path}
496 or die "$self->{path}: late open failure ($!)"; 548 or die "$self->{path}: late open failure ($!)";
497 549
498 $h -= $l - 1; 550 $h -= $l - 1;
499 551
500 if (0) { 552 if (0) { # !AIO
501 if ($l) { 553 if ($l) {
502 sysseek $fh, $l, 0; 554 sysseek $fh, $l, 0;
503 } 555 }
504 } 556 }
557
558 my $transfer = $queue->start_transfer($h);
559 my $locked;
560 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
505 561
506 while ($h > 0) { 562 while ($h > 0) {
563 unless ($locked) {
564 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
565 $bufsize = $::BUFSIZE;
566 $self->{time} = $::NOW;
567 }
568 }
569
570 if ($blocked{$self->{remote_id}}) {
571 $self->{h}{connection} = "close";
572 die bless {}, err::;
573 }
574
507 if (0) { 575 if (0) { # !AIO
508 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 576 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
509 or last; 577 or last;
510 } else { 578 } else {
511 undef $buf; 579 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
512 $aio_requests->down;
513 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
514 $buf, 0, sub { 580 $buf, 0, sub {
515 $r = $_[0]; 581 $r = $_[0];
516 $current->ready; 582 Coro::ready($current);
517 }); 583 });
518 &Coro::schedule; 584 &Coro::schedule;
519 $aio_requests->up;
520 last unless $r; 585 last unless $r;
521 } 586 }
522 my $w = $self->{fh}->syswrite($buf) 587 my $w = syswrite $self->{fh}, $buf
523 or last; 588 or last;
524 $::written += $w; 589 $::written += $w;
525 $self->{written} += $w; 590 $self->{written} += $w;
526 $l += $r; 591 $l += $r;
527 } 592 }

Diff Legend

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