[ViewVC] Diff of: cvs/AnyEvent-HTTP/HTTP.pm

Comparing AnyEvent-HTTP/HTTP.pm (file contents):
Revision 1.62 by root, Thu Dec 30 04:30:24 2010 UTC vs.
Revision 1.71 by root, Fri Dec 31 20:50:58 2010 UTC

…		…
47	use AnyEvent::Util ();	47	use AnyEvent::Util ();
48	use AnyEvent::Handle ();	48	use AnyEvent::Handle ();
49		49
50	use base Exporter::;	50	use base Exporter::;
51		51
52	our $VERSION = '1.46';	52	our $VERSION = '1.5';
53		53
54	our @EXPORT = qw(http_get http_post http_head http_request);	54	our @EXPORT = qw(http_get http_post http_head http_request);
55		55
56	our $USERAGENT = "Mozilla/5.0 (compatible; U; AnyEvent-HTTP/$VERSION; +http://software.schmorp.de/pkg/AnyEvent)";	56	our $USERAGENT = "Mozilla/5.0 (compatible; U; AnyEvent-HTTP/$VERSION; +http://software.schmorp.de/pkg/AnyEvent)";
57	our $MAX_RECURSE = 10;	57	our $MAX_RECURSE = 10;
…		…
94	C<http_request> returns a "cancellation guard" - you have to keep the	94	C<http_request> returns a "cancellation guard" - you have to keep the
95	object at least alive until the callback get called. If the object gets	95	object at least alive until the callback get called. If the object gets
96	destroyed before the callback is called, the request will be cancelled.	96	destroyed before the callback is called, the request will be cancelled.
97		97
98	The callback will be called with the response body data as first argument	98	The callback will be called with the response body data as first argument
99	(or C<undef> if an error occured), and a hash-ref with response headers as	99	(or C<undef> if an error occured), and a hash-ref with response headers
100	second argument.	100	(and trailers) as second argument.
101		101
102	All the headers in that hash are lowercased. In addition to the response	102	All the headers in that hash are lowercased. In addition to the response
103	headers, the "pseudo-headers" (uppercase to avoid clashing with possible	103	headers, the "pseudo-headers" (uppercase to avoid clashing with possible
104	response headers) C<HTTPVersion>, C<Status> and C<Reason> contain the	104	response headers) C<HTTPVersion>, C<Status> and C<Reason> contain the
105	three parts of the HTTP Status-Line of the same name.	105	three parts of the HTTP Status-Line of the same name. If an error occurs
		106	during the body phase of a request, then the original C<Status> and
		107	C<Reason> values from the header are available as C<OrigStatus> and
		108	C<OrigReason>.
