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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.42 by root, Wed Sep 12 16:45:59 2001 UTC vs.
Revision 1.95 by root, Wed Apr 24 23:49:34 2013 UTC

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

Diff Legend

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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents): Revision 1.42 by root, Wed Sep 12 16:45:59 2001 UTC vs. Revision 1.95 by root, Wed Apr 24 23:49:34 2013 UTC

Diff Legend

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.42 by root, Wed Sep 12 16:45:59 2001 UTC vs.
Revision 1.95 by root, Wed Apr 24 23:49:34 2013 UTC