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

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

Diff Legend

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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents): Revision 1.37 by root, Sun Sep 2 01:03:53 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.37 by root, Sun Sep 2 01:03:53 2001 UTC vs.
Revision 1.95 by root, Wed Apr 24 23:49:34 2013 UTC