--- AnyEvent-HTTP/HTTP.pm 2011/02/16 16:34:34 1.101 +++ AnyEvent-HTTP/HTTP.pm 2011/07/27 16:11:55 1.109 @@ -48,7 +48,7 @@ use base Exporter::; -our $VERSION = '2.03'; +our $VERSION = '2.13'; our @EXPORT = qw(http_get http_post http_head http_request); @@ -171,6 +171,9 @@ appropriate for your program - I wouldn't be surprised if the default AnyEvent string gets blocked by webservers sooner or later. +Also, make sure that your headers names and values do not contain any +embedded newlines. + =item timeout => $seconds The time-out to use for various stages - each connect attempt will reset @@ -181,11 +184,14 @@ =item proxy => [$host, $port[, $scheme]] or undef -Use the given http proxy for all requests. If not specified, then the -default proxy (as specified by C<$ENV{http_proxy}>) is used. +Use the given http proxy for all requests, or no proxy if C is +used. C<$scheme> must be either missing or must be C for HTTP. +If not specified, then the default proxy is used (see +C). + =item body => $string The request body, usually empty. Will be sent as-is (future versions of @@ -380,7 +386,7 @@ timeout of 30 seconds. http_request - GET => "https://www.google.com", + HEAD => "https://www.google.com", headers => { "user-agent" => "MySearchClient 1.0" }, timeout => 30, sub { @@ -711,7 +717,7 @@ return $cb->(undef, { @pseudo, Status => 599, Reason => "Too many redirections" }) if $recurse < 0; - my $proxy = $arg{proxy} || $PROXY; + my $proxy = exists $arg{proxy} ? $arg{proxy} : $PROXY; my $timeout = $arg{timeout} || $TIMEOUT; my ($uscheme, $uauthority, $upath, $query, undef) = # ignore fragment @@ -772,14 +778,14 @@ my $idempotent = $method =~ /^(?:GET|HEAD|PUT|DELETE|OPTIONS|TRACE)$/; # default value for keepalive is true iff the request is for an idempotent method - my $keepalive = exists $arg{keepalive} ? !!$arg{keepalive} : $idempotent; - my $keepalive10 = exists $arg{keepalive10} ? $arg{keepalive10} : !$proxy; - my $keptalive; # true if this is actually a recycled connection + my $persistent = exists $arg{persistent} ? !!$arg{persistent} : $idempotent; + my $keepalive = exists $arg{keepalive} ? !!$arg{keepalive} : !$proxy; + my $was_persistent; # true if this is actually a recycled connection # the key to use in the keepalive cache - my $ka_key = "$uhost\x00$arg{sessionid}"; + my $ka_key = "$uscheme\x00$uhost\x00$uport\x00$arg{sessionid}"; - $hdr{connection} = ($keepalive ? $keepalive10 ? "keep-alive " : "" : "close ") . "Te"; #1.1 + $hdr{connection} = ($persistent ? $keepalive ? "keep-alive " : "" : "close ") . "Te"; #1.1 $hdr{te} = "trailers" unless exists $hdr{te}; #1.1 my %state = (connect_guard => 1); @@ -873,11 +879,11 @@ } } - my $finish = sub { # ($data, $err_status, $err_reason[, $keepalive]) + my $finish = sub { # ($data, $err_status, $err_reason[, $persistent]) if ($state{handle}) { # handle keepalive if ( - $keepalive + $persistent && $_[3] && ($hdr{HTTPVersion} < 1.1 ? $hdr{connection} =~ /\bkeep-?alive\b/i @@ -906,13 +912,17 @@ # we ignore any errors, as it is very common to receive # Content-Length != 0 but no actual body # we also access %hdr, as $_[1] might be an erro - http_request ( - $method => $hdr{location}, - %arg, - recurse => $recurse - 1, - Redirect => [$_[0], \%hdr], - $cb - ); + $state{recurse} = + http_request ( + $method => $hdr{location}, + %arg, + recurse => $recurse - 1, + Redirect => [$_[0], \%hdr], + sub { + %state = (); + &$cb + }, + ); } else { $cb->($_[0], \%hdr); } @@ -954,7 +964,7 @@ $state{read_chunk} = sub { $_[1] =~ /^([0-9a-fA-F]+)/ - or $finish->(undef, $ae_error => "Garbled chunked transfer encoding"); + or return $finish->(undef, $ae_error => "Garbled chunked transfer encoding"); my $len = hex $1; @@ -1034,17 +1044,22 @@ # if keepalive is enabled, then the server closing the connection # before a response can happen legally - we retry on idempotent methods. - if ($keptalive && $idempotent) { + if ($was_persistent && $idempotent) { my $old_eof = $hdl->{on_eof}; $hdl->{on_eof} = sub { _destroy_state %state; - http_request ( - $method => $url, - %arg, - keepalive => 0, - $cb - ); + %state = (); + $state{recurse} = + http_request ( + $method => $url, + %arg, + keepalive => 0, + sub { + %state = (); + &$cb + } + ); }; $hdl->on_read (sub { return unless %state; @@ -1062,13 +1077,14 @@ my $prepare_handle = sub { my ($hdl) = $state{handle}; - $hdl->timeout ($timeout); $hdl->on_error (sub { _error %state, $cb, { @pseudo, Status => $ae_error, Reason => $_[2] }; }); $hdl->on_eof (sub { _error %state, $cb, { @pseudo, Status => $ae_error, Reason => "Unexpected end-of-file" }; }); + $hdl->timeout_reset; + $hdl->timeout ($timeout); }; # connected to proxy (or origin server) @@ -1119,10 +1135,15 @@ # try to use an existing keepalive connection, but only if we, ourselves, plan # on a keepalive request (in theory, this should be a separate config option). - if ($keepalive && $KA_CACHE{$ka_key}) { - $keptalive = 1; + if ($persistent && $KA_CACHE{$ka_key}) { + $was_persistent = 1; + $state{handle} = ka_fetch $ka_key; + $state{handle}->destroyed + and die "AnyEvent::HTTP: unexpectedly got a destructed handle (1), please report.";#d# $prepare_handle->(); + $state{handle}->destroyed + and die "AnyEvent::HTTP: unexpectedly got a destructed handle (2), please report.";#d# $handle_actual_request->(); } else { @@ -1174,6 +1195,10 @@ To clear an already-set proxy, use C. +When AnyEvent::HTTP is laoded for the first time it will query the +default proxy from the operating system, currently by looking at +C<$ENV{http_proxy>}. + =item AnyEvent::HTTP::cookie_jar_expire $jar[, $session_end] Remove all cookies from the cookie jar that have been expired. If @@ -1361,7 +1386,7 @@ warn -s _; if (stat $fh and -s _) { $ofs = -s _; - warn "-s is ", $ofs;#d# + warn "-s is ", $ofs; $hdr{"if-unmodified-since"} = AnyEvent::HTTP::format_date +(stat _)[9]; $hdr{"range"} = "bytes=$ofs-"; }