[ViewVC] Diff of: cvs/cvsroot/Coro/myhttpd/httpd.pl

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.29 by root, Sat Aug 25 15:14:03 2001 UTC vs.
Revision 1.61 by root, Thu Jan 3 01:20:17 2002 UTC

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

Diff Legend

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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents): Revision 1.29 by root, Sat Aug 25 15:14:03 2001 UTC vs. Revision 1.61 by root, Thu Jan 3 01:20:17 2002 UTC

Diff Legend

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.29 by root, Sat Aug 25 15:14:03 2001 UTC vs.
Revision 1.61 by root, Thu Jan 3 01:20:17 2002 UTC