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

Diff Legend

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