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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.3 by root, Fri Aug 10 02:28:28 2001 UTC vs.
Revision 1.29 by root, Sat Aug 25 15:14:03 2001 UTC

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

Diff Legend

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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents): Revision 1.3 by root, Fri Aug 10 02:28:28 2001 UTC vs. Revision 1.29 by root, Sat Aug 25 15:14:03 2001 UTC

Diff Legend

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.3 by root, Fri Aug 10 02:28:28 2001 UTC vs.
Revision 1.29 by root, Sat Aug 25 15:14:03 2001 UTC