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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.36 by root, Sun Sep 2 00:54:00 2001 UTC vs.
Revision 1.93 by root, Sun Mar 21 00:21:14 2010 UTC

…		…
1	use Coro;	1	use Coro;
2	use Coro::Semaphore;	2	use Coro::Semaphore;
		3	use Coro::SemaphoreSet;
3	use Coro::Event;	4	use Coro::EV;
4	use Coro::Socket;	5	use Coro::Socket;
		6	use Coro::Signal;
		7	use Coro::AIO ();
5		8
		9	use Fcntl;
6	use HTTP::Date;	10	use HTTP::Date;
		11	use POSIX ();
7		12
8	no utf8;	13	use Compress::Zlib ();
9	use bytes;	14
		15	use common::sense;
10		16
11	# at least on my machine, this thingy serves files	17	# at least on my machine, this thingy serves files
12	# quite a bit faster than apache, ;)	18	# quite a bit faster than apache, ;)
13	# and quite a bit slower than thttpd :(	19	# and quite a bit slower than thttpd :(
14		20
15	$SIG{PIPE} = 'IGNORE';	21	$SIG{PIPE} = 'IGNORE';
16		22
17	our $accesslog;	23	our $accesslog;
		24	our $errorlog;
		25	our @listen_sockets;
		26
		27	our $NOW;
		28	our $HTTP_NOW;
		29
		30	our $ERROR_LOG;
		31	our $ACCESS_LOG;
		32	our $TRANSFER_LOCK = new Coro::SemaphoreSet; # lock to be acquired per ip
		33
		34	our $update_time = EV::periodic 0, 1, undef, sub {
		35	$NOW = time;
		36	$HTTP_NOW = time2str $NOW;
		37	};
		38	$update_time->invoke;
		39
		40	if ($ERROR_LOG) {
		41	use IO::Handle;
		42	open $errorlog, ">>$ERROR_LOG"
		43	or die "$ERROR_LOG: $!";
		44	$errorlog->autoflush(1);
		45	}
18		46
19	if ($ACCESS_LOG) {	47	if ($ACCESS_LOG) {
20	use IO::Handle;	48	use IO::Handle;
21	open $accesslog, ">>$ACCESS_LOG"	49	open $accesslog, ">>$ACCESS_LOG"
22	or die "$ACCESS_LOG: $!";	50	or die "$ACCESS_LOG: $!";
24	}	52	}
25		53
26	sub slog {	54	sub slog {
27	my $level = shift;	55	my $level = shift;
28	my $format = shift;	56	my $format = shift;
		57
		58	$format = sprintf $format, @_ if @_;
		59
		60	my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
29	printf "---: $format\n", @_;	61	print "$NOW: $format\n";
		62	print $errorlog "$NOW: $format\n", @_ if $errorlog;
30	}	63	}
31		64
32	our $connections = new Coro::Semaphore $MAX_CONNECTS \|\| 250;	65	our $connections = new Coro::Semaphore $::MAX_CONNECTS \|\| 250;
		66	our $httpevent = new Coro::Signal;
33		67
34	our $wait_factor = 0.95;	68	our $queue_file = new transferqueue $::MAX_TRANSFERS;
		69	our $queue_index = new transferqueue 10;
