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

Diff Legend

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