Upgrade HTTP::Tiny from version 0.058_001 to 0.064

24 files changed, 137 insertions, 45 deletions

diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
index 03395e8682..de07e2abce 100644
--- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
+++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 # ABSTRACT: A small, simple, correct HTTP/1.1 client
 
-our $VERSION = '0.058_001';
+our $VERSION = '0.064';
 
 use Carp ();
 
@@ -110,7 +110,7 @@ sub new {
 
     my $self = {
         max_redirect => 5,
-        timeout      => 60,
+        timeout      => defined $args{timeout} ? $args{timeout} : 60,
         keep_alive   => 1,
         verify_SSL   => $args{verify_SSL} || $args{verify_ssl} || 0, # no verification by default
         no_proxy     => $ENV{no_proxy},
@@ -282,6 +282,15 @@ sub mirror {
     my ($self, $url, $file, $args) = @_;
     @_ == 3 || (@_ == 4 && ref $args eq 'HASH')
       or Carp::croak(q/Usage: $http->mirror(URL, FILE, [HASHREF])/ . "\n");
+
+    if ( exists $args->{headers} ) {
+        my $headers = {};
+        while ( my ($key, $value) = each %{$args->{headers} || {}} ) {
+            $headers->{lc $key} = $value;
+        }
+        $args->{headers} = $headers;
+    }
+
     if ( -e $file and my $mtime = (stat($file))[9] ) {
         $args->{headers}{'if-modified-since'} ||= $self->_http_date($mtime);
     }
@@ -1453,8 +1462,12 @@ sub write_chunked_body {
         $self->write($chunk);
     }
     $self->write("0\x0D\x0A");
-    $self->write_header_lines($request->{trailer_cb}->())
-        if ref $request->{trailer_cb} eq 'CODE';
+    if ( ref $request->{trailer_cb} eq 'CODE' ) {
+        $self->write_header_lines($request->{trailer_cb}->())
+    }
+    else {
+        $self->write("\x0D\x0A");
+    }
     return $len;
 }
 
@@ -1643,7 +1656,7 @@ HTTP::Tiny - A small, simple, correct HTTP/1.1 client
 
 =head1 VERSION
 
-version 0.058
+version 0.064
 
 =head1 SYNOPSIS
 
@@ -2266,7 +2279,7 @@ David Golden <dagolden@cpan.org>
 
 =head1 CONTRIBUTORS
 
-=for stopwords Alan Gardner Alessandro Ghedini A. Sinan Unur Brad Gilbert brian m. carlson Chris Nehren Weyl Claes Jakobsson Clinton Gormley David Golden Dean Pearce Edward Zborowski James Raspass Jeremy Mates Jess Robinson Lukas Eklund Martin J. Evans Martin-Louis Bright Mike Doherty Olaf Alders Olivier Mengué Petr Písař SkyMarshal Sören Kornetzki Syohei YOSHIDA Tatsuhiko Miyagawa Tom Hukins Tony Cook
+=for stopwords Alan Gardner Alessandro Ghedini A. Sinan Unur Brad Gilbert brian m. carlson Chris Nehren Weyl Claes Jakobsson Clinton Gormley David Golden Dean Pearce Edward Zborowski James Raspass Jeremy Mates Jess Robinson Karen Etheridge Lukas Eklund Martin J. Evans Martin-Louis Bright Mike Doherty Olaf Alders Olivier Mengué Petr Písař SkyMarshal Sören Kornetzki Steve Grazzini Syohei YOSHIDA Tatsuhiko Miyagawa Tom Hukins Tony Cook
 
 =over 4
 
@@ -2332,6 +2345,10 @@ Jess Robinson <castaway@desert-island.me.uk>
 
 =item *
 
+Karen Etheridge <ether@cpan.org>
+
+=item *
+
 Lukas Eklund <leklund@gmail.com>
 
 =item *
@@ -2368,6 +2385,10 @@ Sören Kornetzki <soeren.kornetzki@delti.com>
 
 =item *
 
+Steve Grazzini <steve.grazzini@grantstreet.com>
+
+=item *
+
 Syohei YOSHIDA <syohex@gmail.com>
 
 =item *
diff --git a/cpan/HTTP-Tiny/t/002_croakage.t b/cpan/HTTP-Tiny/t/002_croakage.t
index 9e51b5d4ed..ac3c8b93e4 100644
--- a/cpan/HTTP-Tiny/t/002_croakage.t
+++ b/cpan/HTTP-Tiny/t/002_croakage.t
@@ -4,7 +4,8 @@ use strict;
 use warnings;
 
 use Test::More;
-use t::Util qw[tmpfile monkey_patch set_socket_source];
+use lib 't';
+use Util qw[tmpfile monkey_patch set_socket_source];
 
 use HTTP::Tiny;
 
diff --git a/cpan/HTTP-Tiny/t/004_timeout.t b/cpan/HTTP-Tiny/t/004_timeout.t
new file mode 100644
index 0000000000..95f9bd4799
--- /dev/null
+++ b/cpan/HTTP-Tiny/t/004_timeout.t
@@ -0,0 +1,38 @@
+#!perl
+
+use strict;
+use warnings;
+
+use Test::More tests => 5;
+use HTTP::Tiny;
+
+# Just make sure timeout is handled correctly as a constructor param,
+# and that it works as expected as an "attribute".
+
+my $default = 60;
+
+{
+    my $ua = HTTP::Tiny->new();
+    is $ua->timeout, $default, 'default timeout is as expected';
+}
+
+{
+    my $ua = HTTP::Tiny->new(timeout => 10);
+    is $ua->timeout, 10, 'timeout is handled as a constructor param';
+}
+
+{
+    my $ua = HTTP::Tiny->new(timeout => 0);
+    is $ua->timeout, 0, 'constructor arg of timeout=0 is passed through';
+}
+
+{
+    my $ua = HTTP::Tiny->new(timeout => undef);
+    is $ua->timeout, $default, 'constructor arg of timeout=undef is ignored';
+}
+
+{
+    my $ua = HTTP::Tiny->new();
+    $ua->timeout(15);
+    is $ua->timeout, 15, 'timeout works as expected as a r/w attribute';
+}
diff --git a/cpan/HTTP-Tiny/t/020_headers.t b/cpan/HTTP-Tiny/t/020_headers.t
index c10e075a68..a4254e5709 100644
--- a/cpan/HTTP-Tiny/t/020_headers.t
+++ b/cpan/HTTP-Tiny/t/020_headers.t
@@ -4,7 +4,8 @@ use strict;
 use warnings;
 
 use Test::More qw[no_plan];
-use t::Util    qw[tmpfile rewind $CRLF $LF];
+use lib 't';
+use Util    qw[tmpfile rewind $CRLF $LF];
 use HTTP::Tiny;
 
 {
diff --git a/cpan/HTTP-Tiny/t/030_response.t b/cpan/HTTP-Tiny/t/030_response.t
index fc72a3afc0..e519a62070 100644
--- a/cpan/HTTP-Tiny/t/030_response.t
+++ b/cpan/HTTP-Tiny/t/030_response.t
@@ -4,7 +4,8 @@ use strict;
 use warnings;
 
 use Test::More qw[no_plan];
-use t::Util    qw[tmpfile rewind $CRLF $LF];
+use lib 't';
+use Util    qw[tmpfile rewind $CRLF $LF];
 use HTTP::Tiny;
 
 sub _header {
diff --git a/cpan/HTTP-Tiny/t/040_content.t b/cpan/HTTP-Tiny/t/040_content.t
index 64e432e9e1..b7406de39f 100644
--- a/cpan/HTTP-Tiny/t/040_content.t
+++ b/cpan/HTTP-Tiny/t/040_content.t
@@ -4,7 +4,8 @@ use strict;
 use warnings;
 
 use Test::More qw[no_plan];
-use t::Util    qw[tmpfile rewind $CRLF $LF];
+use lib 't';
+use Util    qw[tmpfile rewind $CRLF $LF];
 use HTTP::Tiny;
 
 {
diff --git a/cpan/HTTP-Tiny/t/050_chunked_body.t b/cpan/HTTP-Tiny/t/050_chunked_body.t
index b555b00a72..7aff9e07e4 100644
--- a/cpan/HTTP-Tiny/t/050_chunked_body.t
+++ b/cpan/HTTP-Tiny/t/050_chunked_body.t
@@ -4,7 +4,8 @@ use strict;
 use warnings;
 
 use Test::More qw[no_plan];
-use t::Util    qw[tmpfile rewind $CRLF];
+use lib 't';
+use Util    qw[tmpfile rewind $CRLF];
 use HTTP::Tiny;
 
 {
@@ -14,16 +15,29 @@ use HTTP::Tiny;
 }
 
 {
-    my $body    = join($CRLF, map { sprintf('%x', length $_) . $CRLF . $_ } 'A'..'Z', '') . $CRLF;
-    my $fh      = tmpfile($body);
+    my $fh      = tmpfile();
     my $handle  = HTTP::Tiny::Handle->new(fh => $fh);
-    my $exp     = ['A'..'Z'];
-    my $got     = [];
-    my $cb      = sub { push @$got, $_[0] };
-    my $response = { headers => {} };
-    $handle->read_chunked_body($cb, $response);
-    is_deeply($response->{headers}, {}, 'chunked trailers');
-    is_deeply($got, $exp, "chunked chunks");
+
+    my $exp      = ['A'..'Z'];
+    my $got      = [];
+
+    {
+        my @chunks = @$exp;
+        my $request = {
+          cb => sub { shift @chunks },
+        };
+        $handle->write_chunked_body($request);
+    }
+
+    rewind($fh);
+
+    {
+        my $cb = sub { push @$got, $_[0] };
+        my $response = { headers => {} };
+        $handle->read_chunked_body($cb, $response);
+    }
+
+    is_deeply($got, $exp, "roundtrip chunked chunks w/o trailers");
 }
 
 {
@@ -52,7 +66,7 @@ use HTTP::Tiny;
         is_deeply($response->{headers}, $trailers, 'roundtrip chunked trailers');
     }
 
-    is_deeply($got, $exp, "roundtrip chunked chunks");
+    is_deeply($got, $exp, "roundtrip chunked chunks (with trailers)");
 }
 
 
diff --git a/cpan/HTTP-Tiny/t/070_cookie_jar.t b/cpan/HTTP-Tiny/t/070_cookie_jar.t
index bd09a54fb5..f62c481cb1 100644
--- a/cpan/HTTP-Tiny/t/070_cookie_jar.t
+++ b/cpan/HTTP-Tiny/t/070_cookie_jar.t
@@ -4,8 +4,9 @@ use strict;
 use warnings;
 
 use Test::More tests => 4;
-use t::SimpleCookieJar;
-use t::BrokenCookieJar;
+use lib 't';
+use SimpleCookieJar;
+use BrokenCookieJar;
 use HTTP::Tiny;
 
 ### a couple tests to ensure that:
@@ -15,9 +16,9 @@ use HTTP::Tiny;
 
 
 my $default = undef;
-my $jar = t::SimpleCookieJar->new();
-my $mug = t::BrokenCookieJar->new();
-my $dog = t::BrokenCookieJar2->new();
+my $jar = SimpleCookieJar->new();
+my $mug = BrokenCookieJar->new();
+my $dog = BrokenCookieJar2->new();
 
 {
     my $ua = HTTP::Tiny->new();
diff --git a/cpan/HTTP-Tiny/t/100_get.t b/cpan/HTTP-Tiny/t/100_get.t
index 43cf52e1da..5dbf3e8a6c 100644
--- a/cpan/HTTP-Tiny/t/100_get.t
+++ b/cpan/HTTP-Tiny/t/100_get.t
@@ -5,7 +5,8 @@ use warnings;
 
 use File::Basename;
 use Test::More 0.88;
-use t::Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+use lib 't';
+use Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
   hashify connect_args set_socket_source sort_headers $CRLF $LF];
 
 use HTTP::Tiny;
diff --git a/cpan/HTTP-Tiny/t/101_head.t b/cpan/HTTP-Tiny/t/101_head.t
index 7a2e6ce138..ace074566c 100644
--- a/cpan/HTTP-Tiny/t/101_head.t
+++ b/cpan/HTTP-Tiny/t/101_head.t
@@ -5,7 +5,8 @@ use warnings;
 
 use File::Basename;
 use Test::More 0.88;
-use t::Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+use lib 't';
+use Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
                   set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 BEGIN { monkey_patch() }
diff --git a/cpan/HTTP-Tiny/t/102_put.t b/cpan/HTTP-Tiny/t/102_put.t
index 42f3ed9a11..2fe3626dbc 100644
--- a/cpan/HTTP-Tiny/t/102_put.t
+++ b/cpan/HTTP-Tiny/t/102_put.t
@@ -5,7 +5,8 @@ use warnings;
 
 use File::Basename;
 use Test::More 0.88;
-use t::Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+use lib 't';
+use Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
                   set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 BEGIN { monkey_patch() }
diff --git a/cpan/HTTP-Tiny/t/103_delete.t b/cpan/HTTP-Tiny/t/103_delete.t
index cbda117452..66d345b698 100644
--- a/cpan/HTTP-Tiny/t/103_delete.t
+++ b/cpan/HTTP-Tiny/t/103_delete.t
@@ -5,7 +5,8 @@ use warnings;
 
 use File::Basename;
 use Test::More 0.88;
-use t::Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+use lib 't';
+use Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
                   set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 BEGIN { monkey_patch() }
diff --git a/cpan/HTTP-Tiny/t/104_post.t b/cpan/HTTP-Tiny/t/104_post.t
index 5dc518aa1f..9c765bd56b 100644
--- a/cpan/HTTP-Tiny/t/104_post.t
+++ b/cpan/HTTP-Tiny/t/104_post.t
@@ -5,7 +5,8 @@ use warnings;
 
 use File::Basename;
 use Test::More 0.88;
-use t::Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+use lib 't';
+use Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
                   set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 BEGIN { monkey_patch() }
diff --git a/cpan/HTTP-Tiny/t/110_mirror.t b/cpan/HTTP-Tiny/t/110_mirror.t
index 1fb400f478..de38fd128a 100644
--- a/cpan/HTTP-Tiny/t/110_mirror.t
+++ b/cpan/HTTP-Tiny/t/110_mirror.t
@@ -5,7 +5,8 @@ use warnings;
 
 use File::Basename;
 use Test::More 0.88;
-use t::Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+use lib 't';
+use Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
                   set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 use File::Temp qw/tempdir/;
diff --git a/cpan/HTTP-Tiny/t/130_redirect.t b/cpan/HTTP-Tiny/t/130_redirect.t
index 0f8f98df7f..cc8c15cd89 100644
--- a/cpan/HTTP-Tiny/t/130_redirect.t
+++ b/cpan/HTTP-Tiny/t/130_redirect.t
@@ -5,7 +5,8 @@ use warnings;
 
 use File::Basename;
 use Test::More 0.88;
-use t::Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+use lib 't';
+use Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
   hashify connect_args clear_socket_source set_socket_source sort_headers
   $CRLF $LF];
 
diff --git a/cpan/HTTP-Tiny/t/140_proxy.t b/cpan/HTTP-Tiny/t/140_proxy.t
index eda3d6f33a..c57977db8c 100644
--- a/cpan/HTTP-Tiny/t/140_proxy.t
+++ b/cpan/HTTP-Tiny/t/140_proxy.t
@@ -6,7 +6,8 @@ use warnings;
 use File::Basename;
 use Test::More 0.88;
 
-use t::Util qw[ monkey_patch ];
+use lib 't';
+use Util qw[ monkey_patch ];
 use HTTP::Tiny;
 
 BEGIN {
diff --git a/cpan/HTTP-Tiny/t/150_post_form.t b/cpan/HTTP-Tiny/t/150_post_form.t
index edb0601f73..790cbc0481 100644
--- a/cpan/HTTP-Tiny/t/150_post_form.t
+++ b/cpan/HTTP-Tiny/t/150_post_form.t
@@ -6,13 +6,15 @@ use open IN => ':raw';
 
 use File::Basename;
 use Test::More 0.88;
-use t::Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+use lib 't';
+use Util    qw[tmpfile rewind slurp monkey_patch dir_list parse_case
                   set_socket_source sort_headers $CRLF $LF];
 use HTTP::Tiny;
 BEGIN { monkey_patch() }
 
 for my $file ( dir_list("corpus", qr/^form/ ) ) {
   my $data = do { local (@ARGV,$/) = $file; <> };
+  $data =~ s/$CRLF/$LF/gm if $^O eq 'MSWin32';
   my ($params, $expect_req, $give_res) = split /--+\n/, $data;
   # cleanup source data
   my $version = HTTP::Tiny->VERSION || 0;
diff --git a/cpan/HTTP-Tiny/t/160_cookies.t b/cpan/HTTP-Tiny/t/160_cookies.t
index 1702fa32c4..03b9184fe1 100644
--- a/cpan/HTTP-Tiny/t/160_cookies.t
+++ b/cpan/HTTP-Tiny/t/160_cookies.t
@@ -5,14 +5,15 @@ use warnings;
 
 use File::Basename;
 use Test::More 0.96;
-use t::Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+use lib 't';
+use Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
   hashify connect_args clear_socket_source set_socket_source sort_headers
   $CRLF $LF];
 
 use HTTP::Tiny;
 BEGIN { monkey_patch() }
 
-SKIP: for my $class ( qw/t::SimpleCookieJar HTTP::CookieJar/ ) {
+SKIP: for my $class ( qw/SimpleCookieJar HTTP::CookieJar/ ) {
 
     subtest $class => sub {
         eval "require $class; 1"
@@ -23,7 +24,7 @@ SKIP: for my $class ( qw/t::SimpleCookieJar HTTP::CookieJar/ ) {
             my $data = do { local (@ARGV,$/) = $file; <> };
             my @cases = split /--+\n/, $data;
 
-            my $jar = t::SimpleCookieJar->new();
+            my $jar = SimpleCookieJar->new();
             my $http = undef;
             while (@cases) {
                 my ($params, $expect_req, $give_res) = splice( @cases, 0, 3 );
diff --git a/cpan/HTTP-Tiny/t/161_basic_auth.t b/cpan/HTTP-Tiny/t/161_basic_auth.t
index 3fd233da1d..379c5cca9e 100644
--- a/cpan/HTTP-Tiny/t/161_basic_auth.t
+++ b/cpan/HTTP-Tiny/t/161_basic_auth.t
@@ -5,7 +5,8 @@ use warnings;
 
 use File::Basename;
 use Test::More 0.88;
-use t::Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+use lib 't';
+use Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
   hashify connect_args clear_socket_source set_socket_source sort_headers
   $CRLF $LF];
 
diff --git a/cpan/HTTP-Tiny/t/162_proxy_auth.t b/cpan/HTTP-Tiny/t/162_proxy_auth.t
index 400c9d91ee..cf12e8873f 100644
--- a/cpan/HTTP-Tiny/t/162_proxy_auth.t
+++ b/cpan/HTTP-Tiny/t/162_proxy_auth.t
@@ -5,7 +5,8 @@ use warnings;
 
 use File::Basename;
 use Test::More 0.88;
-use t::Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
+use lib 't';
+use Util qw[tmpfile rewind slurp monkey_patch dir_list parse_case
   hashify connect_args clear_socket_source set_socket_source sort_headers
   $CRLF $LF];
 
diff --git a/cpan/HTTP-Tiny/t/170_keepalive.t b/cpan/HTTP-Tiny/t/170_keepalive.t
index 8b265120fe..02162ae175 100644
--- a/cpan/HTTP-Tiny/t/170_keepalive.t
+++ b/cpan/HTTP-Tiny/t/170_keepalive.t
@@ -4,7 +4,8 @@ use strict;
 use warnings;
 use File::Basename;
 use Test::More 0.88;
-use t::Util qw[
+use lib 't';
+use Util qw[
     tmpfile monkey_patch dir_list clear_socket_source set_socket_source
     $CRLF
 ];
diff --git a/cpan/HTTP-Tiny/t/BrokenCookieJar.pm b/cpan/HTTP-Tiny/t/BrokenCookieJar.pm
index f638e20336..3b7d45793c 100644
--- a/cpan/HTTP-Tiny/t/BrokenCookieJar.pm
+++ b/cpan/HTTP-Tiny/t/BrokenCookieJar.pm
@@ -1,4 +1,4 @@
-package t::BrokenCookieJar;
+package BrokenCookieJar;
 
 use strict;
 use warnings;
@@ -8,7 +8,7 @@ sub new {
     return bless {} => $class;
 }
 
-package t::BrokenCookieJar2;
+package BrokenCookieJar2;
 
 use strict;
 use warnings;
diff --git a/cpan/HTTP-Tiny/t/SimpleCookieJar.pm b/cpan/HTTP-Tiny/t/SimpleCookieJar.pm
index 4c8fe08312..a4ffed465e 100644
--- a/cpan/HTTP-Tiny/t/SimpleCookieJar.pm
+++ b/cpan/HTTP-Tiny/t/SimpleCookieJar.pm
@@ -1,4 +1,4 @@
-package t::SimpleCookieJar;
+package SimpleCookieJar;
 
 use strict;
 use warnings;
diff --git a/cpan/HTTP-Tiny/t/Util.pm b/cpan/HTTP-Tiny/t/Util.pm
index f75ca55ef6..2e85b04823 100644
--- a/cpan/HTTP-Tiny/t/Util.pm
+++ b/cpan/HTTP-Tiny/t/Util.pm
@@ -1,4 +1,4 @@
-package t::Util;
+package Util;
 
 use strict;
 use warnings;