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

Diff Legend

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