35		70
36	our @transfers = (	71	our $tbf_top = new tbf rate => $::TBF_RATE \|\| 100000;
37	[(new Coro::Semaphore $MAX_TRANSFERS_SMALL \|\| 50), 1],
38	[(new Coro::Semaphore $MAX_TRANSFERS_LARGE \|\| 50), 1],
39	);
40		72
41	my @newcons;	73	my $unused_bytes = 0;
42	my @pool;	74	my $unused_last = time;
43		75
44	# one "execution thread"	76	sub unused_bandwidth {
45	sub handler {	77	$unused_bytes += $_[0];
		78	if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
		79	$unused_last = $NOW;
		80	$unused_bytes = 0;
		81	$queue_file->force_wake_next
		82	and slog 1, "forced filetransfer due to unused bandwidth";
		83	}
		84	}
		85
		86	sub listen_on {
		87	my $listen = $_[0];
		88
		89	push @listen_sockets, $listen;
		90
		91	# the "main thread"
		92	async {
		93	slog 1, "accepting connections";
46	while () {	94	while () {
47	my $new = pop @newcons;	95	$connections->down;
48	if ($new) {	96	my @conn = $listen->accept;
		97	#slog 3, "accepted @$connections ".scalar(@pool);
		98
		99	async_pool {
49	eval {	100	eval {
50	conn->new(@$new)->handle;	101	conn->new (@conn)->handle;
51	};	102	};
52	slog 1, "$@" if $@ && !ref $@;	103	slog 1, "$@" if $@ && !ref $@;
		104
		105	$httpevent->broadcast; # only for testing, but doesn't matter much
		106
53	$connections->up;	107	$connections->up;
54	} else {
55	last if @pool >= $MAX_POOL;
56	push @pool, $Coro::current;
57	schedule;
58	}	108	}
		109	}
59	}	110	};
60	}	111	}
61		112
62	my $http_port = new Coro::Socket	113	my $http_port = new Coro::Socket
63	LocalAddr => $SERVER_HOST,	114	LocalAddr => $::SERVER_HOST,
64	LocalPort => $SERVER_PORT,	115	LocalPort => $::SERVER_PORT,
65	ReuseAddr => 1,	116	ReuseAddr => 1,
66	Listen => 50,	117	Listen => 50,
67	or die "unable to start server";	118	or die "unable to start server";
68		119
69	push @listen_sockets, $http_port;	120	listen_on $http_port;
70		121
71	our $NOW;	122	if ($::SERVER_PORT2) {
72	our $HTTP_NOW;	123	my $http_port = new Coro::Socket
		124	LocalAddr => $::SERVER_HOST,
		125	LocalPort => $::SERVER_PORT2,
		126	ReuseAddr => 1,
		127	Listen => 50,
		128	or die "unable to start server";
73		129
74	Event->timer(interval => 1, hard => 1, cb => sub {	130	listen_on $http_port;
75	$NOW = time;	131	}
76	$HTTP_NOW = time2str $NOW;
77	})->now;
78
79	# the "main thread"
80	async {
81	slog 1, "accepting connections";
82	while () {
83	$connections->down;
84	push @newcons, [$http_port->accept];
85	#slog 3, "accepted @$connections ".scalar(@pool);
86	if (@pool) {
87	(pop @pool)->ready;
88	} else {
89	async \&handler;
90	}
91
92	}
93	};
94		132
95	package conn;	133	package conn;
		134
		135	use common::sense;