106		109
107	The pseudo-header C<URL> contains the actual URL (which can differ from	110	The pseudo-header C<URL> contains the actual URL (which can differ from
108	the requested URL when following redirects - for example, you might get	111	the requested URL when following redirects - for example, you might get
109	an error that your URL scheme is not supported even though your URL is a	112	an error that your URL scheme is not supported even though your URL is a
110	valid http URL because it redirected to an ftp URL, in which case you can	113	valid http URL because it redirected to an ftp URL, in which case you can
…		…
147	Whether to recurse requests or not, e.g. on redirects, authentication	150	Whether to recurse requests or not, e.g. on redirects, authentication
148	retries and so on, and how often to do so.	151	retries and so on, and how often to do so.
149		152
150	=item headers => hashref	153	=item headers => hashref
151		154
152	The request headers to use, with the header name (I<MUST be in lowercase>)	155	The request headers to use. Currently, C<http_request> may provide its own
153	as key and header value as hash value.	156	C<Host:>, C<Content-Length:>, C<Connection:> and C<Cookie:> headers and
154		157	will provide defaults at least for C<TE:>, C<Referer:> and C<User-Agent:>
155	Currently, http_request> may provide its own C<host>, C<content-length>,	158	(this can be suppressed by using C<undef> for these headers in which case
156	C<connection> and C<cookie> headers and will provide defaults for	159	they won't be sent at all).
157	C<user-agent> and C<referer> (this can be suppressed by using a value of
158	C<undef> for these headers in which case they won't be sent at all).
159		160
160	=item timeout => $seconds	161	=item timeout => $seconds
161		162
162	The time-out to use for various stages - each connect attempt will reset	163	The time-out to use for various stages - each connect attempt will reset
163	the timeout, as will read or write activity, i.e. this is not an overall	164	the timeout, as will read or write activity, i.e. this is not an overall
…		…
173	C<$scheme> must be either missing, C<http> for HTTP or C<https> for	174	C<$scheme> must be either missing, C<http> for HTTP or C<https> for
174	HTTPS.	175	HTTPS.
175		176
176	=item body => $string	177	=item body => $string
177		178
178	The request body, usually empty. Will be-sent as-is (future versions of	179	The request body, usually empty. Will be sent as-is (future versions of
179	this module might offer more options).	180	this module might offer more options).
180		181
181	=item cookie_jar => $hash_ref	182	=item cookie_jar => $hash_ref
182		183
183	Passing this parameter enables (simplified) cookie-processing, loosely	184	Passing this parameter enables (simplified) cookie-processing, loosely
184	based on the original netscape specification.	185	based on the original netscape specification.
185		186
186	The C<$hash_ref> must be an (initially empty) hash reference which will	187	The C<$hash_ref> must be an (initially empty) hash reference which will
187	get updated automatically. It is possible to save the cookie_jar to	188	get updated automatically. It is possible to save the cookie jar to
188	persistent storage with something like JSON or Storable, but this is not	189	persistent storage with something like JSON or Storable, but this is not
189	recommended, as expiry times are currently being ignored.	190	recommended, as session-only cookies might survive longer than expected.
190		191
191	Note that this cookie implementation is not of very high quality, nor	192	Note that this cookie implementation is not meant to be complete. If
192	meant to be complete. If you want complete cookie management you have to	193	you want complete cookie management you have to do that on your
193	do that on your own. C<cookie_jar> is meant as a quick fix to get some	194	own. C<cookie_jar> is meant as a quick fix to get some cookie-using sites
194	cookie-using sites working. Cookies are a privacy disaster, do not use	195	working. Cookies are a privacy disaster, do not use them unless required
195	them unless required to.	196	to.
		197
		198	When cookie processing is enabled, the C<Cookie:> and C<Set-Cookie:>
		199	headers will be set and handled by this module, otherwise they will be
		200	left untouched.
196		201
197	=item tls_ctx => $scheme \| $tls_ctx	202	=item tls_ctx => $scheme \| $tls_ctx
198		203
199	Specifies the AnyEvent::TLS context to be used for https connections. This	204	Specifies the AnyEvent::TLS context to be used for https connections. This
200	parameter follows the same rules as the C<tls_ctx> parameter to	205	parameter follows the same rules as the C<tls_ctx> parameter to
…		…
239		244
240	This callback is useful, among other things, to quickly reject unwanted	245	This callback is useful, among other things, to quickly reject unwanted
241	content, which, if it is supposed to be rare, can be faster than first	246	content, which, if it is supposed to be rare, can be faster than first
242	doing a C<HEAD> request.	247	doing a C<HEAD> request.
243		248
		249	The downside is that cancelling the request makes it impossible to re-use
		250	the connection. Also, the C<on_header> callback will not receive any
		251	trailer (headers sent after the response body).
		252
244	Example: cancel the request unless the content-type is "text/html".	253	Example: cancel the request unless the content-type is "text/html".
245		254
246	on_header => sub {	255	on_header => sub {
247	$_[0]{"content-type"} =~ /^text\/html\s*(?:;\|$)/	256	$_[0]{"content-type"} =~ /^text\/html\s*(?:;\|$)/
248	},	257	},
…		…
254	string instead of the body data.	263	string instead of the body data.
255		264
256	It has to return either true (in which case AnyEvent::HTTP will continue),	265	It has to return either true (in which case AnyEvent::HTTP will continue),
257	or false, in which case AnyEvent::HTTP will cancel the download (and call	266	or false, in which case AnyEvent::HTTP will cancel the download (and call
258	the completion callback with an error code of C<598>).	267	the completion callback with an error code of C<598>).
		268
		269	The downside to cancelling the request is that it makes it impossible to
		270	re-use the connection.
259		271
260	This callback is useful when the data is too large to be held in memory	272	This callback is useful when the data is too large to be held in memory
261	(so the callback writes it to a file) or when only some information should	273	(so the callback writes it to a file) or when only some information should
262	be extracted, or when the body should be processed incrementally.	274	be extracted, or when the body should be processed incrementally.
263		275
…		…
289	If you think you need this, first have a look at C<on_body>, to see if	301	If you think you need this, first have a look at C<on_body>, to see if
290	that doesn't solve your problem in a better way.	302	that doesn't solve your problem in a better way.
291		303
292	=back	304	=back
293		305
294	Example: make a simple HTTP GET request for http://www.nethype.de/	306	Example: do a simple HTTP GET request for http://www.nethype.de/ and print
		307	the response body.
295		308
296	http_request GET => "http://www.nethype.de/", sub {	309	http_request GET => "http://www.nethype.de/", sub {
297	my ($body, $hdr) = @_;	310	my ($body, $hdr) = @_;
298	print "$body\n";	311	print "$body\n";
299	};	312	};
300		313
301	Example: make a HTTP HEAD request on https://www.google.com/, use a	314	Example: do a HTTP HEAD request on https://www.google.com/, use a
302	timeout of 30 seconds.	315	timeout of 30 seconds.
303		316
304	http_request	317	http_request
305	GET => "https://www.google.com",	318	GET => "https://www.google.com",
306	timeout => 30,	319	timeout => 30,
…		…
309	use Data::Dumper;	322	use Data::Dumper;
310	print Dumper $hdr;	323	print Dumper $hdr;
311	}	324	}
312	;	325	;
313		326
314	Example: make another simple HTTP GET request, but immediately try to	327	Example: do another simple HTTP GET request, but immediately try to
315	cancel it.	328	cancel it.
316		329
317	my $request = http_request GET => "http://www.nethype.de/", sub {	330	my $request = http_request GET => "http://www.nethype.de/", sub {
318	my ($body, $hdr) = @_;	331	my ($body, $hdr) = @_;
319	print "$body\n";	332	print "$body\n";
…		…
351	push @{ $CO_SLOT{$_[0]}[1] }, $_[1];	364	push @{ $CO_SLOT{$_[0]}[1] }, $_[1];
352		365
353	_slot_schedule $_[0];	366	_slot_schedule $_[0];
354	}	367	}
355		368
		369	sub cookie_jar_extract($$$$) {
		370	my ($jar, $uscheme, $uhost, $upath) = @_;
		371
		372	%$jar = () if $jar->{version} != 1;
		373
		374	my @cookies;
		375
		376	while (my ($chost, $paths) = each %$jar) {
		377	next unless ref $paths;
		378
		379	if ($chost =~ /^\./) {
		380	next unless $chost eq substr $uhost, -length $chost;
		381	} elsif ($chost =~ /\./) {
		382	next unless $chost eq $uhost;
		383	} else {
		384	next;
		385	}
		386
		387	while (my ($cpath, $cookies) = each %$paths) {
		388	next unless $cpath eq substr $upath, 0, length $cpath;
		389
		390	while (my ($cookie, $kv) = each %$cookies) {
		391	next if $uscheme ne "https" && exists $kv->{secure};
		392
		393	if (exists $kv->{expires}) {
		394	if (AE::now > parse_date ($kv->{expires})) {
		395	delete $cookies->{$cookie};
		396	next;
		397	}
		398	}
		399
		400	my $value = $kv->{value};
		401
		402	if ($value =~ /[=;,[:space:]]/) {
		403	$value =~ s/([\\"])/\\$1/g;
		404	$value = "\"$value\"";
		405	}
		406
		407	push @cookies, "$cookie=$value";
		408	}
		409	}
		410	}
		411
		412	\@cookies
		413	}
		414
		415	# continue to parse $_ for headers and place them into the arg
		416	sub parse_hdr() {
		417	my %hdr;
		418
		419	# things seen, not parsed:
		420	# p3pP="NON CUR OTPi OUR NOR UNI"
		421
		422	$hdr{lc $1} .= ",$2"
		423	while /\G
		424	([^:\000-\037]*):
		425	[\011\040]*
		426	((?: [^\012]+ \| \012[\011\040] )*)
		427	\012
		428	/gxc;
		429
		430	/\G$/
		431	or return;
		432
		433	# remove the "," prefix we added to all headers above
		434	substr $_, 0, 1, ""
		435	for values %hdr;
		436
		437	\%hdr
		438	}
		439
356	our $qr_nlnl = qr{(?<![^\012])\015?\012};	440	our $qr_nlnl = qr{(?<![^\012])\015?\012};
357		441
358	our $TLS_CTX_LOW = { cache => 1, sslv2 => 1 };	442	our $TLS_CTX_LOW = { cache => 1, sslv2 => 1 };
359	our $TLS_CTX_HIGH = { cache => 1, verify => 1, verify_peername => "https" };	443	our $TLS_CTX_HIGH = { cache => 1, verify => 1, verify_peername => "https" };
360		444
…		…
379	my @pseudo = (URL => $url);	463	my @pseudo = (URL => $url);
380	push @pseudo, Redirect => delete $arg{Redirect} if exists $arg{Redirect};	464	push @pseudo, Redirect => delete $arg{Redirect} if exists $arg{Redirect};
381		465
382	my $recurse = exists $arg{recurse} ? delete $arg{recurse} : $MAX_RECURSE;	466	my $recurse = exists $arg{recurse} ? delete $arg{recurse} : $MAX_RECURSE;
383		467
384	return $cb->(undef, { Status => 599, Reason => "Too many redirections", @pseudo })	468	return $cb->(undef, { @pseudo, Status => 599, Reason => "Too many redirections" })
385	if $recurse < 0;	469	if $recurse < 0;
386		470
387	my $proxy = $arg{proxy} \|\| $PROXY;	471	my $proxy = $arg{proxy} \|\| $PROXY;
388	my $timeout = $arg{timeout} \|\| $TIMEOUT;	472	my $timeout = $arg{timeout} \|\| $TIMEOUT;
389		473
…		…
392		476
393	$uscheme = lc $uscheme;	477	$uscheme = lc $uscheme;
394		478
395	my $uport = $uscheme eq "http" ? 80	479	my $uport = $uscheme eq "http" ? 80
396	: $uscheme eq "https" ? 443	480	: $uscheme eq "https" ? 443
397	: return $cb->(undef, { Status => 599, Reason => "Only http and https URL schemes supported", @pseudo });	481	: return $cb->(undef, { @pseudo, Status => 599, Reason => "Only http and https URL schemes supported" });
398		482
399	$uauthority =~ /^(?: .*\@ )? ([^\@:]+) (?: : (\d+) )?$/x	483	$uauthority =~ /^(?: .*\@ )? ([^\@:]+) (?: : (\d+) )?$/x
400	or return $cb->(undef, { Status => 599, Reason => "Unparsable URL", @pseudo });	484	or return $cb->(undef, { @pseudo, Status => 599, Reason => "Unparsable URL" });
401		485
402	my $uhost = $1;	486	my $uhost = $1;
403	$uport = $2 if defined $2;	487	$uport = $2 if defined $2;
404		488
405	$hdr{host} = defined $2 ? "$uhost:$2" : "$uhost"	489	$hdr{host} = defined $2 ? "$uhost:$2" : "$uhost"
…		…
410		494
411	$upath =~ s%^/?%/%;	495	$upath =~ s%^/?%/%;
412		496
413	# cookie processing	497	# cookie processing
414	if (my $jar = $arg{cookie_jar}) {	498	if (my $jar = $arg{cookie_jar}) {
415	%$jar = () if $jar->{version} != 1;	499	my $cookies = cookie_jar_extract $jar, $uscheme, $uhost, $upath;
416		500
417	my @cookie;
418
419	while (my ($chost, $v) = each %$jar) {
420	if ($chost =~ /^\./) {
421	next unless $chost eq substr $uhost, -length $chost;
422	} elsif ($chost =~ /\./) {
423	next unless $chost eq $uhost;
424	} else {
425	next;
426	}
427
428	while (my ($cpath, $v) = each %$v) {
429	next unless $cpath eq substr $upath, 0, length $cpath;
430
431	while (my ($k, $v) = each %$v) {
432	next if $uscheme ne "https" && exists $v->{secure};
433	my $value = $v->{value};
434	$value =~ s/([\\"])/\\$1/g;
435	push @cookie, "$k=\"$value\"";
436	}
437	}
438	}
439
440	$hdr{cookie} = join "; ", @cookie	501	$hdr{cookie} = join "; ", @$cookies
441	if @cookie;	502	if @$cookies;
442	}	503	}
443		504
444	my ($rhost, $rport, $rscheme, $rpath); # request host, port, path	505	my ($rhost, $rport, $rscheme, $rpath); # request host, port, path
445		506
446	if ($proxy) {	507	if ($proxy) {
…		…
454	} else {	515	} else {
455	($rhost, $rport, $rscheme, $rpath) = ($uhost, $uport, $uscheme, $upath);	516	($rhost, $rport, $rscheme, $rpath) = ($uhost, $uport, $uscheme, $upath);
456	}	517	}
457		518
458	# leave out fragment and query string, just a heuristic	519	# leave out fragment and query string, just a heuristic
459	$hdr{referer} \|\|= "$uscheme://$uauthority$upath" unless exists $hdr{referer};	520	$hdr{referer} = "$uscheme://$uauthority$upath" unless exists $hdr{referer};
460	$hdr{"user-agent"} \|\|= $USERAGENT unless exists $hdr{"user-agent"};	521	$hdr{"user-agent"} = $USERAGENT unless exists $hdr{"user-agent"};
461		522
462	$hdr{"content-length"} = length $arg{body}	523	$hdr{"content-length"} = length $arg{body}
463	if length $arg{body} \|\| $method ne "GET";	524	if length $arg{body} \|\| $method ne "GET";
464		525
		526	$hdr{connection} = "close TE"; #1.1
		527	$hdr{te} = "trailers" unless exists $hdr{te}; #1.1
		528
465	my %state = (connect_guard => 1);	529	my %state = (connect_guard => 1);
466		530
467	_get_slot $uhost, sub {	531	_get_slot $uhost, sub {
468	$state{slot_guard} = shift;	532	$state{slot_guard} = shift;
469		533
470	return unless $state{connect_guard};	534	return unless $state{connect_guard};
471		535
472	my $tcp_connect = $arg{tcp_connect}	536	my $connect_cb = sub {
473	\|\| do { require AnyEvent::Socket; \&AnyEvent::Socket::tcp_connect };
474
475	$state{connect_guard} = $tcp_connect->(
476	$rhost,
477	$rport,
478	sub {
479	$state{fh} = shift	537	$state{fh} = shift
480	or do {	538	or do {
481	my $err = "$!";	539	my $err = "$!";
482	%state = ();	540	%state = ();
483	return $cb->(undef, { Status => 599, Reason => $err, @pseudo });	541	return $cb->(undef, { @pseudo, Status => 599, Reason => $err });
484	};	542	};
485		543
486	pop; # free memory, save a tree	544	pop; # free memory, save a tree
487		545
488	return unless delete $state{connect_guard};	546	return unless delete $state{connect_guard};
489		547
490	# get handle	548	# get handle
491	$state{handle} = new AnyEvent::Handle	549	$state{handle} = new AnyEvent::Handle
492	fh => $state{fh},	550	fh => $state{fh},
493	peername => $rhost,	551	peername => $rhost,
494	tls_ctx => $arg{tls_ctx},	552	tls_ctx => $arg{tls_ctx},
495	# these need to be reconfigured on keepalive handles	553	# these need to be reconfigured on keepalive handles
496	timeout => $timeout,	554	timeout => $timeout,
497	on_error => sub {	555	on_error => sub {
498	%state = ();	556	%state = ();
499	$cb->(undef, { Status => 599, Reason => $_[2], @pseudo });	557	$cb->(undef, { @pseudo, Status => 599, Reason => $_[2] });
500	},	558	},
501	on_eof => sub {	559	on_eof => sub {
502	%state = ();	560	%state = ();
503	$cb->(undef, { Status => 599, Reason => "Unexpected end-of-file", @pseudo });	561	$cb->(undef, { @pseudo, Status => 599, Reason => "Unexpected end-of-file" });
504	},	562	},
505	;	563	;
506		564
507	# limit the number of persistent connections	565	# limit the number of persistent connections
508	# keepalive not yet supported	566	# keepalive not yet supported
509	# if ($KA_COUNT{$_[1]} < $MAX_PERSISTENT_PER_HOST) {	567	# if ($KA_COUNT{$_[1]} < $MAX_PERSISTENT_PER_HOST) {
510	# ++$KA_COUNT{$_[1]};	568	# ++$KA_COUNT{$_[1]};
511	# $state{handle}{ka_count_guard} = AnyEvent::Util::guard {	569	# $state{handle}{ka_count_guard} = AnyEvent::Util::guard {
512	# --$KA_COUNT{$_[1]}	570	# --$KA_COUNT{$_[1]}
513	# };	571	# };
514	# $hdr{connection} = "keep-alive";	572	# $hdr{connection} = "keep-alive";
515	# } else {
516	delete $hdr{connection};
517	# }	573	# }
518		574
519	$state{handle}->starttls ("connect") if $rscheme eq "https";	575	$state{handle}->starttls ("connect") if $rscheme eq "https";
520		576
521	# handle actual, non-tunneled, request	577	# handle actual, non-tunneled, request
522	my $handle_actual_request = sub {	578	my $handle_actual_request = sub {
523	$state{handle}->starttls ("connect") if $uscheme eq "https" && !exists $state{handle}{tls};	579	$state{handle}->starttls ("connect") if $uscheme eq "https" && !exists $state{handle}{tls};
524		580
525	# send request	581	# send request
526	$state{handle}->push_write (	582	$state{handle}->push_write (
527	"$method $rpath HTTP/1.0\015\012"	583	"$method $rpath HTTP/1.1\015\012"
528	. (join "", map "\u$_: $hdr{$_}\015\012", grep defined $hdr{$_}, keys %hdr)	584	. (join "", map "\u$_: $hdr{$_}\015\012", grep defined $hdr{$_}, keys %hdr)
529	. "\015\012"	585	. "\015\012"
530	. (delete $arg{body})	586	. (delete $arg{body})
531	);	587	);
532		588
533	# return if error occured during push_write()	589	# return if error occured during push_write()
534	return unless %state;	590	return unless %state;
535		591
536	%hdr = (); # reduce memory usage, save a kitten, also make it possible to re-use	592	%hdr = (); # reduce memory usage, save a kitten, also make it possible to re-use
537		593
538	# status line and headers	594	# status line and headers
539	$state{handle}->push_read (line => $qr_nlnl, sub {	595	$state{read_response} = sub {
540	for ("$_[1]") {	596	for ("$_[1]") {
541	y/\015//d; # weed out any \015, as they show up in the weirdest of places.	597	y/\015//d; # weed out any \015, as they show up in the weirdest of places.
542		598
543	/^HTTP\/([0-9\.]+) \s+ ([0-9]{3}) (?: \s+ ([^\015\012]*) )? \015?\012/igxc	599	/^HTTP\/([0-9\.]+) \s+ ([0-9]{3}) (?: \s+ ([^\012]*) )? \012/igxc
544	or return (%state = (), $cb->(undef, { Status => 599, Reason => "Invalid server response", @pseudo }));	600	or return (%state = (), $cb->(undef, { @pseudo, Status => 599, Reason => "Invalid server response" }));
545		601
		602	# 100 Continue handling
		603	# should not happen as we don't send expect: 100-continue,
		604	# but we handle it just in case.
		605	# since we send the request body regardless, if we get an error
		606	# we are out of-sync, which we currently do NOT handle correctly.
		607	return $state{handle}->push_read (line => $qr_nlnl, $state{read_response})
		608	if $2 eq 100;
		609
546	push @pseudo,	610	push @pseudo,
547	HTTPVersion => $1,	611	HTTPVersion => $1,
548	Status => $2,	612	Status => $2,
549	Reason => $3,	613	Reason => $3,
550	;	614	;
551		615
552	# things seen, not parsed:	616	my $hdr = parse_hdr
553	# p3pP="NON CUR OTPi OUR NOR UNI"
554
555	$hdr{lc $1} .= ",$2"
556	while /\G
557	([^:\000-\037]*):
558	[\011\040]*
559	((?: [^\012]+ \| \012[\011\040] )*)
560	\012
561	/gxc;
562
563	/\G$/
564	or return (%state = (), $cb->(undef, { Status => 599, Reason => "Garbled response headers", @pseudo }));	617	or return (%state = (), $cb->(undef, { @pseudo, Status => 599, Reason => "Garbled response headers" }));
		618
		619	%hdr = (%$hdr, @pseudo);
		620	}
		621
		622	# redirect handling
		623	# microsoft and other shitheads don't give a shit for following standards,
		624	# try to support some common forms of broken Location headers.
		625	if ($hdr{location} !~ /^(?: $ \| [^:\/?\#]+ : )/x) {
		626	$hdr{location} =~ s/^\.\/+//;
		627
		628	my $url = "$rscheme://$uhost:$uport";
		629
		630	unless ($hdr{location} =~ s/^\///) {
		631	$url .= $upath;
		632	$url =~ s/\/[^\/]*$//;
565	}	633	}
566		634
567	# remove the "," prefix we added to all headers above
568	substr $_, 0, 1, ""
569	for values %hdr;
570
571	# patch in all pseudo headers
572	%hdr = (%hdr, @pseudo);
573
574	# redirect handling
575	# microsoft and other shitheads don't give a shit for following standards,
576	# try to support some common forms of broken Location headers.
577	if ($hdr{location} !~ /^(?: $ \| [^:\/?\#]+ : )/x) {
578	$hdr{location} =~ s/^\.\/+//;
579
580	my $url = "$rscheme://$uhost:$uport";
581
582	unless ($hdr{location} =~ s/^\///) {
583	$url .= $upath;
584	$url =~ s/\/[^\/]*$//;
585	}
586
587	$hdr{location} = "$url/$hdr{location}";	635	$hdr{location} = "$url/$hdr{location}";
		636	}
		637
		638	my $redirect;
		639
		640	if ($recurse) {
		641	my $status = $hdr{Status};
		642
		643	# industry standard is to redirect POST as GET for
		644	# 301, 302 and 303, in contrast to http/1.0 and 1.1.
		645	# also, the UA should ask the user for 301 and 307 and POST,
		646	# industry standard seems to be to simply follow.
		647	# we go with the industry standard.
		648	if ($status == 301 or $status == 302 or $status == 303) {
		649	# HTTP/1.1 is unclear on how to mutate the method
		650	$method = "GET" unless $method eq "HEAD";
		651	$redirect = 1;
		652	} elsif ($status == 307) {
		653	$redirect = 1;
588	}	654	}
		655	}
589		656
		657	my $finish = sub { # ($data, $err_status, $err_reason[, $keepalive])
590	my $redirect;	658	my $keepalive = pop;
591		659
		660	$state{handle}->destroy if $state{handle};
		661	%state = ();
		662
		663	if (defined $_[1]) {
		664	$hdr{OrigStatus} = $hdr{Status}; $hdr{Status} = $_[1];
		665	$hdr{OrigReason} = $hdr{Reason}; $hdr{Reason} = $_[2];
		666	}
		667
		668	# set-cookie processing
592	if ($recurse) {	669	if ($arg{cookie_jar}) {
593	my $status = $hdr{Status};	670	for ($hdr{"set-cookie"}) {
		671	# parse NAME=VALUE
		672	my @kv;
594		673
595	# industry standard is to redirect POST as GET for	674	while (
596	# 301, 302 and 303, in contrast to http/1.0 and 1.1.	675	m{
597	# also, the UA should ask the user for 301 and 307 and POST,	676	\G\s*
598	# industry standard seems to be to simply follow.	677	(?:
599	# we go with the industry standard.	678	expires \s=\s ([A-Z][a-z][a-z],\ [^,;]+)
600	if ($status == 301 or $status == 302 or $status == 303) {	679	\| ([^=;,[:space:]]+) \s=\s (?: "((?:[^\\"]+\|\\.))" \| ([^=;,[:space:]]) )
601	# HTTP/1.1 is unclear on how to mutate the method	680	)
602	$method = "GET" unless $method eq "HEAD";	681	}gcxsi
		682	) {
		683	my $name = $2;
		684	my $value = $4;
		685
		686	unless (defined $name) {
		687	# expires
		688	$name = "expires";
		689	$value = $1;
		690	} elsif (!defined $value) {
		691	# quoted
		692	$value = $3;
		693	$value =~ s/\\(.)/$1/gs;
		694	}
		695
		696	push @kv, lc $name, $value;
		697
		698	last unless /\G\s*;/gc;
		699	}
		700
		701	last unless @kv;
		702
		703	my $name = shift @kv;
		704	my %kv = (value => shift @kv, @kv);
		705
		706	$kv{expires} \|\|= format_date (AE::now + $kv{"max-age"})
		707	if exists $kv{"max-age"};
		708
		709	my $cdom;
		710	my $cpath = (delete $kv{path}) \|\| "/";
		711
		712	if (exists $kv{domain}) {
		713	$cdom = delete $kv{domain};
		714
		715	$cdom =~ s/^\.?/./; # make sure it starts with a "."
		716
		717	next if $cdom =~ /\.$/;
		718
		719	# this is not rfc-like and not netscape-like. go figure.
		720	my $ndots = $cdom =~ y/.//;
		721	next if $ndots < ($cdom =~ /\.[^.][^.]\.[^.][^.]$/ ? 3 : 2);
		722	} else {
		723	$cdom = $uhost;
		724	}
		725
603	$redirect = 1;	726	# store it
604	} elsif ($status == 307) {	727	$arg{cookie_jar}{version} = 1;
605	$redirect = 1;	728	$arg{cookie_jar}{$cdom}{$cpath}{$name} = \%kv;
		729
		730	redo if /\G\s*,/gc;
606	}	731	}
607	}	732	}
608		733
609	my $finish = sub {
610	$state{handle}->destroy if $state{handle};
611	%state = ();
612
613	# set-cookie processing
614	if ($arg{cookie_jar}) {
615	for ($_[1]{"set-cookie"}) {
616	# parse NAME=VALUE
617	my @kv;
618
619	while (/\G\s* ([^=;,[:space:]]+) \s=\s (?: "((?:[^\\"]+\|\\.))" \| ([^=;,[:space:]]) )/gcxs) {
620	my $name = $1;
621	my $value = $3;
622
623	unless ($value) {
624	$value = $2;
625	$value =~ s/\\(.)/$1/gs;
626	}
627
628	push @kv, $name => $value;
629
630	last unless /\G\s*;/gc;
631	}
632
633	last unless @kv;
634
635	my $name = shift @kv;
636	my %kv = (value => shift @kv, @kv);
637
638	my $cdom;
639	my $cpath = (delete $kv{path}) \|\| "/";
640
641	if (exists $kv{domain}) {
642	$cdom = delete $kv{domain};
643
644	$cdom =~ s/^\.?/./; # make sure it starts with a "."
645
646	next if $cdom =~ /\.$/;
647
648	# this is not rfc-like and not netscape-like. go figure.
649	my $ndots = $cdom =~ y/.//;
650	next if $ndots < ($cdom =~ /\.[^.][^.]\.[^.][^.]$/ ? 3 : 2);
651	} else {
652	$cdom = $uhost;
653	}
654
655	# store it
656	$arg{cookie_jar}{version} = 1;
657	$arg{cookie_jar}{$cdom}{$cpath}{$name} = \%kv;
658
659	redo if /\G\s*,/gc;
660	}
661	}
662
663	if ($redirect && exists $hdr{location}) {	734	if ($redirect && exists $hdr{location}) {
664	# we ignore any errors, as it is very common to receive	735	# we ignore any errors, as it is very common to receive
665	# Content-Length != 0 but no actual body	736	# Content-Length != 0 but no actual body
666	# we also access %hdr, as $_[1] might be an erro	737	# we also access %hdr, as $_[1] might be an erro
667	http_request (	738	http_request (
668	$method => $hdr{location},	739	$method => $hdr{location},
669	%arg,	740	%arg,
670	recurse => $recurse - 1,	741	recurse => $recurse - 1,
671	Redirect => \@_,	742	Redirect => [$_[0], \%hdr],
672	$cb);	743	$cb);
673	} else {
674	$cb->($_[0], $_[1]);
675	}
676	};
677
678	my $len = $hdr{"content-length"};
679
680	if (!$redirect && $arg{on_header} && !$arg{on_header}(\%hdr)) {
681	$finish->(undef, { Status => 598, Reason => "Request cancelled by on_header", @pseudo });
682	} elsif (
683	$hdr{Status} =~ /^(?:1..\|[23]04)$/
684	or $method eq "HEAD"
685	or (defined $len && !$len)
686	) {
687	# no body
688	$finish->("", \%hdr);
689	} else {	744	} else {
		745	$cb->($_[0], \%hdr);
		746	}
		747	};
		748
		749	my $len = $hdr{"content-length"};
		750
		751	if (!$redirect && $arg{on_header} && !$arg{on_header}(\%hdr)) {
		752	$finish->(undef, 598 => "Request cancelled by on_header");
		753	} elsif (
		754	$hdr{Status} =~ /^(?:1..\|204\|205\|304)$/
		755	or $method eq "HEAD"
		756	or (defined $len && !$len)
		757	) {
		758	# no body
		759	$finish->("", undef, undef, 1);
		760	} else {
690	# body handling, four different code paths	761	# body handling, many different code paths
691	# for want_body_handle, on_body (2x), normal (2x)	762	# - no body expected
692	# we might read too much here, but it does not matter yet (no pers. connections)	763	# - want_body_handle
		764	# - te chunked
		765	# - 2x length known (with or without on_body)
		766	# - 2x length not known (with or without on_body)
693	if (!$redirect && $arg{want_body_handle}) {	767	if (!$redirect && $arg{want_body_handle}) {
694	$_[0]->on_eof (undef);	768	$_[0]->on_eof (undef);
695	$_[0]->on_error (undef);	769	$_[0]->on_error (undef);
696	$_[0]->on_read (undef);	770	$_[0]->on_read (undef);
697		771
698	$finish->(delete $state{handle}, \%hdr);	772	$finish->(delete $state{handle});
699		773
700	} elsif ($arg{on_body}) {	774	} elsif ($hdr{"transfer-encoding"} =~ /\bchunked\b/i) {
		775	my $cl = 0;
		776	my $body = undef;
		777	my $on_body = $arg{on_body} \|\| sub { $body .= shift; 1 };
		778
701	$_[0]->on_error (sub { $finish->(undef, { Status => 599, Reason => $_[2], @pseudo }) });	779	$_[0]->on_error (sub { $finish->(undef, 599 => $_[2]) });
		780
		781	my $read_chunk; $read_chunk = sub {
		782	$_[1] =~ /^([0-9a-fA-F]+)/
		783	or $finish->(undef, 599 => "Garbled chunked transfer encoding");
		784
		785	my $len = hex $1;
		786
702	if ($len) {	787	if ($len) {
703	$_[0]->on_eof (undef);	788	$cl += $len;
		789
		790	$_[0]->push_read (chunk => $len, sub {
		791	$on_body->($_[1], \%hdr)
		792	or return $finish->(undef, 598 => "Request cancelled by on_body");
		793
704	$_[0]->on_read (sub {	794	$_[0]->push_read (line => sub {
705	$len -= length $_[0]{rbuf};	795	length $_[1]
706		796	and return $finish->(undef, 599 => "Garbled chunked transfer encoding");
707	$arg{on_body}(delete $_[0]{rbuf}, \%hdr)	797	$_[0]->push_read (line => $read_chunk);
708	or $finish->(undef, { Status => 598, Reason => "Request cancelled by on_body", @pseudo });
709
710	$len > 0	798	});
711	or $finish->("", \%hdr);
712	});	799	});
713	} else {	800	} else {
714	$_[0]->on_eof (sub {	801	$hdr{"content-length"} \|\|= $cl;
715	$finish->("", \%hdr);	802
		803	$_[0]->push_read (line => $qr_nlnl, sub {
		804	if (length $_[1]) {
		805	for ("$_[1]") {
		806	y/\015//d; # weed out any \015, as they show up in the weirdest of places.
		807
		808	my $hdr = parse_hdr
		809	or return $finish->(undef, 599 => "Garbled response trailers");
		810
		811	%hdr = (%hdr, %$hdr);
		812	}
716	});	813	}
717	$_[0]->on_read (sub {	814
718	$arg{on_body}(delete $_[0]{rbuf}, \%hdr)	815	$finish->($body, undef, undef, 1);
719	or $finish->(undef, { Status => 598, Reason => "Request cancelled by on_body", @pseudo });
720	});	816	});
721	}	817	}
		818	};
		819
		820	$_[0]->push_read (line => $read_chunk);
		821
		822	} elsif ($arg{on_body}) {
		823	$_[0]->on_error (sub { $finish->(undef, 599 => $_[2]) });
		824
		825	if ($len) {
		826	$_[0]->on_read (sub {
		827	$len -= length $_[0]{rbuf};
		828
		829	$arg{on_body}(delete $_[0]{rbuf}, \%hdr)
		830	or return $finish->(undef, 598 => "Request cancelled by on_body");
		831
		832	$len > 0
		833	or $finish->("", undef, undef, 1);
		834	});
722	} else {	835	} else {
723	$_[0]->on_eof (undef);	836	$_[0]->on_eof (sub {
724		837	$finish->("");
725	if ($len) {	838	});
726	$_[0]->on_error (sub { $finish->(undef, { Status => 599, Reason => $_[2], @pseudo }) });
727	$_[0]->on_read (sub {	839	$_[0]->on_read (sub {
		840	$arg{on_body}(delete $_[0]{rbuf}, \%hdr)
		841	or $finish->(undef, 598 => "Request cancelled by on_body");
		842	});
		843	}
		844	} else {
		845	$_[0]->on_eof (undef);
		846
		847	if ($len) {
		848	$_[0]->on_error (sub { $finish->(undef, 599 => $_[2]) });
		849	$_[0]->on_read (sub {
728	$finish->((substr delete $_[0]{rbuf}, 0, $len, ""), \%hdr)	850	$finish->((substr delete $_[0]{rbuf}, 0, $len, ""), undef, undef, 1)
729	if $len <= length $_[0]{rbuf};	851	if $len <= length $_[0]{rbuf};
730	});	852	});
731	} else {	853	} else {
732	$_[0]->on_error (sub {	854	$_[0]->on_error (sub {
733	($! == Errno::EPIPE \|\| !$!)	855	($! == Errno::EPIPE \|\| !$!)
734	? $finish->(delete $_[0]{rbuf}, \%hdr)	856	? $finish->(delete $_[0]{rbuf})
735	: $finish->(undef, { Status => 599, Reason => $_[2], @pseudo });	857	: $finish->(undef, 599 => $_[2]);
736	});	858	});
737	$_[0]->on_read (sub { });	859	$_[0]->on_read (sub { });
738	}
739	}	860	}
740	}	861	}
741	});	862	}
742	};	863	};
743		864
		865	$state{handle}->push_read (line => $qr_nlnl, $state{read_response});
		866	};
		867
744	# now handle proxy-CONNECT method	868	# now handle proxy-CONNECT method
745	if ($proxy && $uscheme eq "https") {	869	if ($proxy && $uscheme eq "https") {
746	# oh dear, we have to wrap it into a connect request	870	# oh dear, we have to wrap it into a connect request
747		871
748	# maybe re-use $uauthority with patched port?	872	# maybe re-use $uauthority with patched port?
749	$state{handle}->push_write ("CONNECT $uhost:$uport HTTP/1.0\015\012Host: $uhost\015\012\015\012");	873	$state{handle}->push_write ("CONNECT $uhost:$uport HTTP/1.0\015\012Host: $uhost\015\012\015\012");
750	$state{handle}->push_read (line => $qr_nlnl, sub {	874	$state{handle}->push_read (line => $qr_nlnl, sub {
751	$_[1] =~ /^HTTP\/([0-9\.]+) \s+ ([0-9]{3}) (?: \s+ ([^\015\012]*) )?/ix	875	$_[1] =~ /^HTTP\/([0-9\.]+) \s+ ([0-9]{3}) (?: \s+ ([^\015\012]*) )?/ix
752	or return (%state = (), $cb->(undef, { Status => 599, Reason => "Invalid proxy connect response ($_[1])", @pseudo }));	876	or return (%state = (), $cb->(undef, { @pseudo, Status => 599, Reason => "Invalid proxy connect response ($_[1])" }));
753		877
754	if ($2 == 200) {	878	if ($2 == 200) {
755	$rpath = $upath;	879	$rpath = $upath;
756	&$handle_actual_request;	880	&$handle_actual_request;
757	} else {	881	} else {
758	%state = ();	882	%state = ();
759	$cb->(undef, { Status => $2, Reason => $3, @pseudo });	883	$cb->(undef, { @pseudo, Status => $2, Reason => $3 });
760	}
761	});	884	}
		885	});
762	} else {	886	} else {
763	&$handle_actual_request;	887	&$handle_actual_request;
764	}
765
766	},	888	}
767	$arg{on_prepare} \|\| sub { $timeout }
768	);	889	};
		890
		891	my $tcp_connect = $arg{tcp_connect}
		892	\|\| do { require AnyEvent::Socket; \&AnyEvent::Socket::tcp_connect };
		893
		894	$state{connect_guard} = $tcp_connect->($rhost, $rport, $connect_cb, $arg{on_prepare} \|\| sub { $timeout });
		895
769	};	896	};
770		897
771	defined wantarray && AnyEvent::Util::guard { %state = () }	898	defined wantarray && AnyEvent::Util::guard { %state = () }
772	}	899	}
773		900
…		…
815	Takes a POSIX timestamp (seconds since the epoch) and formats it as a HTTP	942	Takes a POSIX timestamp (seconds since the epoch) and formats it as a HTTP
816	Date (RFC 2616).	943	Date (RFC 2616).
817		944
818	=item $timestamp = AnyEvent::HTTP::parse_date $date	945	=item $timestamp = AnyEvent::HTTP::parse_date $date
819		946
820	Takes a HTTP Date (RFC 2616) and returns the corresponding POSIX	947	Takes a HTTP Date (RFC 2616) or a Cookie date (netscape cookie spec) and
821	timestamp, or C<undef> if the date cannot be parsed.	948	returns the corresponding POSIX timestamp, or C<undef> if the date cannot
		949	be parsed.
822		950
823	=item $AnyEvent::HTTP::MAX_RECURSE	951	=item $AnyEvent::HTTP::MAX_RECURSE
824		952
825	The default value for the C<recurse> request parameter (default: C<10>).	953	The default value for the C<recurse> request parameter (default: C<10>).
826		954
…		…
865	sub parse_date($) {	993	sub parse_date($) {
866	my ($date) = @_;	994	my ($date) = @_;
867		995
868	my ($d, $m, $y, $H, $M, $S);	996	my ($d, $m, $y, $H, $M, $S);
869		997
870	if ($date =~ /^[A-Z][a-z][a-z], ([0-9][0-9]) ([A-Z][a-z][a-z]) ([0-9][0-9][0-9][0-9]) ([0-9][0-9]):([0-9][0-9]):([0-9][0-9]) GMT$/) {	998	if ($date =~ /^[A-Z][a-z][a-z], ([0-9][0-9])[\- ]([A-Z][a-z][a-z])[\- ]([0-9][0-9][0-9][0-9]) ([0-9][0-9]):([0-9][0-9]):([0-9][0-9]) GMT$/) {
871	# RFC 822/1123, required by RFC 2616	999	# RFC 822/1123, required by RFC 2616 (with " ")
		1000	# cookie dates (with "-")
		1001
872	($d, $m, $y, $H, $M, $S) = ($1, $2, $3, $4, $5, $6);	1002	($d, $m, $y, $H, $M, $S) = ($1, $2, $3, $4, $5, $6);
873		1003
874	} elsif ($date =~ /^[A-Z][a-z]+, ([0-9][0-9])-([A-Z][a-z][a-z])-([0-9][0-9]) ([0-9][0-9]):([0-9][0-9]):([0-9][0-9]) GMT$/) {	1004	} elsif ($date =~ /^[A-Z][a-z]+, ([0-9][0-9])-([A-Z][a-z][a-z])-([0-9][0-9]) ([0-9][0-9]):([0-9][0-9]):([0-9][0-9]) GMT$/) {
875	# RFC 850	1005	# RFC 850
876	($d, $m, $y, $H, $M, $S) = ($1, $2, $3 < 69 ? $3 + 2000 : $3 + 1900, $4, $5, $6);	1006	($d, $m, $y, $H, $M, $S) = ($1, $2, $3 < 69 ? $3 + 2000 : $3 + 1900, $4, $5, $6);

Diff Legend

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

Comparing AnyEvent-HTTP/HTTP.pm (file contents): Revision 1.62 by root, Thu Dec 30 04:30:24 2010 UTC vs. Revision 1.71 by root, Fri Dec 31 20:50:58 2010 UTC

Diff Legend

Comparing AnyEvent-HTTP/HTTP.pm (file contents):
Revision 1.62 by root, Thu Dec 30 04:30:24 2010 UTC vs.
Revision 1.71 by root, Fri Dec 31 20:50:58 2010 UTC