--- AnyEvent-HTTP/HTTP.pm	2011/02/19 06:46:14	1.102
+++ AnyEvent-HTTP/HTTP.pm	2012/04/22 12:58:38	1.111
@@ -48,7 +48,7 @@
 
 use base Exporter::;
 
-our $VERSION = '2.04';
+our $VERSION = '2.14';
 
 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
@@ -383,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 {
@@ -775,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);
@@ -876,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
@@ -909,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);
             }
@@ -957,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;
 
@@ -1037,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;
@@ -1065,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)
@@ -1122,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 {
@@ -1237,7 +1255,7 @@
 
 =item $AnyEvent::HTTP::TIMEOUT
 
-The default timeout for conenction operations (default: C<300>).
+The default timeout for connection operations (default: C<300>).
 
 =item $AnyEvent::HTTP::USERAGENT
 
@@ -1312,7 +1330,7 @@
    for (0..11) {
       if ($m eq $month[$_]) {
          require Time::Local;
-         return Time::Local::timegm ($S, $M, $H, $d, $_, $y);
+         return eval { Time::Local::timegm ($S, $M, $H, $d, $_, $y) };
       }
    }
 
@@ -1368,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-";
       }