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

Diff Legend

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