96		136
97	use Socket;	137	use Socket;
98	use HTTP::Date;	138	use HTTP::Date;
99	use Convert::Scalar 'weaken';	139	use Convert::Scalar 'weaken';
100	use Linux::AIO;	140	use IO::AIO;
101		141
102	Linux::AIO::min_parallel $::AIO_PARALLEL;	142	IO::AIO::min_parallel $::AIO_PARALLEL;
103		143
104	my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;	144	our $AIO_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb;
105
106	Event->io(fd => Linux::AIO::poll_fileno,
107	poll => 'r', async => 1,
108	cb => \&Linux::AIO::poll_cb);
109		145
110	our %conn; # $conn{ip}{self} => connobj	146	our %conn; # $conn{ip}{self} => connobj
111	our %uri; # $uri{ip}{uri}{self}	147	our %uri; # $uri{ip}{uri}{self}
112	our %blocked;	148	our %blocked;
113	our %mimetype;	149	our %mimetype;
114		150
115	sub read_mimetypes {	151	sub read_mimetypes {
116	local *M;
117	if (open M, "<mime_types") {	152	if (open my $fh, "<mime_types") {
118	while (<M>) {	153	while (<$fh>) {
119	if (/^([^#]\S+)\t+(\S+)$/) {	154	if (/^([^#]\S+)\t+(\S+)$/) {
120	$mimetype{lc $1} = $2;	155	$mimetype{lc $1} = $2;
121	}	156	}
122	}	157	}
123	} else {	158	} else {
…		…
127		162
128	read_mimetypes;	163	read_mimetypes;
129		164
130	sub new {	165	sub new {
131	my $class = shift;	166	my $class = shift;
		167	my $fh = shift;
132	my $peername = shift;	168	my $peername = shift;
133	my $fh = shift;
134	my $self = bless { fh => $fh }, $class;	169	my $self = bless { fh => $fh }, $class;
135	my (undef, $iaddr) = unpack_sockaddr_in $peername	170	my (undef, $iaddr) = unpack_sockaddr_in $peername
136	or $self->err(500, "unable to decode peername");	171	or $self->err (500, "unable to decode peername");
137		172
		173	$self->{remote_addr} =
138	$self->{remote_addr} = inet_ntoa $iaddr;	174	$self->{remote_id} = inet_ntoa $iaddr;
		175
139	$self->{time} = $::NOW;	176	$self->{time} = $::NOW;
140		177
		178	weaken ($Coro::current->{conn} = $self);
		179
141	$::conns++;	180	++$::conns;
		181	$::maxconns = $::conns if $::conns > $::maxconns;
142		182
143	$self;	183	$self
144	}	184	}
145		185
146	sub DESTROY {	186	sub DESTROY {
147	my $self = shift;	187	my $self = shift;
148		188
149	$::conns--;	189	--$::conns;
150
151	$self->eoconn;
152	}	190	}
153		191
154	# end of connection	192	sub prune_cache {
155	sub eoconn {	193	my $hash = $_[0];
156	my $self = shift;
157		194
158	# clean up hints	195	for (keys %$hash) {
159	delete $conn{$self->{remote_id}}{$self*1};	196	if (ref $hash->{$_} eq HASH::) {
160	delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};	197	prune_cache($hash->{$_});
		198	unless (scalar keys %{$hash->{$_}}) {
		199	delete $hash->{$_};
		200	}
		201	}
		202	}
161	}	203	}
		204
		205	sub prune_caches {
		206	prune_cache \%conn;
		207	prune_cache \%uri;
		208
		209	for (keys %blocked) {
		210	delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
		211	}
		212	}
		213
		214	our $PRUNE_WATCHER = EV::timer 60, 60, \&prune_caches;
162		215
163	sub slog {	216	sub slog {
164	my $self = shift;	217	my $self = shift;
165	main::slog($_[0], ($self->{remote_id} \|\| $self->{remote_addr}) ."> $_[1]");	218	main::slog($_[0], "$self->{remote_id}> $_[1]");
166	}	219	}
167		220
168	sub response {	221	sub response {
169	my ($self, $code, $msg, $hdr, $content) = @_;	222	my ($self, $code, $msg, $hdr, $content) = @_;
170	my $res = "HTTP/1.1 $code $msg\015\012";	223	my $res = "HTTP/1.1 $code $msg\015\012";
		224	my $GZ = "";
171		225
172	$self->{h}{connection} \|\|= $hdr->{Connection};	226	if (exists $hdr->{Connection}) {
		227	if ($hdr->{Connection} =~ /close/) {
		228	$self->{h}{connection} = "close"
		229	}
		230	} else {
		231	if ($self->{version} < 1.1) {
		232	if ($self->{h}{connection} =~ /keep-alive/i) {
		233	$hdr->{Connection} = "Keep-Alive";
		234	} else {
		235	$self->{h}{connection} = "close"
		236	}
		237	}
		238	}
		239
		240	if ($self->{method} ne "HEAD"
		241	&& $self->{h}{"accept-encoding"} =~ /\bgzip\b/
		242	&& 400 < length $content
		243	&& $hdr->{"Content-Length"} == length $content
		244	&& !exists $hdr->{"Content-Encoding"}
		245	) {
		246	my $orig = length $content;
		247	$hdr->{"Content-Encoding"} = "gzip";
		248	$content = Compress::Zlib::memGzip(\$content);
		249	$hdr->{"Content-Length"} = length $content;
		250	$GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
		251	}
173		252
174	$res .= "Date: $HTTP_NOW\015\012";	253	$res .= "Date: $HTTP_NOW\015\012";
		254	$res .= "Server: $::NAME\015\012";
175		255
176	while (my ($h, $v) = each %$hdr) {	256	while (my ($h, $v) = each %$hdr) {
177	$res .= "$h: $v\015\012"	257	$res .= "$h: $v\015\012"
178	}	258	}
179	$res .= "\015\012";	259	$res .= "\015\012";
180		260
181	$res .= $content if defined $content and $self->{method} ne "HEAD";	261	$res .= $content if defined $content and $self->{method} ne "HEAD";
182		262
183	my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";	263	my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
		264	" $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
		265	" \"$self->{h}{referer}\"\n";
184		266
185	print $accesslog $log if $accesslog;	267	print $::accesslog $log if $::accesslog;
186	print STDERR $log;	268	print STDERR $log;
187		269
188	$self->{written} +=	270	$tbf_top->request(length $res, 1e6);
189	print {$self->{fh}} $res;	271	$self->{written} += print {$self->{fh}} $res;
190	}	272	}
191		273
192	sub err {	274	sub err {
193	my $self = shift;	275	my $self = shift;
194	my ($code, $msg, $hdr, $content) = @_;	276	my ($code, $msg, $hdr, $content) = @_;
…		…
198	$hdr->{"Content-Type"} = "text/plain";	280	$hdr->{"Content-Type"} = "text/plain";
199	$hdr->{"Content-Length"} = length $content;	281	$hdr->{"Content-Length"} = length $content;
200	}	282	}
201	$hdr->{"Connection"} = "close";	283	$hdr->{"Connection"} = "close";
202		284
203	$self->response($code, $msg, $hdr, $content);	285	$self->response ($code, $msg, $hdr, $content);
204		286
205	die bless {}, err::;	287	die bless {}, err::
206	}	288	}
207		289
208	sub handle {	290	sub handle {
209	my $self = shift;	291	my $self = shift;
210	my $fh = $self->{fh};	292	my $fh = $self->{fh};
211		293
212	my $host;	294	my $host;
213		295
214	$fh->timeout($::REQ_TIMEOUT);	296	$fh->timeout($::REQ_TIMEOUT);
215	while() {	297	while () {
216	$self->{reqs}++;	298	$self->{reqs}++;
217		299
218	# read request and parse first line	300	# read request and parse first line
219	my $req = $fh->readline("\015\012\015\012");	301	my $req = $fh->readline("\015\012\015\012");
220		302
…		…
249	my (%hdr, $h, $v);	331	my (%hdr, $h, $v);
250		332
251	$hdr{lc $1} .= ",$2"	333	$hdr{lc $1} .= ",$2"
252	while $req =~ /\G	334	while $req =~ /\G
253	([^:\000-\040]+):	335	([^:\000-\040]+):
254	[\008\040]*	336	[\011\040]*
255	((?: [^\015\012]+ \| \015\012[\008\040] )*)	337	((?: [^\015\012]+ \| \015\012[\011\040] )*)
256	\015\012	338	\015\012
257	/gxc;	339	/gxc;
258		340
259	$req =~ /\G\015\012$/	341	$req =~ /\G\015\012$/
260	or $self->err(400, "bad request");	342	or $self->err(400, "bad request");
…		…
272	$id .= "[".$self->{h}{"x-forwarded-for"}."]";	354	$id .= "[".$self->{h}{"x-forwarded-for"}."]";
273	}	355	}
274		356
275	$self->{remote_id} = $id;	357	$self->{remote_id} = $id;
276		358
		359	weaken (local $conn{$id}{$self*1} = $self);
		360
277	if ($blocked{$id}) {	361	if ($blocked{$id}) {
278	$self->err_blocked($blocked{$id})	362	$self->err_blocked
279	if $blocked{$id} > $::NOW;	363	if $blocked{$id}[0] > $::NOW;
280		364
281	delete $blocked{$id};	365	delete $blocked{$id};
282	}
283
284	if (%{$conn{$id}} >= $::MAX_CONN_IP) {
285	my $delay = $::PER_TIMEOUT + 15;
286	while (%{$conn{$id}} >= $::MAX_CONN_IP) {
287	if ($delay <= 0) {
288	$self->slog(2, "blocked ip $id");
289	$self->err_blocked;
290	} else {
291	Coro::Event::do_timer(after => 4); $delay -= 4;
292	}
293	}
294	}	366	}
295		367
296	# find out server name and port	368	# find out server name and port
297	if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {	369	if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
298	$host = $1;	370	$host = $1;
…		…
302		374
303	if (defined $host) {	375	if (defined $host) {
304	$self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;	376	$self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
305	} else {	377	} else {
306	($self->{server_port}, $host)	378	($self->{server_port}, $host)
307	= unpack_sockaddr_in $self->{fh}->getsockname	379	= unpack_sockaddr_in $self->{fh}->sockname
308	or $self->err(500, "unable to get socket name");	380	or $self->err(500, "unable to get socket name");
309	$host = inet_ntoa $host;	381	$host = inet_ntoa $host;
310	}	382	}
311		383
312	$self->{server_name} = $host;	384	$self->{server_name} = $host;
313		385
314	# enter ourselves into various lists
315	weaken ($conn{$id}{$self*1} = $self);
316	weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);	386	weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
317		387
318	eval {	388	eval {
319	$self->map_uri;	389	$self->map_uri;
320	$self->respond;	390	$self->respond;
321	};	391	};
322		392
323	$self->eoconn;
324
325	die if $@ && !ref $@;	393	die if $@ && !ref $@;
326		394
327	last if $self->{h}{connection} =~ /close/ \|\| $self->{version} < 1.1;	395	last if $self->{h}{connection} =~ /close/i;
		396
		397	$httpevent->broadcast;
328		398
329	$fh->timeout($::PER_TIMEOUT);	399	$fh->timeout($::PER_TIMEOUT);
330	}	400	}
		401	}
		402
		403	sub block {
		404	my $self = shift;
		405
		406	$blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
		407	$self->slog(2, "blocked ip $self->{remote_id}");
		408	$self->err_blocked;
331	}	409	}
332		410
333	# uri => path mapping	411	# uri => path mapping
334	sub map_uri {	412	sub map_uri {
335	my $self = shift;	413	my $self = shift;
336	my $host = $self->{server_name};	414	my $host = $self->{server_name};
337	my $uri = $self->{uri};	415	my $uri = $self->{uri};
		416
		417	$host =~ /[\/\\]/
		418	and $self->err(400, "bad request");
338		419
339	# some massaging, also makes it more secure	420	# some massaging, also makes it more secure
340	$uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;	421	$uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
341	$uri =~ s%//+%/%g;	422	$uri =~ s%//+%/%g;
342	$uri =~ s%/\.(?=/\|$)%%g;	423	$uri =~ s%/\.(?=/\|$)%%g;
…		…
382		463
383	sub respond {	464	sub respond {
384	my $self = shift;	465	my $self = shift;
385	my $path = $self->{path};	466	my $path = $self->{path};
386		467
387	stat $path	468	if ($self->{name} =~ s%^/internal/([^/]+)%%) {
388	or $self->err(404, "not found");	469	if ($::internal{$1}) {
389		470	$::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	# we don't try to avoid the :80
401	$self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
402	} else {	471	} else {
403	$ims < $self->{stat}[9]
404	or $self->err(304, "not modified");	472	$self->err (404, "not found");
		473	}
		474	} else {
405		475
406	if (-r "$path/index.html") {	476	Coro::AIO::aio_stat $path
407	$self->{path} .= "/index.html";	477	and $self->err (404, "not found");
408	$self->handle_file;	478
		479	$self->{stat} = [stat _];
		480
		481	# idiotic netscape sends idiotic headers AGAIN
		482	my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
		483	? str2time $1 : 0;
		484
		485	if (-d _ && -r _) {
		486	# directory
		487	if ($path !~ /\/$/) {
		488	# create a redirect to get the trailing "/"
		489	# we don't try to avoid the :80
		490	$self->err (301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
409	} else {	491	} else {
		492	$ims < $self->{stat}[9]
		493	or $self->err (304, "not modified");
		494
		495	if (-r "$path/index.html") {
		496	# replace directory "size" by index.html filesize
		497	$self->{stat} = [stat ($self->{path} .= "/index.html")];
		498	$self->handle_file ($queue_index, $tbf_top);
		499	} else {
410	$self->handle_dir;	500	$self->handle_dir;
411	}	501	}
412	}	502	}
413	} elsif (-f _ && -r _) {	503	} elsif (-f _ && -r _) {
414	-x _ and $self->err(403, "forbidden");	504	-x _ and $self->err (403, "forbidden");
415	$self->handle_file;	505
		506	if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
		507	my $timeout = $::NOW + 10;
		508	while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
		509	if ($timeout < $::NOW) {
		510	$self->block($::BLOCKTIME, "too many connections");
		511	} else {
		512	$httpevent->wait;
		513	}
		514	}
		515	}
		516
		517	$self->handle_file ($queue_file, $tbf_top);
416	} else {	518	} else {
417	$self->err(404, "not found");	519	$self->err (404, "not found");
		520	}
418	}	521	}
419	}	522	}
420		523
421	sub handle_dir {	524	sub handle_dir {
422	my $self = shift;	525	my $self = shift;
423	my $idx = $self->diridx;	526	my $idx = $self->diridx;
424		527
425	$self->response(200, "ok",	528	$self->response (200, "ok",
426	{	529	{
427	"Content-Type" => "text/html",	530	"Content-Type" => "text/html; charset=utf-8",
428	"Content-Length" => length $idx,	531	"Content-Length" => length $idx,
		532	"Last-Modified" => time2str ($self->{stat}[9]),
429	},	533	},
430	$idx);	534	$idx);
431	}	535	}
432		536
433	sub handle_file {	537	sub handle_file {
434	my $self = shift;	538	my ($self, $queue, $tbf) = @_;
435	my $length = $self->{stat}[7];	539	my $length = $self->{stat}[7];
436	my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
437	my $hdr = {	540	my $hdr = {
438	"Last-Modified" => time2str ((stat _)[9]),	541	"Last-Modified" => time2str ((stat _)[9]),
		542	"Accept-Ranges" => "bytes",
439	};	543	};
440		544
441	my @code = (200, "ok");	545	my @code = (200, "ok");
442	my ($l, $h);	546	my ($l, $h);
443		547
444	if ($self->{h}{range} =~ /^bytes=(.*)$/) {	548	if ($self->{h}{range} =~ /^bytes=(.*)$/i) {
445	for (split /,/, $1) {	549	for (split /,/, $1) {
446	if (/^-(\d+)$/) {	550	if (/^-(\d+)$/) {
447	($l, $h) = ($length - $1, $length - 1);	551	($l, $h) = ($length - $1, $length - 1);
448	} elsif (/^(\d+)-(\d*)$/) {	552	} elsif (/^(\d+)-(\d*)$/) {
449	($l, $h) = ($1, ($2 ne "" \|\| $2 >= $length) ? $2 : $length - 1);	553	($l, $h) = ($1, ($2 ne "" \|\| $2 >= $length) ? $2 : $length - 1);
…		…
453	}	557	}
454	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;	558	goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
455	}	559	}
456	$hdr->{"Content-Range"} = "bytes */$length";	560	$hdr->{"Content-Range"} = "bytes */$length";
457	$hdr->{"Content-Length"} = $length;	561	$hdr->{"Content-Length"} = $length;
458	$self->err(416, "not satisfiable", $hdr, "");	562	$self->err (416, "not satisfiable", $hdr, "");
459		563
460	satisfiable:	564	satisfiable:
461	# check for segmented downloads	565	# check for segmented downloads
462	if ($l && $::NO_SEGMENTED) {	566	if ($l && $::NO_SEGMENTED) {
463	my $delay = $::PER_TIMEOUT + 15;	567	my $timeout = $::NOW + 15;
464	while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {	568	while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
465	if ($delay <= 0) {	569	if ($timeout <= $::NOW) {
		570	$self->block ($::BLOCKTIME, "segmented downloads are forbidden");
466	$self->err_segmented_download;	571	#$self->err_segmented_download;
467	} else {	572	} else {
468	Coro::Event::do_timer(after => 4); $delay -= 4;	573	$httpevent->wait;
469	}	574	}
470	}	575	}
471	}	576	}
472		577
473	$hdr->{"Content-Range"} = "bytes $l-$h/$length";	578	$hdr->{"Content-Range"} = "bytes $l-$h/$length";
…		…
481		586
482	$self->{path} =~ /\.([^.]+)$/;	587	$self->{path} =~ /\.([^.]+)$/;
483	$hdr->{"Content-Type"} = $mimetype{lc $1} \|\| "application/octet-stream";	588	$hdr->{"Content-Type"} = $mimetype{lc $1} \|\| "application/octet-stream";
484	$hdr->{"Content-Length"} = $length;	589	$hdr->{"Content-Length"} = $length;
485		590
486	$self->response(@code, $hdr, "");	591	$self->response (@code, $hdr, "");
487		592
488	if ($self->{method} eq "GET") {	593	if ($self->{method} eq "GET") {
489	$self->{time} = $::NOW;	594	$self->{time} = $::NOW;
490
491	my $fudge = $queue->[0]->waiters;
492	$fudge = $fudge ? ($fudge+1)/$fudge : 1;
493
494	$queue->[1] *= $fudge;
495	my $transfer = $queue->[0]->guard;
496
497	if ($fudge != 1) {
498	$queue->[1] /= $fudge;
499	$queue->[1] = $queue->[1] * $::wait_factor
500	+ ($::NOW - $self->{time}) * (1 - $::wait_factor);
501	}
502	$self->{time} = $::NOW;	595	$self->{written} = 0;
503		596
504	$self->{fh}->writable or return;	597	my $fh = Coro::AIO::aio_open $self->{path}, Fcntl::O_RDONLY, 0
505
506	my ($fh, $buf, $r);
507	my $current = $Coro::current;
508	open $fh, "<", $self->{path}
509	or die "$self->{path}: late open failure ($!)";	598	or die "$self->{path}: late open failure ($!)";
510		599
511	$h -= $l - 1;	600	$h -= $l - 1;
512		601
513	if (0) {	602	my $transfer = $queue->start_transfer ($h);
514	if ($l) {	603	my $locked;
515	sysseek $fh, $l, 0;	604	my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
516	}
517	}
518		605
519	while ($h > 0) {	606	while ($h > 0) {
520	if (0) {	607	Coro::cede;
521	sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h	608	my $transfer_lock = $TRANSFER_LOCK->guard ($self->{remote_id});
		609
		610	unless ($locked) {
		611	if ($locked \|\|= $transfer->try ($::WAIT_INTERVAL)) {
		612	$bufsize = $::BUFSIZE;
		613	$self->{time} = $::NOW;
		614	$self->{written} = 0;
		615	}
		616	}
		617
		618	if ($blocked{$self->{remote_id}}) {
		619	$self->{h}{connection} = "close";
		620	die bless {}, err::;
		621	}
		622
		623	Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), my $buf, 0
522	or last;	624	or last;
523	} else {	625
524	undef $buf;	626	$tbf->request (length $buf);
525	$aio_requests->down;
526	aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
527	$buf, 0, sub {
528	$r = $_[0];
529	$current->ready;
530	});
531	&Coro::schedule;
532	$aio_requests->up;
533	last unless $r;
534	}
535	my $w = $self->{fh}->syswrite($buf)	627	my $w = $self->{fh}->syswrite ($buf)
536	or last;	628	or last;
537	$::written += $w;	629	$::written += $w;
538	$self->{written} += $w;	630	$self->{written} += $w;
539	$l += $r;	631	$l += $w;
540	}	632	}
541		633
542	close $fh;	634	close $fh;
543	}	635	}
544	}	636	}
545		637
546	1;	638	1
		639

Diff Legend

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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents): Revision 1.36 by root, Sun Sep 2 00:54:00 2001 UTC vs. Revision 1.93 by root, Sun Mar 21 00:21:14 2010 UTC

Diff Legend

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.36 by root, Sun Sep 2 00:54:00 2001 UTC vs.
Revision 1.93 by root, Sun Mar 21 00:21:14 2010 UTC