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

Diff Legend

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