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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines