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.17 by root, Wed Aug 15 03:06:21 2001 UTC vs.
Revision 1.41 by root, Mon Sep 10 22:16:20 2001 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::Event; 3use Coro::Event;
4use Coro::Socket; 4use Coro::Socket;
5 5
6use HTTP::Date;
7
6no utf8; 8no utf8;
7use bytes; 9use bytes;
8 10
9# at least on my machine, this thingy serves files 11# at least on my machine, this thingy serves files
10# quite a bit faster than apache, ;) 12# quite a bit faster than apache, ;)
11# and quite a bit slower than thttpd :( 13# and quite a bit slower than thttpd :(
12 14
13$SIG{PIPE} = 'IGNORE'; 15$SIG{PIPE} = 'IGNORE';
14 16
17our $accesslog;
18
19if ($ACCESS_LOG) {
20 use IO::Handle;
21 open $accesslog, ">>$ACCESS_LOG"
22 or die "$ACCESS_LOG: $!";
23 $accesslog->autoflush(1);
24}
25
15sub slog { 26sub slog {
16 my $level = shift; 27 my $level = shift;
17 my $format = shift; 28 my $format = shift;
18 printf "---: $format\n", @_; 29 printf "---: $format\n", @_;
19} 30}
20 31
21my $connections = new Coro::Semaphore $MAX_CONNECTS; 32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
33
34our $wait_factor = 0.95;
35
36our @transfers = (
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
39);
22 40
23my @newcons; 41my @newcons;
24my @pool; 42my @pool;
25 43
26# one "execution thread" 44# one "execution thread"
27sub handler { 45sub handler {
28 while () { 46 while () {
29 my $new = pop @newcons;
30 if ($new) { 47 if (@newcons) {
31 eval { 48 eval {
32 conn->new(@$new)->handle; 49 conn->new(@{pop @newcons})->handle;
33 }; 50 };
34 slog 1, "$@" if $@ && !ref $@; 51 slog 1, "$@" if $@ && !ref $@;
35 $connections->up; 52 $connections->up;
36 } else { 53 } else {
37 last if @pool >= $MAX_POOL; 54 last if @pool >= $MAX_POOL;
… …
39 schedule; 56 schedule;
40 } 57 }
41 } 58 }
42} 59}
43 60
61sub listen_on {
62 my $listen = $_[0];
63
64 push @listen_sockets, $listen;
65
66 # the "main thread"
67 async {
68 slog 1, "accepting connections";
69 while () {
70 $connections->down;
71 push @newcons, [$listen->accept];
72 #slog 3, "accepted @$connections ".scalar(@pool);
73 if (@pool) {
74 (pop @pool)->ready;
75 } else {
76 async \&handler;
77 }
78
79 }
80 };
81}
82
44my $http_port = new Coro::Socket 83my $http_port = new Coro::Socket
45 LocalAddr => $SERVER_HOST, 84 LocalAddr => $SERVER_HOST,
46 LocalPort => $SERVER_PORT, 85 LocalPort => $SERVER_PORT,
47 ReuseAddr => 1, 86 ReuseAddr => 1,
48 Listen => 50, 87 Listen => 50,
49 or die "unable to start server"; 88 or die "unable to start server";
50 89
51push @listen_sockets, $http_port; 90listen_on $http_port;
52 91
53# the "main thread" 92if ($SERVER_PORT2) {
54async { 93 my $http_port = new Coro::Socket
55 slog 1, "accepting connections"; 94 LocalAddr => $SERVER_HOST,
56 while () { 95 LocalPort => $SERVER_PORT2,
57 $connections->down; 96 ReuseAddr => 1,
58 push @newcons, [$http_port->accept]; 97 Listen => 50,
59 #slog 3, "accepted @$connections ".scalar(@pool); 98 or die "unable to start server";
99
100 listen_on $http_port;
101}
102
103our $NOW;
104our $HTTP_NOW;
105
106Event->timer(interval => 1, hard => 1, cb => sub {
60 $::NOW = time; 107 $NOW = time;
61 if (@pool) { 108 $HTTP_NOW = time2str $NOW;
62 (pop @pool)->ready; 109})->now;
63 } else {
64 async \&handler;
65 }
66
67 }
68};
69 110
70package conn; 111package conn;
71 112
72use Socket; 113use Socket;
73use HTTP::Date; 114use HTTP::Date;
… …
76 117
77Linux::AIO::min_parallel $::AIO_PARALLEL; 118Linux::AIO::min_parallel $::AIO_PARALLEL;
78 119
79Event->io(fd => Linux::AIO::poll_fileno, 120Event->io(fd => Linux::AIO::poll_fileno,
80 poll => 'r', async => 1, 121 poll => 'r', async => 1,
81 cb => \&Linux::AIO::poll_cb ); 122 cb => \&Linux::AIO::poll_cb);
82 123
83Event->add_hooks(prepare => sub {
84 &Coro::cede;
85});
86
87our %conn; # $conn{ip}{fh} => connobj 124our %conn; # $conn{ip}{self} => connobj
125our %uri; # $uri{ip}{uri}{self}
88our %blocked; 126our %blocked;
89our %mimetype; 127our %mimetype;
90 128
91sub read_mimetypes { 129sub read_mimetypes {
92 local *M; 130 local *M;
… …
112 or $self->err(500, "unable to decode peername"); 150 or $self->err(500, "unable to decode peername");
113 151
114 $self->{remote_addr} = inet_ntoa $iaddr; 152 $self->{remote_addr} = inet_ntoa $iaddr;
115 $self->{time} = $::NOW; 153 $self->{time} = $::NOW;
116 154
117 # enter ourselves into various lists
118 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
119
120 $::conns++; 155 $::conns++;
121 156
122 $self; 157 $self;
123} 158}
124 159
125sub DESTROY { 160sub DESTROY {
126 my $self = shift; 161 my $self = shift;
127
128 $::conns--; 162 $::conns--;
163 $self->eoconn;
164}
129 165
166# end of connection
167sub eoconn {
168 my $self = shift;
169
170 # clean up hints
130 delete $conn{$self->{remote_addr}}{$self*1}; 171 delete $conn{$self->{remote_id}}{$self*1};
131 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 172 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
132} 173}
133 174
134sub slog { 175sub slog {
135 my $self = shift; 176 my $self = shift;
136 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 177 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
137} 178}
138 179
139sub response { 180sub response {
140 my ($self, $code, $msg, $hdr, $content) = @_; 181 my ($self, $code, $msg, $hdr, $content) = @_;
141 my $res = "HTTP/1.1 $code $msg\015\012"; 182 my $res = "HTTP/1.1 $code $msg\015\012";
142 183
143 #$res .= "Connection: close\015\012"; 184 $self->{h}{connection} ||= $hdr->{Connection};
144 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 185
186 $res .= "Date: $HTTP_NOW\015\012";
145 187
146 while (my ($h, $v) = each %$hdr) { 188 while (my ($h, $v) = each %$hdr) {
147 $res .= "$h: $v\015\012" 189 $res .= "$h: $v\015\012"
148 } 190 }
149 $res .= "\015\012"; 191 $res .= "\015\012";
150 192
151 $res .= $content if defined $content and $self->{method} ne "HEAD"; 193 $res .= $content if defined $content and $self->{method} ne "HEAD";
152 194
153 print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d# 195 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
196
197 print $accesslog $log if $accesslog;
198 print STDERR $log;
154 199
155 $self->{written} += 200 $self->{written} +=
156 print {$self->{fh}} $res; 201 print {$self->{fh}} $res;
157} 202}
158 203
159sub err { 204sub err {
160 my $self = shift; 205 my $self = shift;
161 my ($code, $msg, $hdr, $content) = @_; 206 my ($code, $msg, $hdr, $content) = @_;
162 207
163 unless (defined $content) { 208 unless (defined $content) {
164 $content = "$code $msg"; 209 $content = "$code $msg\n";
165 $hdr->{"Content-Type"} = "text/plain"; 210 $hdr->{"Content-Type"} = "text/plain";
166 $hdr->{"Content-Length"} = length $content; 211 $hdr->{"Content-Length"} = length $content;
167 } 212 }
168 $hdr->{"Connection"} = "close"; 213 $hdr->{"Connection"} = "close";
169 214
170 $self->response($code, $msg, $hdr, $content); 215 $self->response($code, $msg, $hdr, $content);
171 216
172 die bless {}, err::; 217 die bless {}, err::;
173} 218}
174 219
175sub err_blocked {
176 my $self = shift;
177 my $ip = $self->{remote_addr};
178 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
179
180 Coro::Event::do_timer(after => 15);
181
182 $self->err(401, "too many connections",
183 {
184 "Content-Type" => "text/html",
185 "Retry-After" => $::BLOCKTIME
186 },
187 <<EOF);
188<html><p>
189You have been blocked because you opened too many connections. You
190may retry at</p>
191
192 <p><blockquote>$time.</blockquote></p>
193
194<p>Until then, each new access will renew the block. You might want to have a
195look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>
196</html>
197EOF
198}
199
200sub handle { 220sub handle {
201 my $self = shift; 221 my $self = shift;
202 my $fh = $self->{fh}; 222 my $fh = $self->{fh};
223
224 my $host;
203 225
204 $fh->timeout($::REQ_TIMEOUT); 226 $fh->timeout($::REQ_TIMEOUT);
205 while() { 227 while() {
206 $self->{reqs}++; 228 $self->{reqs}++;
207 229
… …
217 } 239 }
218 240
219 $self->{h} = {}; 241 $self->{h} = {};
220 242
221 $fh->timeout($::RES_TIMEOUT); 243 $fh->timeout($::RES_TIMEOUT);
222 my $ip = $self->{remote_addr};
223
224 if ($blocked{$ip}) {
225 $self->err_blocked($blocked{$ip})
226 if $blocked{$ip} > $::NOW;
227
228 delete $blocked{$ip};
229 }
230
231 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
232 $self->slog(2, "blocked ip $ip");
233 $self->err_blocked;
234 }
235 244
236 $req =~ /^(?:\015\012)? 245 $req =~ /^(?:\015\012)?
237 (GET|HEAD) \040+ 246 (GET|HEAD) \040+
238 ([^\040]+) \040+ 247 ([^\040]+) \040+
239 HTTP\/([0-9]+\.[0-9]+) 248 HTTP\/([0-9]+\.[0-9]+)
… …
242 251
243 $self->{method} = $1; 252 $self->{method} = $1;
244 $self->{uri} = $2; 253 $self->{uri} = $2;
245 $self->{version} = $3; 254 $self->{version} = $3;
246 255
247 $3 eq "1.0" or $3 eq "1.1" 256 $3 =~ /^1\./
248 or $self->err(506, "http protocol version $3 not supported"); 257 or $self->err(506, "http protocol version $3 not supported");
249 258
250 # parse headers 259 # parse headers
251 { 260 {
252 my (%hdr, $h, $v); 261 my (%hdr, $h, $v);
… …
264 273
265 $self->{h}{$h} = substr $v, 1 274 $self->{h}{$h} = substr $v, 1
266 while ($h, $v) = each %hdr; 275 while ($h, $v) = each %hdr;
267 } 276 }
268 277
278 # remote id should be unique per user
279 my $id = $self->{remote_addr};
280
281 if (exists $self->{h}{"client-ip"}) {
282 $id .= "[".$self->{h}{"client-ip"}."]";
283 } elsif (exists $self->{h}{"x-forwarded-for"}) {
284 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
285 }
286
287 $self->{remote_id} = $id;
288
289 if ($blocked{$id}) {
290 $self->err_blocked($blocked{$id})
291 if $blocked{$id} > $::NOW;
292
293 delete $blocked{$id};
294 }
295
296 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
297 my $delay = $::PER_TIMEOUT + 15;
298 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
299 if ($delay <= 0) {
300 $self->slog(2, "blocked ip $id");
301 $self->err_blocked;
302 } else {
303 Coro::Event::do_timer(after => 4); $delay -= 4;
304 }
305 }
306 }
307
308 # find out server name and port
309 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
310 $host = $1;
311 } else {
312 $host = $self->{h}{host};
313 }
314
315 if (defined $host) {
269 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 316 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
317 } else {
318 ($self->{server_port}, $host)
319 = unpack_sockaddr_in $self->{fh}->getsockname
320 or $self->err(500, "unable to get socket name");
321 $host = inet_ntoa $host;
322 }
270 323
324 $self->{server_name} = $host;
325
326 # enter ourselves into various lists
327 weaken ($conn{$id}{$self*1} = $self);
271 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 328 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
272 329
330 eval {
273 $self->map_uri; 331 $self->map_uri;
274 $self->respond; 332 $self->respond;
333 };
275 334
335 $self->eoconn;
336
337 die if $@ && !ref $@;
338
276 last if $self->{h}{connection} =~ /close/ || $self->{version} lt "1.1"; 339 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1;
277 340
278 $self->slog(9, "persistant connection [".$self->{h}{"user-agent"}."][$self->{reqs}]");
279 $fh->timeout($::PER_TIMEOUT); 341 $fh->timeout($::PER_TIMEOUT);
280 } 342 }
281} 343}
282 344
283# uri => path mapping 345# uri => path mapping
284sub map_uri { 346sub map_uri {
285 my $self = shift; 347 my $self = shift;
286 my $host = $self->{h}{host} || "default"; 348 my $host = $self->{server_name};
287 my $uri = $self->{uri}; 349 my $uri = $self->{uri};
288 350
289 # some massaging, also makes it more secure 351 # some massaging, also makes it more secure
290 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 352 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
291 $uri =~ s%//+%/%g; 353 $uri =~ s%//+%/%g;
… …
301 $self->{path} = "$::DOCROOT/$host$uri"; 363 $self->{path} = "$::DOCROOT/$host$uri";
302 364
303 $self->access_check; 365 $self->access_check;
304} 366}
305 367
306sub server_address {
307 my $self = shift;
308 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
309 or $self->err(500, "unable to get socket name");
310 ((inet_ntoa $iaddr), $port);
311}
312
313sub server_host {
314 my $self = shift;
315 if (exists $self->{h}{host}) {
316 return $self->{h}{host};
317 } else {
318 return (($self->server_address)[0]);
319 }
320}
321
322sub server_hostport {
323 my $self = shift;
324 my ($host, $port);
325 if (exists $self->{h}{host}) {
326 ($host, $port) = ($self->{h}{host}, $self->{server_port});
327 } else {
328 ($host, $port) = $self->server_address;
329 }
330 $port = $port == 80 ? "" : ":$port";
331 $host.$port;
332}
333
334sub _cgi { 368sub _cgi {
335 my $self = shift; 369 my $self = shift;
336 my $path = shift; 370 my $path = shift;
337 my $fh; 371 my $fh;
338 372
339 # no two-way xxx supported 373 # no two-way xxx supported
340 if (0 == fork) { 374 if (0 == fork) {
341 open STDOUT, ">&".fileno($self->{fh}); 375 open STDOUT, ">&".fileno($self->{fh});
342 if (chdir $::DOCROOT) { 376 if (chdir $::DOCROOT) {
343 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 377 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
344 $ENV{HTTP_HOST} = $self->server_host; 378 $ENV{HTTP_HOST} = $self->{server_name};
345 $ENV{HTTP_PORT} = $self->{server_host}; 379 $ENV{HTTP_PORT} = $self->{server_port};
346 $ENV{SCRIPT_NAME} = $self->{name}; 380 $ENV{SCRIPT_NAME} = $self->{name};
347 exec $path; 381 exec $path;
348 } 382 }
349 Coro::State::_exit(0); 383 Coro::State::_exit(0);
350 } else { 384 } else {
385 die;
351 } 386 }
387}
388
389sub server_hostport {
390 $_[0]{server_port} == 80
391 ? $_[0]{server_name}
392 : "$_[0]{server_name}:$_[0]{server_port}";
352} 393}
353 394
354sub respond { 395sub respond {
355 my $self = shift; 396 my $self = shift;
356 my $path = $self->{path}; 397 my $path = $self->{path};
… …
366 407
367 if (-d _ && -r _) { 408 if (-d _ && -r _) {
368 # directory 409 # directory
369 if ($path !~ /\/$/) { 410 if ($path !~ /\/$/) {
370 # create a redirect to get the trailing "/" 411 # create a redirect to get the trailing "/"
371 my $host = $self->server_hostport; 412 # we don't try to avoid the :80
372 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" }); 413 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
373 } else { 414 } else {
374 $ims < $self->{stat}[9] 415 $ims < $self->{stat}[9]
375 or $self->err(304, "not modified"); 416 or $self->err(304, "not modified");
376 417
377 if ($self->{method} eq "GET") {
378 if (-r "$path/index.html") { 418 if (-r "$path/index.html") {
379 $self->{path} .= "/index.html"; 419 $self->{path} .= "/index.html";
380 $self->handle_file; 420 $self->handle_file;
381 } else { 421 } else {
382 $self->handle_dir; 422 $self->handle_dir;
383 }
384 } 423 }
385 } 424 }
386 } elsif (-f _ && -r _) { 425 } elsif (-f _ && -r _) {
387 -x _ and $self->err(403, "forbidden"); 426 -x _ and $self->err(403, "forbidden");
388 $self->handle_file; 427 $self->handle_file;
… …
403 $idx); 442 $idx);
404} 443}
405 444
406sub handle_file { 445sub handle_file {
407 my $self = shift; 446 my $self = shift;
408 my $length = -s _; 447 my $length = $self->{stat}[7];
448 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
409 my $hdr = { 449 my $hdr = {
410 "Last-Modified" => time2str ((stat _)[9]), 450 "Last-Modified" => time2str ((stat _)[9]),
411 }; 451 };
412 452
413 my @code = (200, "ok"); 453 my @code = (200, "ok");
… …
421 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 461 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
422 } else { 462 } else {
423 ($l, $h) = (0, $length - 1); 463 ($l, $h) = (0, $length - 1);
424 goto ignore; 464 goto ignore;
425 } 465 }
426 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 466 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
427 } 467 }
428 $hdr->{"Content-Range"} = "bytes */$length"; 468 $hdr->{"Content-Range"} = "bytes */$length";
469 $hdr->{"Content-Length"} = $length;
429 $self->err(416, "not satisfiable", $hdr); 470 $self->err(416, "not satisfiable", $hdr, "");
430 471
431satisfiable: 472satisfiable:
432 # check for segmented downloads 473 # check for segmented downloads
433 if ($l && $::NO_SEGMENTED) { 474 if ($l && $::NO_SEGMENTED) {
475 my $delay = $::PER_TIMEOUT + 15;
434 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 476 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
477 if ($delay <= 0) {
478 $self->err_segmented_download;
479 } else {
435 Coro::Event::do_timer(after => 15); 480 Coro::Event::do_timer(after => 4); $delay -= 4;
436 481 }
437 $self->err(400, "segmented downloads are not allowed");
438 } 482 }
439 } 483 }
440 484
441 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 485 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
442 @code = (206, "partial content"); 486 @code = (206, "partial content");
… …
452 $hdr->{"Content-Length"} = $length; 496 $hdr->{"Content-Length"} = $length;
453 497
454 $self->response(@code, $hdr, ""); 498 $self->response(@code, $hdr, "");
455 499
456 if ($self->{method} eq "GET") { 500 if ($self->{method} eq "GET") {
501 $self->{time} = $::NOW;
502
503 my $fudge = $queue->[0]->waiters;
504 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
505
506 $queue->[1] *= $fudge;
507 my $transfer = $queue->[0]->guard;
508
509 if ($fudge != 1) {
510 $queue->[1] /= $fudge;
511 $queue->[1] = $queue->[1] * $::wait_factor
512 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
513 }
514 $self->{time} = $::NOW;
515
516 $self->{fh}->writable or return;
517
457 my ($fh, $buf, $r); 518 my ($fh, $buf, $r);
458 my $current = $Coro::current; 519 my $current = $Coro::current;
459 open $fh, "<", $self->{path} 520 open $fh, "<", $self->{path}
460 or die "$self->{path}: late open failure ($!)"; 521 or die "$self->{path}: late open failure ($!)";
461 522
462 $h -= $l - 1; 523 $h -= $l - 1;
463 524
525 if (0) {
526 if ($l) {
527 sysseek $fh, $l, 0;
528 }
529 }
530
464 while ($h > 0) { 531 while ($h > 0) {
532 if (0) {
533 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
534 or last;
535 } else {
465 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 536 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
466 $buf, 0, sub { 537 $buf, 0, sub {
467 $r = $_[0]; 538 $r = $_[0];
468 $current->ready; 539 Coro::ready($current);
469 }); 540 });
470 &Coro::schedule; 541 &Coro::schedule;
471 last unless $r; 542 last unless $r;
472 my $w = $self->{fh}->syswrite($buf) 543 }
544 my $w = syswrite $self->{fh}, $buf
473 or last; 545 or last;
474 $::written += $w; 546 $::written += $w;
475 $self->{written} += $w; 547 $self->{written} += $w;
476 $l += $r; 548 $l += $r;
477 } 549 }
478 }
479 550
480 close $fh; 551 close $fh;
552 }
481} 553}
482 554
4831; 5551;

Diff Legend

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