In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/cc890588b0ce25c7e37126933582b6d944ad1584?hp=20e67ba160487a25d00c812a421df80232423b07>
- Log ----------------------------------------------------------------- commit cc890588b0ce25c7e37126933582b6d944ad1584 Author: Steve Hay <[email protected]> Date: Wed Aug 17 13:42:39 2016 +0100 Upgrade Time::Local from version 1.2300 to 1.24 M Porting/Maintainers.pl M cpan/Time-Local/lib/Time/Local.pm M cpan/Time-Local/t/Local.t commit 022600ced30df9b598f615787250bb16989bbf9f Author: Steve Hay <[email protected]> Date: Wed Aug 17 13:38:12 2016 +0100 Upgrade Test::Simple from version 1.302049 to 1.302052 M Porting/Maintainers.pl M cpan/Test-Simple/lib/Test/Builder.pm M cpan/Test-Simple/lib/Test/Builder/Formatter.pm M cpan/Test-Simple/lib/Test/Builder/Module.pm M cpan/Test-Simple/lib/Test/Builder/Tester.pm M cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm M cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm M cpan/Test-Simple/lib/Test/More.pm M cpan/Test-Simple/lib/Test/Simple.pm M cpan/Test-Simple/lib/Test/Tester.pm M cpan/Test-Simple/lib/Test/Tester/Capture.pm M cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm M cpan/Test-Simple/lib/Test/Tester/Delegate.pm M cpan/Test-Simple/lib/Test/use/ok.pm M cpan/Test-Simple/lib/Test2.pm M cpan/Test-Simple/lib/Test2/API.pm M cpan/Test-Simple/lib/Test2/API/Breakage.pm M cpan/Test-Simple/lib/Test2/API/Context.pm M cpan/Test-Simple/lib/Test2/API/Instance.pm M cpan/Test-Simple/lib/Test2/API/Stack.pm M cpan/Test-Simple/lib/Test2/Event.pm M cpan/Test-Simple/lib/Test2/Event/Bail.pm M cpan/Test-Simple/lib/Test2/Event/Diag.pm M cpan/Test-Simple/lib/Test2/Event/Exception.pm M cpan/Test-Simple/lib/Test2/Event/Generic.pm M cpan/Test-Simple/lib/Test2/Event/Info.pm M cpan/Test-Simple/lib/Test2/Event/Note.pm M cpan/Test-Simple/lib/Test2/Event/Ok.pm M cpan/Test-Simple/lib/Test2/Event/Plan.pm M cpan/Test-Simple/lib/Test2/Event/Skip.pm M cpan/Test-Simple/lib/Test2/Event/Subtest.pm M cpan/Test-Simple/lib/Test2/Event/Waiting.pm M cpan/Test-Simple/lib/Test2/Formatter.pm M cpan/Test-Simple/lib/Test2/Formatter/TAP.pm M cpan/Test-Simple/lib/Test2/Hub.pm M cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm M cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm M cpan/Test-Simple/lib/Test2/Hub/Subtest.pm M cpan/Test-Simple/lib/Test2/IPC.pm M cpan/Test-Simple/lib/Test2/IPC/Driver.pm M cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm M cpan/Test-Simple/lib/Test2/Util.pm M cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm M cpan/Test-Simple/lib/Test2/Util/HashBase.pm M cpan/Test-Simple/lib/Test2/Util/Trace.pm M cpan/Test-Simple/lib/ok.pm M cpan/Test-Simple/t/Test2/modules/API.t commit c0b43f5c5aa78307caec8de7ee3716f66690426d Author: Steve Hay <[email protected]> Date: Wed Aug 17 13:34:12 2016 +0100 Upgrade HTTP::Tiny from version 0.058_001 to 0.064 M MANIFEST M Porting/Maintainers.pl M cpan/HTTP-Tiny/lib/HTTP/Tiny.pm M cpan/HTTP-Tiny/t/002_croakage.t A cpan/HTTP-Tiny/t/004_timeout.t M cpan/HTTP-Tiny/t/020_headers.t M cpan/HTTP-Tiny/t/030_response.t M cpan/HTTP-Tiny/t/040_content.t M cpan/HTTP-Tiny/t/050_chunked_body.t M cpan/HTTP-Tiny/t/070_cookie_jar.t M cpan/HTTP-Tiny/t/100_get.t M cpan/HTTP-Tiny/t/101_head.t M cpan/HTTP-Tiny/t/102_put.t M cpan/HTTP-Tiny/t/103_delete.t M cpan/HTTP-Tiny/t/104_post.t M cpan/HTTP-Tiny/t/110_mirror.t M cpan/HTTP-Tiny/t/130_redirect.t M cpan/HTTP-Tiny/t/140_proxy.t M cpan/HTTP-Tiny/t/150_post_form.t M cpan/HTTP-Tiny/t/160_cookies.t M cpan/HTTP-Tiny/t/161_basic_auth.t M cpan/HTTP-Tiny/t/162_proxy_auth.t M cpan/HTTP-Tiny/t/170_keepalive.t M cpan/HTTP-Tiny/t/BrokenCookieJar.pm M cpan/HTTP-Tiny/t/SimpleCookieJar.pm M cpan/HTTP-Tiny/t/Util.pm M t/porting/customized.dat commit ac1690b90a8bfd067c1b33aaf50ed549835da4dd Author: Steve Hay <[email protected]> Date: Wed Aug 17 13:27:05 2016 +0100 Upgrade File::Fetch from version 0.50 to 0.52 M Porting/Maintainers.pl M cpan/File-Fetch/lib/File/Fetch.pm M cpan/File-Fetch/t/01_File-Fetch.t ----------------------------------------------------------------------- Summary of changes: MANIFEST | 1 + Porting/Maintainers.pl | 23 +- cpan/File-Fetch/lib/File/Fetch.pm | 2 +- cpan/File-Fetch/t/01_File-Fetch.t | 11 +- cpan/HTTP-Tiny/lib/HTTP/Tiny.pm | 33 ++- cpan/HTTP-Tiny/t/002_croakage.t | 3 +- cpan/HTTP-Tiny/t/004_timeout.t | 38 +++ cpan/HTTP-Tiny/t/020_headers.t | 3 +- cpan/HTTP-Tiny/t/030_response.t | 3 +- cpan/HTTP-Tiny/t/040_content.t | 3 +- cpan/HTTP-Tiny/t/050_chunked_body.t | 36 ++- cpan/HTTP-Tiny/t/070_cookie_jar.t | 11 +- cpan/HTTP-Tiny/t/100_get.t | 3 +- cpan/HTTP-Tiny/t/101_head.t | 3 +- cpan/HTTP-Tiny/t/102_put.t | 3 +- cpan/HTTP-Tiny/t/103_delete.t | 3 +- cpan/HTTP-Tiny/t/104_post.t | 3 +- cpan/HTTP-Tiny/t/110_mirror.t | 3 +- cpan/HTTP-Tiny/t/130_redirect.t | 3 +- cpan/HTTP-Tiny/t/140_proxy.t | 3 +- cpan/HTTP-Tiny/t/150_post_form.t | 4 +- cpan/HTTP-Tiny/t/160_cookies.t | 7 +- cpan/HTTP-Tiny/t/161_basic_auth.t | 3 +- cpan/HTTP-Tiny/t/162_proxy_auth.t | 3 +- cpan/HTTP-Tiny/t/170_keepalive.t | 3 +- cpan/HTTP-Tiny/t/BrokenCookieJar.pm | 4 +- cpan/HTTP-Tiny/t/SimpleCookieJar.pm | 2 +- cpan/HTTP-Tiny/t/Util.pm | 2 +- cpan/Test-Simple/lib/Test/Builder.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Formatter.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Module.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Tester.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm | 2 +- cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm | 2 +- cpan/Test-Simple/lib/Test/More.pm | 2 +- cpan/Test-Simple/lib/Test/Simple.pm | 2 +- cpan/Test-Simple/lib/Test/Tester.pm | 2 +- cpan/Test-Simple/lib/Test/Tester/Capture.pm | 2 +- cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm | 2 +- cpan/Test-Simple/lib/Test/Tester/Delegate.pm | 2 +- cpan/Test-Simple/lib/Test/use/ok.pm | 2 +- cpan/Test-Simple/lib/Test2.pm | 10 +- cpan/Test-Simple/lib/Test2/API.pm | 4 +- cpan/Test-Simple/lib/Test2/API/Breakage.pm | 2 +- cpan/Test-Simple/lib/Test2/API/Context.pm | 2 +- cpan/Test-Simple/lib/Test2/API/Instance.pm | 2 +- cpan/Test-Simple/lib/Test2/API/Stack.pm | 2 +- cpan/Test-Simple/lib/Test2/Event.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Bail.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Diag.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Exception.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Generic.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Info.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Note.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Ok.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Plan.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Skip.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Subtest.pm | 2 +- cpan/Test-Simple/lib/Test2/Event/Waiting.pm | 2 +- cpan/Test-Simple/lib/Test2/Formatter.pm | 2 +- cpan/Test-Simple/lib/Test2/Formatter/TAP.pm | 2 +- cpan/Test-Simple/lib/Test2/Hub.pm | 2 +- cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm | 2 +- .../lib/Test2/Hub/Interceptor/Terminator.pm | 2 +- cpan/Test-Simple/lib/Test2/Hub/Subtest.pm | 2 +- cpan/Test-Simple/lib/Test2/IPC.pm | 2 +- cpan/Test-Simple/lib/Test2/IPC/Driver.pm | 2 +- cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm | 2 +- cpan/Test-Simple/lib/Test2/Util.pm | 2 +- cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm | 2 +- cpan/Test-Simple/lib/Test2/Util/HashBase.pm | 2 +- cpan/Test-Simple/lib/Test2/Util/Trace.pm | 2 +- cpan/Test-Simple/lib/ok.pm | 2 +- cpan/Test-Simple/t/Test2/modules/API.t | 8 + cpan/Time-Local/lib/Time/Local.pm | 304 +++++++++++---------- cpan/Time-Local/t/Local.t | 300 +++++++++++--------- t/porting/customized.dat | 1 - 77 files changed, 551 insertions(+), 381 deletions(-) create mode 100644 cpan/HTTP-Tiny/t/004_timeout.t diff --git a/MANIFEST b/MANIFEST index 4eceaeb..34b34e6 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1309,6 +1309,7 @@ cpan/HTTP-Tiny/t/000_load.t cpan/HTTP-Tiny/t/001_api.t cpan/HTTP-Tiny/t/002_croakage.t cpan/HTTP-Tiny/t/003_agent.t +cpan/HTTP-Tiny/t/004_timeout.t cpan/HTTP-Tiny/t/010_url.t cpan/HTTP-Tiny/t/020_headers.t cpan/HTTP-Tiny/t/030_response.t diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 58a74b6..a4e477a 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -508,7 +508,7 @@ use File::Glob qw(:case); }, 'File::Fetch' => { - 'DISTRIBUTION' => 'BINGOS/File-Fetch-0.50.tar.gz', + 'DISTRIBUTION' => 'BINGOS/File-Fetch-0.52.tar.gz', 'FILES' => q[cpan/File-Fetch], }, @@ -592,7 +592,7 @@ use File::Glob qw(:case); }, 'HTTP::Tiny' => { - 'DISTRIBUTION' => 'DAGOLDEN/HTTP-Tiny-0.058.tar.gz', + 'DISTRIBUTION' => 'DAGOLDEN/HTTP-Tiny-0.064.tar.gz', 'FILES' => q[cpan/HTTP-Tiny], 'EXCLUDED' => [ 't/00-report-prereqs.t', @@ -603,10 +603,6 @@ use File::Glob qw(:case); qr/^eg/, qr/^xt/ ], - 'CUSTOMIZED' => [ - # CVE-2016-1238 - qw( lib/HTTP/Tiny.pm ) - ], }, 'I18N::Collate' => { @@ -1172,12 +1168,13 @@ use File::Glob qw(:case); }, 'Test::Simple' => { - 'DISTRIBUTION' => 'EXODIST/Test-Simple-1.302049.tar.gz', + 'DISTRIBUTION' => 'EXODIST/Test-Simple-1.302052.tar.gz', 'FILES' => q[cpan/Test-Simple], 'EXCLUDED' => [ qr{^examples/}, qr{^xt/}, - qw( perltidyrc + qw( appveyor.yml + perltidyrc t/00compile.t t/00-report.t t/zzz-check-breaks.t @@ -1289,10 +1286,16 @@ use File::Glob qw(:case); }, 'Time::Local' => { - 'DISTRIBUTION' => 'DROLSKY/Time-Local-1.2300.tar.gz', + 'DISTRIBUTION' => 'DROLSKY/Time-Local-1.24.tar.gz', 'FILES' => q[cpan/Time-Local], 'EXCLUDED' => [ - qr{^t/release-.*\.t}, + qr{^xt/}, + qw( perlcriticrc + perltidyrc + tidyall.ini + t/00-report-prereqs.t + t/00-report-prereqs.dd + ), ], }, diff --git a/cpan/File-Fetch/lib/File/Fetch.pm b/cpan/File-Fetch/lib/File/Fetch.pm index 108e658..acfa442 100644 --- a/cpan/File-Fetch/lib/File/Fetch.pm +++ b/cpan/File-Fetch/lib/File/Fetch.pm @@ -22,7 +22,7 @@ use vars qw[ $VERBOSE $PREFER_BIN $FROM_EMAIL $USER_AGENT $FTP_PASSIVE $TIMEOUT $DEBUG $WARN $FORCEIPV4 ]; -$VERSION = '0.50'; +$VERSION = '0.52'; $VERSION = eval $VERSION; # avoid warnings with development releases $PREFER_BIN = 0; # XXX TODO implement $FROM_EMAIL = '[email protected]'; diff --git a/cpan/File-Fetch/t/01_File-Fetch.t b/cpan/File-Fetch/t/01_File-Fetch.t index 76efd11..379ada9 100644 --- a/cpan/File-Fetch/t/01_File-Fetch.t +++ b/cpan/File-Fetch/t/01_File-Fetch.t @@ -65,10 +65,10 @@ my @map = ( path => '/CPAN/', file => 'MIRRORING.FROM', }, - { uri => 'git://github.com/jib/file-fetch.git', + { uri => 'git://github.com/Perl-Toolchain-Gang/file-fetch.git', scheme => 'git', host => 'github.com', - path => '/jib/', + path => '/Perl-Toolchain-Gang/', file => 'file-fetch.git', }, { uri => 'http://localhost/tmp/index.txt', @@ -203,7 +203,7 @@ for my $entry (@map) { { for my $uri ( 'http://www.cpan.org/index.html', 'http://www.cpan.org/index.html?q=1', 'http://www.cpan.org/index.html?q=1&y=2', - 'http://user:[email protected]/basic-auth/user/passwd', + #'http://user:[email protected]/basic-auth/user/passwd', ) { for (qw[lwp httptiny wget curl lftp fetch lynx httplite iosock]) { _fetch_uri( http => $uri, $_ ); @@ -234,9 +234,12 @@ for my $entry (@map) { } ### git:// tests ### -{ my $uri = 'git://github.com/jib/file-fetch.git'; +{ my $uri = 'git://github.com/Perl-Toolchain-Gang/file-fetch.git'; for (qw[git]) { + local $ENV{GIT_CONFIG_NOSYSTEM} = 1; + local $ENV{XDG_CONFIG_HOME}; + local $ENV{HOME}; _fetch_uri( git => $uri, $_ ); } } diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm index 03395e8..de07e2a 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 <[email protected]> =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 Je ... [210 chars truncated] +=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 Je ... [241 chars truncated] =over 4 @@ -2332,6 +2345,10 @@ Jess Robinson <[email protected]> =item * +Karen Etheridge <[email protected]> + +=item * + Lukas Eklund <[email protected]> =item * @@ -2368,6 +2385,10 @@ Sören Kornetzki <[email protected]> =item * +Steve Grazzini <[email protected]> + +=item * + Syohei YOSHIDA <[email protected]> =item * diff --git a/cpan/HTTP-Tiny/t/002_croakage.t b/cpan/HTTP-Tiny/t/002_croakage.t index 9e51b5d..ac3c8b9 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 0000000..95f9bd4 --- /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 c10e075..a4254e5 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 fc72a3a..e519a62 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 64e432e..b7406de 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 b555b00..7aff9e0 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 bd09a54..f62c481 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 43cf52e..5dbf3e8 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 7a2e6ce..ace0745 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 42f3ed9..2fe3626 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 cbda117..66d345b 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 5dc518a..9c765bd 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 1fb400f..de38fd1 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 0f8f98d..cc8c15c 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 eda3d6f..c57977d 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 edb0601..790cbc0 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 1702fa3..03b9184 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 3fd233d..379c5cc 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 400c9d9..cf12e88 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 8b26512..02162ae 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 f638e20..3b7d457 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 4c8fe08..a4ffed4 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 f75ca55..2e85b04 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; diff --git a/cpan/Test-Simple/lib/Test/Builder.pm b/cpan/Test-Simple/lib/Test/Builder.pm index 09e0f1e..1480419 100644 --- a/cpan/Test-Simple/lib/Test/Builder.pm +++ b/cpan/Test-Simple/lib/Test/Builder.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { if( $] < 5.008 ) { diff --git a/cpan/Test-Simple/lib/Test/Builder/Formatter.pm b/cpan/Test-Simple/lib/Test/Builder/Formatter.pm index b4d7b9a..24e8daf 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Formatter.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Formatter.pm @@ -2,7 +2,7 @@ package Test::Builder::Formatter; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Formatter::TAP; our @ISA = qw(Test2::Formatter::TAP) } diff --git a/cpan/Test-Simple/lib/Test/Builder/Module.pm b/cpan/Test-Simple/lib/Test/Builder/Module.pm index 511e5e4..f46a7b4 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Module.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Module.pm @@ -7,7 +7,7 @@ use Test::Builder; require Exporter; our @ISA = qw(Exporter); -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; =head1 NAME diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester.pm b/cpan/Test-Simple/lib/Test/Builder/Tester.pm index cce4461..4622d5f 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Tester.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Tester.pm @@ -1,7 +1,7 @@ package Test::Builder::Tester; use strict; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test::Builder; use Symbol; diff --git a/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm b/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm index 228bded..3f151ff 100644 --- a/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm +++ b/cpan/Test-Simple/lib/Test/Builder/Tester/Color.pm @@ -1,7 +1,7 @@ package Test::Builder::Tester::Color; use strict; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; require Test::Builder::Tester; diff --git a/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm b/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm index afeb6bf..4f7c859 100644 --- a/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm +++ b/cpan/Test-Simple/lib/Test/Builder/TodoDiag.pm @@ -2,7 +2,7 @@ package Test::Builder::TodoDiag; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event::Diag; our @ISA = qw(Test2::Event::Diag) } diff --git a/cpan/Test-Simple/lib/Test/More.pm b/cpan/Test-Simple/lib/Test/More.pm index e1e3db3..2051993 100644 --- a/cpan/Test-Simple/lib/Test/More.pm +++ b/cpan/Test-Simple/lib/Test/More.pm @@ -17,7 +17,7 @@ sub _carp { return warn @_, " at $file line $line\n"; } -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test::Builder::Module; our @ISA = qw(Test::Builder::Module); diff --git a/cpan/Test-Simple/lib/Test/Simple.pm b/cpan/Test-Simple/lib/Test/Simple.pm index 3f27580..54f51a0 100644 --- a/cpan/Test-Simple/lib/Test/Simple.pm +++ b/cpan/Test-Simple/lib/Test/Simple.pm @@ -4,7 +4,7 @@ use 5.006; use strict; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test::Builder::Module; our @ISA = qw(Test::Builder::Module); diff --git a/cpan/Test-Simple/lib/Test/Tester.pm b/cpan/Test-Simple/lib/Test/Tester.pm index 4fd23bd..7efacdf 100644 --- a/cpan/Test-Simple/lib/Test/Tester.pm +++ b/cpan/Test-Simple/lib/Test/Tester.pm @@ -18,7 +18,7 @@ require Exporter; use vars qw( @ISA @EXPORT ); -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; @EXPORT = qw( run_tests check_tests check_test cmp_results show_space ); @ISA = qw( Exporter ); diff --git a/cpan/Test-Simple/lib/Test/Tester/Capture.pm b/cpan/Test-Simple/lib/Test/Tester/Capture.pm index cccbf3a..abba76a 100644 --- a/cpan/Test-Simple/lib/Test/Tester/Capture.pm +++ b/cpan/Test-Simple/lib/Test/Tester/Capture.pm @@ -2,7 +2,7 @@ use strict; package Test::Tester::Capture; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test::Builder; diff --git a/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm b/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm index 317830d..23c6585 100644 --- a/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm +++ b/cpan/Test-Simple/lib/Test/Tester/CaptureRunner.pm @@ -3,7 +3,7 @@ use strict; package Test::Tester::CaptureRunner; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test::Tester::Capture; diff --git a/cpan/Test-Simple/lib/Test/Tester/Delegate.pm b/cpan/Test-Simple/lib/Test/Tester/Delegate.pm index 6d988f1..86f9ac4 100644 --- a/cpan/Test-Simple/lib/Test/Tester/Delegate.pm +++ b/cpan/Test-Simple/lib/Test/Tester/Delegate.pm @@ -3,7 +3,7 @@ use warnings; package Test::Tester::Delegate; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use vars '$AUTOLOAD'; diff --git a/cpan/Test-Simple/lib/Test/use/ok.pm b/cpan/Test-Simple/lib/Test/use/ok.pm index 684d908..52194bc 100644 --- a/cpan/Test-Simple/lib/Test/use/ok.pm +++ b/cpan/Test-Simple/lib/Test/use/ok.pm @@ -1,7 +1,7 @@ package Test::use::ok; use 5.005; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; __END__ diff --git a/cpan/Test-Simple/lib/Test2.pm b/cpan/Test-Simple/lib/Test2.pm index 9d7bb32..e6c46bc 100644 --- a/cpan/Test-Simple/lib/Test2.pm +++ b/cpan/Test-Simple/lib/Test2.pm @@ -2,7 +2,7 @@ package Test2; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; 1; @@ -124,6 +124,14 @@ L<Test2::Event> - Events live in this namespace. L<Test2::Hub> - All events eventually funnel through a hub. Custom hubs are how C<intercept()> and C<run_subtest()> are implemented. +=head1 CONTACTING US + +Many Test2 developers and users lurk on L<irc://irc.perl.org/#perl>. We also +have a slack team that can be joined by anyone with an C<@cpan.org> email +address L<https://perl-test2.slack.com/> If you do not have an C<@cpan.org> +email you can ask for a slack invite by emailing Chad Granum +E<lt>[email protected]<gt>. + =head1 SOURCE The source code repository for Test2 can be found at diff --git a/cpan/Test-Simple/lib/Test2/API.pm b/cpan/Test-Simple/lib/Test2/API.pm index 418ad85..23a62da 100644 --- a/cpan/Test-Simple/lib/Test2/API.pm +++ b/cpan/Test-Simple/lib/Test2/API.pm @@ -2,7 +2,7 @@ package Test2::API; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; my $INST; @@ -217,7 +217,7 @@ sub context { unless defined wantarray; my $stack = $params{stack} || $STACK; - my $hub = $params{hub} || @$stack ? $stack->[-1] : $stack->top; + my $hub = $params{hub} || (@$stack ? $stack->[-1] : $stack->top); my $hid = $hub->{hid}; my $current = $CONTEXTS->{$hid}; diff --git a/cpan/Test-Simple/lib/Test2/API/Breakage.pm b/cpan/Test-Simple/lib/Test2/API/Breakage.pm index 0fd4898..ba633d5 100644 --- a/cpan/Test-Simple/lib/Test2/API/Breakage.pm +++ b/cpan/Test-Simple/lib/Test2/API/Breakage.pm @@ -2,7 +2,7 @@ package Test2::API::Breakage; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test2::Util qw/pkg_to_file/; diff --git a/cpan/Test-Simple/lib/Test2/API/Context.pm b/cpan/Test-Simple/lib/Test2/API/Context.pm index d6de0e2..a9f217c 100644 --- a/cpan/Test-Simple/lib/Test2/API/Context.pm +++ b/cpan/Test-Simple/lib/Test2/API/Context.pm @@ -2,7 +2,7 @@ package Test2::API::Context; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Carp qw/confess croak longmess/; diff --git a/cpan/Test-Simple/lib/Test2/API/Instance.pm b/cpan/Test-Simple/lib/Test2/API/Instance.pm index a24de44..4bf2396 100644 --- a/cpan/Test-Simple/lib/Test2/API/Instance.pm +++ b/cpan/Test-Simple/lib/Test2/API/Instance.pm @@ -2,7 +2,7 @@ package Test2::API::Instance; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; our @CARP_NOT = qw/Test2::API Test2::API::Instance Test2::IPC::Driver Test2::Formatter/; diff --git a/cpan/Test-Simple/lib/Test2/API/Stack.pm b/cpan/Test-Simple/lib/Test2/API/Stack.pm index 766ce3d..a24a2a6 100644 --- a/cpan/Test-Simple/lib/Test2/API/Stack.pm +++ b/cpan/Test-Simple/lib/Test2/API/Stack.pm @@ -2,7 +2,7 @@ package Test2::API::Stack; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test2::Hub(); diff --git a/cpan/Test-Simple/lib/Test2/Event.pm b/cpan/Test-Simple/lib/Test2/Event.pm index 0da8163..0d58802 100644 --- a/cpan/Test-Simple/lib/Test2/Event.pm +++ b/cpan/Test-Simple/lib/Test2/Event.pm @@ -2,7 +2,7 @@ package Test2::Event; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test2::Util::HashBase qw/trace nested in_subtest subtest_id/; diff --git a/cpan/Test-Simple/lib/Test2/Event/Bail.pm b/cpan/Test-Simple/lib/Test2/Event/Bail.pm index d52524a..47ce309 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Bail.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Bail.pm @@ -2,7 +2,7 @@ package Test2::Event::Bail; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Diag.pm b/cpan/Test-Simple/lib/Test2/Event/Diag.pm index c5a123e..df5b702 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Diag.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Diag.pm @@ -2,7 +2,7 @@ package Test2::Event::Diag; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Exception.pm b/cpan/Test-Simple/lib/Test2/Event/Exception.pm index 7e07579..a1e9e09 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Exception.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Exception.pm @@ -2,7 +2,7 @@ package Test2::Event::Exception; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Generic.pm b/cpan/Test-Simple/lib/Test2/Event/Generic.pm index 8d22712..d7b7a0c 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Generic.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Generic.pm @@ -5,7 +5,7 @@ use warnings; use Carp qw/croak/; use Scalar::Util qw/reftype/; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } use Test2::Util::HashBase; diff --git a/cpan/Test-Simple/lib/Test2/Event/Info.pm b/cpan/Test-Simple/lib/Test2/Event/Info.pm index ba4a289..481f2eb 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Info.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Info.pm @@ -4,7 +4,7 @@ use warnings; use Scalar::Util qw/blessed/; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } use Test2::Util::HashBase qw/diagnostics renderer/; diff --git a/cpan/Test-Simple/lib/Test2/Event/Note.pm b/cpan/Test-Simple/lib/Test2/Event/Note.pm index 71ed4ee..9f7ad73 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Note.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Note.pm @@ -2,7 +2,7 @@ package Test2::Event::Note; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Ok.pm b/cpan/Test-Simple/lib/Test2/Event/Ok.pm index cf9190d..c9a43e7 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Ok.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Ok.pm @@ -2,7 +2,7 @@ package Test2::Event::Ok; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Plan.pm b/cpan/Test-Simple/lib/Test2/Event/Plan.pm index 841360c..63b222b 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Plan.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Plan.pm @@ -2,7 +2,7 @@ package Test2::Event::Plan; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Skip.pm b/cpan/Test-Simple/lib/Test2/Event/Skip.pm index 2184d5b..0dd5037 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Skip.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Skip.pm @@ -2,7 +2,7 @@ package Test2::Event::Skip; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event::Ok; our @ISA = qw(Test2::Event::Ok) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Subtest.pm b/cpan/Test-Simple/lib/Test2/Event/Subtest.pm index e56fd47..f28bb2f 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Subtest.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Subtest.pm @@ -2,7 +2,7 @@ package Test2::Event::Subtest; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event::Ok; our @ISA = qw(Test2::Event::Ok) } diff --git a/cpan/Test-Simple/lib/Test2/Event/Waiting.pm b/cpan/Test-Simple/lib/Test2/Event/Waiting.pm index db97e5d..1277416 100644 --- a/cpan/Test-Simple/lib/Test2/Event/Waiting.pm +++ b/cpan/Test-Simple/lib/Test2/Event/Waiting.pm @@ -2,7 +2,7 @@ package Test2::Event::Waiting; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Event; our @ISA = qw(Test2::Event) } diff --git a/cpan/Test-Simple/lib/Test2/Formatter.pm b/cpan/Test-Simple/lib/Test2/Formatter.pm index bf019cb..aa667ed 100644 --- a/cpan/Test-Simple/lib/Test2/Formatter.pm +++ b/cpan/Test-Simple/lib/Test2/Formatter.pm @@ -2,7 +2,7 @@ package Test2::Formatter; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; my %ADDED; diff --git a/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm b/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm index 3500484..642821e 100644 --- a/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm +++ b/cpan/Test-Simple/lib/Test2/Formatter/TAP.pm @@ -3,7 +3,7 @@ use strict; use warnings; require PerlIO; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test2::Util::HashBase qw{ diff --git a/cpan/Test-Simple/lib/Test2/Hub.pm b/cpan/Test-Simple/lib/Test2/Hub.pm index dd28af4..c68f15f 100644 --- a/cpan/Test-Simple/lib/Test2/Hub.pm +++ b/cpan/Test-Simple/lib/Test2/Hub.pm @@ -2,7 +2,7 @@ package Test2::Hub; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Carp qw/carp croak confess/; diff --git a/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm b/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm index 5eb9501..2a6e475 100644 --- a/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm +++ b/cpan/Test-Simple/lib/Test2/Hub/Interceptor.pm @@ -2,7 +2,7 @@ package Test2::Hub::Interceptor; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test2::Hub::Interceptor::Terminator(); diff --git a/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm b/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm index 3394072..1cedfae 100644 --- a/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm +++ b/cpan/Test-Simple/lib/Test2/Hub/Interceptor/Terminator.pm @@ -2,7 +2,7 @@ package Test2::Hub::Interceptor::Terminator; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; 1; diff --git a/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm b/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm index e44f15d..5a84e82 100644 --- a/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm +++ b/cpan/Test-Simple/lib/Test2/Hub/Subtest.pm @@ -2,7 +2,7 @@ package Test2::Hub::Subtest; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::Hub; our @ISA = qw(Test2::Hub) } diff --git a/cpan/Test-Simple/lib/Test2/IPC.pm b/cpan/Test-Simple/lib/Test2/IPC.pm index 96e5b16..7e5af9c 100644 --- a/cpan/Test-Simple/lib/Test2/IPC.pm +++ b/cpan/Test-Simple/lib/Test2/IPC.pm @@ -2,7 +2,7 @@ package Test2::IPC; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test2::API::Instance; diff --git a/cpan/Test-Simple/lib/Test2/IPC/Driver.pm b/cpan/Test-Simple/lib/Test2/IPC/Driver.pm index cf765ee..e889cd9 100644 --- a/cpan/Test-Simple/lib/Test2/IPC/Driver.pm +++ b/cpan/Test-Simple/lib/Test2/IPC/Driver.pm @@ -2,7 +2,7 @@ package Test2::IPC::Driver; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Carp qw/confess longmess/; diff --git a/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm b/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm index 9ace1c4..344e9e4 100644 --- a/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm +++ b/cpan/Test-Simple/lib/Test2/IPC/Driver/Files.pm @@ -2,7 +2,7 @@ package Test2::IPC::Driver::Files; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; BEGIN { require Test2::IPC::Driver; our @ISA = qw(Test2::IPC::Driver) } diff --git a/cpan/Test-Simple/lib/Test2/Util.pm b/cpan/Test-Simple/lib/Test2/Util.pm index c730c04..268a4b0 100644 --- a/cpan/Test-Simple/lib/Test2/Util.pm +++ b/cpan/Test-Simple/lib/Test2/Util.pm @@ -2,7 +2,7 @@ package Test2::Util; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Config qw/%Config/; diff --git a/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm b/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm index 221544e..31972c6 100644 --- a/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm +++ b/cpan/Test-Simple/lib/Test2/Util/ExternalMeta.pm @@ -2,7 +2,7 @@ package Test2::Util::ExternalMeta; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Carp qw/croak/; diff --git a/cpan/Test-Simple/lib/Test2/Util/HashBase.pm b/cpan/Test-Simple/lib/Test2/Util/HashBase.pm index aa95c02..c91d1c7 100644 --- a/cpan/Test-Simple/lib/Test2/Util/HashBase.pm +++ b/cpan/Test-Simple/lib/Test2/Util/HashBase.pm @@ -2,7 +2,7 @@ package Test2::Util::HashBase; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; require Carp; diff --git a/cpan/Test-Simple/lib/Test2/Util/Trace.pm b/cpan/Test-Simple/lib/Test2/Util/Trace.pm index 5e13d65..6654589 100644 --- a/cpan/Test-Simple/lib/Test2/Util/Trace.pm +++ b/cpan/Test-Simple/lib/Test2/Util/Trace.pm @@ -2,7 +2,7 @@ package Test2::Util::Trace; use strict; use warnings; -our $VERSION = '1.302049'; +our $VERSION = '1.302052'; use Test2::Util qw/get_tid/; diff --git a/cpan/Test-Simple/lib/ok.pm b/cpan/Test-Simple/lib/ok.pm index b0d3441..7ee3ae9 100644 --- a/cpan/Test-Simple/lib/ok.pm +++ b/cpan/Test-Simple/lib/ok.pm @@ -1,5 +1,5 @@ package ok; -$ok::VERSION = '1.302049'; +$ok::VERSION = '1.302052'; use strict; use Test::More (); diff --git a/cpan/Test-Simple/t/Test2/modules/API.t b/cpan/Test-Simple/t/Test2/modules/API.t index c916d2a..c206c04 100644 --- a/cpan/Test-Simple/t/Test2/modules/API.t +++ b/cpan/Test-Simple/t/Test2/modules/API.t @@ -236,6 +236,14 @@ sub { }->(); +sub { + my $hub = Test2::Hub->new(); + my $ctx = context(hub => $hub); + is($ctx->hub,$hub, 'got the hub of context() argument'); + $ctx->release; +}->(); + + my $sub = sub { }; Test2::API::test2_add_callback_context_acquire($sub); diff --git a/cpan/Time-Local/lib/Time/Local.pm b/cpan/Time-Local/lib/Time/Local.pm index ecdedef..6073940 100644 --- a/cpan/Time-Local/lib/Time/Local.pm +++ b/cpan/Time-Local/lib/Time/Local.pm @@ -1,16 +1,17 @@ package Time::Local; -require Exporter; +use strict; + use Carp; use Config; -use strict; +use Exporter; + +our $VERSION = '1.24'; -use vars qw( $VERSION @ISA @EXPORT @EXPORT_OK ); -$VERSION = '1.2300'; +use parent 'Exporter'; -@ISA = qw( Exporter ); -@EXPORT = qw( timegm timelocal ); -@EXPORT_OK = qw( timegm_nocheck timelocal_nocheck ); +our @EXPORT = qw( timegm timelocal ); +our @EXPORT_OK = qw( timegm_nocheck timelocal_nocheck ); my @MonthDays = ( 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ); @@ -29,9 +30,10 @@ use constant SECS_PER_HOUR => 3600; use constant SECS_PER_DAY => 86400; my $MaxDay; -if ($] < 5.012000) { +if ( $] < 5.012000 ) { my $MaxInt; if ( $^O eq 'MacOS' ) { + # time_t is unsigned... $MaxInt = ( 1 << ( 8 * $Config{ivsize} ) ) - 1; } @@ -43,22 +45,23 @@ if ($] < 5.012000) { } else { # recent localtime()'s limit is the year 2**31 - $MaxDay = 365 * (2**31); + $MaxDay = 365 * ( 2**31 ); } # Determine the EPOC day for this machine my $Epoc = 0; if ( $^O eq 'vos' ) { + # work around posix-977 -- VOS doesn't handle dates in the range # 1970-1980. $Epoc = _daygm( 0, 0, 0, 1, 0, 70, 4, 0 ); } elsif ( $^O eq 'MacOS' ) { - $MaxDay *=2 if $^O eq 'MacOS'; # time_t unsigned ... quick hack? - # MacOS time() is seconds since 1 Jan 1904, localtime - # so we need to calculate an offset to apply later - $Epoc = 693901; - $SecOff = timelocal( localtime(0)) - timelocal( gmtime(0) ) ; + $MaxDay *= 2 if $^O eq 'MacOS'; # time_t unsigned ... quick hack? + # MacOS time() is seconds since 1 Jan 1904, localtime + # so we need to calculate an offset to apply later + $Epoc = 693901; + $SecOff = timelocal( localtime(0) ) - timelocal( gmtime(0) ); $Epoc += _daygm( gmtime(0) ); } else { @@ -74,22 +77,23 @@ sub _daygm { return $_[3] + ( $Cheat{ pack( 'ss', @_[ 4, 5 ] ) } ||= do { my $month = ( $_[4] + 10 ) % 12; - my $year = $_[5] + 1900 - int($month / 10); + my $year = $_[5] + 1900 - int( $month / 10 ); ( ( 365 * $year ) - + int( $year / 4 ) - - int( $year / 100 ) - + int( $year / 400 ) - + int( ( ( $month * 306 ) + 5 ) / 10 ) - ) - - $Epoc; - } + + int( $year / 4 ) + - int( $year / 100 ) + + int( $year / 400 ) + + int( ( ( $month * 306 ) + 5 ) / 10 ) ) + - $Epoc; + } ); } sub _timegm { - my $sec = - $SecOff + $_[0] + ( SECS_PER_MINUTE * $_[1] ) + ( SECS_PER_HOUR * $_[2] ); + my $sec + = $SecOff + $_[0] + + ( SECS_PER_MINUTE * $_[1] ) + + ( SECS_PER_HOUR * $_[2] ); return $sec + ( SECS_PER_DAY * &_daygm ); } @@ -109,7 +113,7 @@ sub timegm { if $month > 11 or $month < 0; - my $md = $MonthDays[$month]; + my $md = $MonthDays[$month]; ++$md if $month == 1 && _is_leap_year( $year + 1900 ); @@ -121,21 +125,22 @@ sub timegm { my $days = _daygm( undef, undef, undef, $mday, $month, $year ); - unless ($Options{no_range_check} or abs($days) < $MaxDay) { - my $msg = ''; + unless ( $Options{no_range_check} or abs($days) < $MaxDay ) { + my $msg = q{}; $msg .= "Day too big - $days > $MaxDay\n" if $days > $MaxDay; $year += 1900; - $msg .= "Cannot handle date ($sec, $min, $hour, $mday, $month, $year)"; + $msg + .= "Cannot handle date ($sec, $min, $hour, $mday, $month, $year)"; croak $msg; } - return $sec - + $SecOff - + ( SECS_PER_MINUTE * $min ) - + ( SECS_PER_HOUR * $hour ) - + ( SECS_PER_DAY * $days ); + return + $sec + $SecOff + + ( SECS_PER_MINUTE * $min ) + + ( SECS_PER_HOUR * $hour ) + + ( SECS_PER_DAY * $days ); } sub _is_leap_year { @@ -152,7 +157,7 @@ sub timegm_nocheck { } sub timelocal { - my $ref_t = &timegm; + my $ref_t = &timegm; my $loc_for_ref_t = _timegm( localtime($ref_t) ); my $zone_off = $loc_for_ref_t - $ref_t @@ -167,9 +172,11 @@ sub timelocal { # If this evaluates to true, it means that the value in $loc_t is # the _second_ hour after a DST change where the local time moves # backward. - if ( ! $dst_off && - ( ( $ref_t - SECS_PER_HOUR ) - _timegm( localtime( $loc_t - SECS_PER_HOUR ) ) < 0 ) - ) { + if ( + !$dst_off + && ( ( $ref_t - SECS_PER_HOUR ) + - _timegm( localtime( $loc_t - SECS_PER_HOUR ) ) < 0 ) + ) { return $loc_t - SECS_PER_HOUR; } @@ -193,47 +200,56 @@ sub timelocal_nocheck { 1; +# ABSTRACT: Efficiently compute time from local and GMT time + __END__ +=pod + +=encoding UTF-8 + =head1 NAME -Time::Local - efficiently compute time from local and GMT time +Time::Local - Efficiently compute time from local and GMT time + +=head1 VERSION + +version 1.24 =head1 SYNOPSIS - $time = timelocal( $sec, $min, $hour, $mday, $mon, $year ); - $time = timegm( $sec, $min, $hour, $mday, $mon, $year ); + use Time::Local; + + my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year ); + my $time = timegm( $sec, $min, $hour, $mday, $mon, $year ); =head1 DESCRIPTION -This module provides functions that are the inverse of built-in perl -functions C<localtime()> and C<gmtime()>. They accept a date as a -six-element array, and return the corresponding C<time(2)> value in -seconds since the system epoch (Midnight, January 1, 1970 GMT on Unix, -for example). This value can be positive or negative, though POSIX -only requires support for positive values, so dates before the -system's epoch may not work on all operating systems. +This module provides functions that are the inverse of built-in perl functions +C<localtime()> and C<gmtime()>. They accept a date as a six-element array, and +return the corresponding C<time(2)> value in seconds since the system epoch +(Midnight, January 1, 1970 GMT on Unix, for example). This value can be +positive or negative, though POSIX only requires support for positive values, +so dates before the system's epoch may not work on all operating systems. -It is worth drawing particular attention to the expected ranges for -the values provided. The value for the day of the month is the actual -day (ie 1..31), while the month is the number of months since January -(0..11). This is consistent with the values returned from -C<localtime()> and C<gmtime()>. +It is worth drawing particular attention to the expected ranges for the values +provided. The value for the day of the month is the actual day (i.e. 1..31), +while the month is the number of months since January (0..11). This is +consistent with the values returned from C<localtime()> and C<gmtime()>. =head1 FUNCTIONS =head2 C<timelocal()> and C<timegm()> -This module exports two functions by default, C<timelocal()> and -C<timegm()>. +This module exports two functions by default, C<timelocal()> and C<timegm()>. -The C<timelocal()> and C<timegm()> functions perform range checking on -the input $sec, $min, $hour, $mday, and $mon values by default. +The C<timelocal()> and C<timegm()> functions perform range checking on the +input $sec, $min, $hour, $mday, and $mon values by default. =head2 C<timelocal_nocheck()> and C<timegm_nocheck()> -If you are working with data you know to be valid, you can speed your -code up by using the "nocheck" variants, C<timelocal_nocheck()> and +If you are working with data you know to be valid, you can speed your code up +by using the "nocheck" variants, C<timelocal_nocheck()> and C<timegm_nocheck()>. These variants must be explicitly imported. use Time::Local 'timelocal_nocheck'; @@ -241,144 +257,142 @@ C<timegm_nocheck()>. These variants must be explicitly imported. # The 365th day of 1999 print scalar localtime timelocal_nocheck( 0, 0, 0, 365, 0, 99 ); -If you supply data which is not valid (month 27, second 1,000) the -results will be unpredictable (so don't do that). +If you supply data which is not valid (month 27, second 1,000) the results +will be unpredictable (so don't do that). =head2 Year Value Interpretation -Strictly speaking, the year should be specified in a form consistent -with C<localtime()>, i.e. the offset from 1900. In order to make the -interpretation of the year easier for humans, however, who are more -accustomed to seeing years as two-digit or four-digit values, the -following conventions are followed: +Strictly speaking, the year should be specified in a form consistent with +C<localtime()>, i.e. the offset from 1900. In order to make the interpretation +of the year easier for humans, however, who are more accustomed to seeing +years as two-digit or four-digit values, the following conventions are +followed: =over 4 =item * -Years greater than 999 are interpreted as being the actual year, -rather than the offset from 1900. Thus, 1964 would indicate the year -Martin Luther King won the Nobel prize, not the year 3864. +Years greater than 999 are interpreted as being the actual year, rather than +the offset from 1900. Thus, 1964 would indicate the year Martin Luther King +won the Nobel prize, not the year 3864. =item * -Years in the range 100..999 are interpreted as offset from 1900, so -that 112 indicates 2012. This rule also applies to years less than -zero (but see note below regarding date range). +Years in the range 100..999 are interpreted as offset from 1900, so that 112 +indicates 2012. This rule also applies to years less than zero (but see note +below regarding date range). =item * -Years in the range 0..99 are interpreted as shorthand for years in the -rolling "current century," defined as 50 years on either side of the -current year. Thus, today, in 1999, 0 would refer to 2000, and 45 to -2045, but 55 would refer to 1955. Twenty years from now, 55 would -instead refer to 2055. This is messy, but matches the way people -currently think about two digit dates. Whenever possible, use an -absolute four digit year instead. +Years in the range 0..99 are interpreted as shorthand for years in the rolling +"current century," defined as 50 years on either side of the current +year. Thus, today, in 1999, 0 would refer to 2000, and 45 to 2045, but 55 +would refer to 1955. Twenty years from now, 55 would instead refer to +2055. This is messy, but matches the way people currently think about two +digit dates. Whenever possible, use an absolute four digit year instead. =back -The scheme above allows interpretation of a wide range of dates, -particularly if 4-digit years are used. +The scheme above allows interpretation of a wide range of dates, particularly +if 4-digit years are used. =head2 Limits of time_t -On perl versions older than 5.12.0, the range of dates that can be -actually be handled depends on the size of C<time_t> (usually a signed -integer) on the given platform. Currently, this is 32 bits for most -systems, yielding an approximate range from Dec 1901 to Jan 2038. +On perl versions older than 5.12.0, the range of dates that can be actually be +handled depends on the size of C<time_t> (usually a signed integer) on the +given platform. Currently, this is 32 bits for most systems, yielding an +approximate range from Dec 1901 to Jan 2038. -Both C<timelocal()> and C<timegm()> croak if given dates outside the -supported range. +Both C<timelocal()> and C<timegm()> croak if given dates outside the supported +range. -As of version 5.12.0, perl has stopped using the underlying time -library of the operating system it's running on and has its own -implementation of those routines with a safe range of at least -+/ 2**52 (about 142 million years). +As of version 5.12.0, perl has stopped using the underlying time library of +the operating system it's running on and has its own implementation of those +routines with a safe range of at least +/ 2**52 (about 142 million years). =head2 Ambiguous Local Times (DST) -Because of DST changes, there are many time zones where the same local -time occurs for two different GMT times on the same day. For example, -in the "Europe/Paris" time zone, the local time of 2001-10-28 02:30:00 -can represent either 2001-10-28 00:30:00 GMT, B<or> 2001-10-28 -01:30:00 GMT. +Because of DST changes, there are many time zones where the same local time +occurs for two different GMT times on the same day. For example, in the +"Europe/Paris" time zone, the local time of 2001-10-28 02:30:00 can represent +either 2001-10-28 00:30:00 GMT, B<or> 2001-10-28 01:30:00 GMT. -When given an ambiguous local time, the timelocal() function should -always return the epoch for the I<earlier> of the two possible GMT -times. +When given an ambiguous local time, the timelocal() function should always +return the epoch for the I<earlier> of the two possible GMT times. =head2 Non-Existent Local Times (DST) -When a DST change causes a locale clock to skip one hour forward, -there will be an hour's worth of local times that don't exist. Again, -for the "Europe/Paris" time zone, the local clock jumped from -2001-03-25 01:59:59 to 2001-03-25 03:00:00. +When a DST change causes a locale clock to skip one hour forward, there will +be an hour's worth of local times that don't exist. Again, for the +"Europe/Paris" time zone, the local clock jumped from 2001-03-25 01:59:59 to +2001-03-25 03:00:00. -If the C<timelocal()> function is given a non-existent local time, it -will simply return an epoch value for the time one hour later. +If the C<timelocal()> function is given a non-existent local time, it will +simply return an epoch value for the time one hour later. =head2 Negative Epoch Values -On perl version 5.12.0 and newer, negative epoch values are fully -supported. +On perl version 5.12.0 and newer, negative epoch values are fully supported. -On older versions of perl, negative epoch (C<time_t>) values, which -are not officially supported by the POSIX standards, are known not to -work on some systems. These include MacOS (pre-OSX) and Win32. +On older versions of perl, negative epoch (C<time_t>) values, which are not +officially supported by the POSIX standards, are known not to work on some +systems. These include MacOS (pre-OSX) and Win32. -On systems which do support negative epoch values, this module should -be able to cope with dates before the start of the epoch, down the -minimum value of time_t for the system. +On systems which do support negative epoch values, this module should be able +to cope with dates before the start of the epoch, down the minimum value of +time_t for the system. =head1 IMPLEMENTATION -These routines are quite efficient and yet are always guaranteed to -agree with C<localtime()> and C<gmtime()>. We manage this by caching -the start times of any months we've seen before. If we know the start -time of the month, we can always calculate any time within the month. -The start times are calculated using a mathematical formula. Unlike -other algorithms that do multiple calls to C<gmtime()>. +These routines are quite efficient and yet are always guaranteed to agree with +C<localtime()> and C<gmtime()>. We manage this by caching the start times of +any months we've seen before. If we know the start time of the month, we can +always calculate any time within the month. The start times are calculated +using a mathematical formula. Unlike other algorithms that do multiple calls +to C<gmtime()>. -The C<timelocal()> function is implemented using the same cache. We -just assume that we're translating a GMT time, and then fudge it when -we're done for the timezone and daylight savings arguments. Note that -the timezone is evaluated for each date because countries occasionally -change their official timezones. Assuming that C<localtime()> corrects -for these changes, this routine will also be correct. +The C<timelocal()> function is implemented using the same cache. We just +assume that we're translating a GMT time, and then fudge it when we're done +for the timezone and daylight savings arguments. Note that the timezone is +evaluated for each date because countries occasionally change their official +timezones. Assuming that C<localtime()> corrects for these changes, this +routine will also be correct. -=head1 BUGS +=head1 AUTHORS EMERITUS -The whole scheme for interpreting two-digit years can be considered a -bug. +This module is based on a Perl 4 library, timelocal.pl, that was +included with Perl 4.036, and was most likely written by Tom +Christiansen. -=head1 SUPPORT +The current version was written by Graham Barr. -Support for this module is provided via the [email protected] email -list. See http://lists.perl.org/ for more details. +=head1 BUGS -Please submit bugs to the CPAN RT system at -http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Time-Local or via email -at [email protected]. +The whole scheme for interpreting two-digit years can be considered a bug. -=head1 COPYRIGHT +Bugs may be submitted through L<the RT bug tracker|http://rt.cpan.org/Public/Dist/Display.html?Name=Time-Local> +(or L<[email protected]|mailto:[email protected]>). -Copyright (c) 1997-2003 Graham Barr, 2003-2007 David Rolsky. All -rights reserved. This program is free software; you can redistribute -it and/or modify it under the same terms as Perl itself. +There is a mailing list available for users of this distribution, +L<mailto:[email protected]>. -The full text of the license can be found in the LICENSE file included -with this module. +I am also usually active on IRC as 'drolsky' on C<irc://irc.perl.org>. =head1 AUTHOR -This module is based on a Perl 4 library, timelocal.pl, that was -included with Perl 4.036, and was most likely written by Tom -Christiansen. +Dave Rolsky <[email protected]> -The current version was written by Graham Barr. +=head1 CONTRIBUTOR + +=for stopwords Florian Ragwitz + +Florian Ragwitz <[email protected]> + +=head1 COPYRIGHT AND LICENSE + +This software is copyright (c) 1997 - 2016 by Graham Barr & Dave Rolsky. -It is now being maintained separately from the Perl core by Dave -Rolsky, <[email protected]>. +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. =cut diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t index 472e71a..6341396 100644 --- a/cpan/Time-Local/t/Local.t +++ b/cpan/Time-Local/t/Local.t @@ -8,141 +8,152 @@ use Test::More 0.88; use Time::Local; # Set up time values to test -my @time = - ( - #year,mon,day,hour,min,sec - [1970, 1, 2, 00, 00, 00], - [1980, 2, 28, 12, 00, 00], - [1980, 2, 29, 12, 00, 00], - [1999, 12, 31, 23, 59, 59], - [2000, 1, 1, 00, 00, 00], - [2010, 10, 12, 14, 13, 12], - # leap day - [2020, 2, 29, 12, 59, 59], - [2030, 7, 4, 17, 07, 06], - -# The following test fails on a surprising number of systems -# so it is commented out. The end of the Epoch for a 32-bit signed -# implementation of time_t should be Jan 19, 2038 03:14:07 UTC. -# [2038, 1, 17, 23, 59, 59], # last full day in any tz - - [2010, 10, 12, 14, 13, 12.1], - [2010, 10, 12, 14, 13, 59.1], - ); +my @time = ( + + #year,mon,day,hour,min,sec + [ 1970, 1, 2, 0, 0, 0 ], + [ 1980, 2, 28, 12, 0, 0 ], + [ 1980, 2, 29, 12, 0, 0 ], + [ 1999, 12, 31, 23, 59, 59 ], + [ 2000, 1, 1, 0, 0, 0 ], + [ 2010, 10, 12, 14, 13, 12 ], + + # leap day + [ 2020, 2, 29, 12, 59, 59 ], + [ 2030, 7, 4, 17, 7, 6 ], + + # The following test fails on a surprising number of systems + # so it is commented out. The end of the Epoch for a 32-bit signed + # implementation of time_t should be Jan 19, 2038 03:14:07 UTC. + # [2038, 1, 17, 23, 59, 59], # last full day in any tz + + [ 2010, 10, 12, 14, 13, 12.1 ], + [ 2010, 10, 12, 14, 13, 59.1 ], +); # more than 2**31 time_t - requires a 64bit safe localtime/gmtime -push @time, [2258, 8, 11, 1, 49, 17] +push @time, [ 2258, 8, 11, 1, 49, 17 ] if $] >= 5.012000; -my @bad_time = - ( - # month too large - [1995, 13, 01, 01, 01, 01], - # day too large - [1995, 02, 30, 01, 01, 01], - # hour too large - [1995, 02, 10, 25, 01, 01], - # minute too large - [1995, 02, 10, 01, 60, 01], - # second too large - [1995, 02, 10, 01, 01, 60], - ); +my @bad_time = ( -my @neg_time = - ( - # test negative epochs for systems that handle it - [ 1969, 12, 31, 16, 59, 59 ], - [ 1950, 04, 12, 9, 30, 31 ], - ); + # month too large + [ 1995, 13, 1, 1, 1, 1 ], + + # day too large + [ 1995, 2, 30, 1, 1, 1 ], + + # hour too large + [ 1995, 2, 10, 25, 1, 1 ], + + # minute too large + [ 1995, 2, 10, 1, 60, 1 ], + + # second too large + [ 1995, 2, 10, 1, 1, 60 ], +); + +my @neg_time = ( + + # test negative epochs for systems that handle it + [ 1969, 12, 31, 16, 59, 59 ], + [ 1950, 4, 12, 9, 30, 31 ], +); # Leap year tests -my @years = - ( - [ 1900 => 0 ], - [ 1947 => 0 ], - [ 1996 => 1 ], - [ 2000 => 1 ], - [ 2100 => 0 ], - ); +my @years = ( + [ 1900 => 0 ], + [ 1947 => 0 ], + [ 1996 => 1 ], + [ 2000 => 1 ], + [ 2100 => 0 ], +); # Use 3 days before the start of the epoch because with Borland on # Win32 it will work for -3600 _if_ your time zone is +01:00 (or # greater). -my $neg_epoch_ok = defined ((localtime(-259200))[0]) ? 1 : 0; +my $neg_epoch_ok = defined( ( localtime(-259200) )[0] ) ? 1 : 0; # use vmsish 'time' makes for oddness around the Unix epoch -if ($^O eq 'VMS') { +if ( $^O eq 'VMS' ) { $time[0][2]++; - $neg_epoch_ok = 0; # time_t is unsigned + $neg_epoch_ok = 0; # time_t is unsigned } -my $epoch_is_64 = eval { $Config{ivsize} == 8 && ( gmtime 2**40 )[5] == 34912 }; +my $epoch_is_64 + = eval { $Config{ivsize} == 8 && ( gmtime 2**40 )[5] == 34912 }; -for (@time, @neg_time) { - my($year, $mon, $mday, $hour, $min, $sec) = @$_; +for ( @time, @neg_time ) { + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; $year -= 1900; $mon--; - SKIP: { +SKIP: { skip '1970 test on VOS fails.', 12 if $^O eq 'vos' && $year == 70; skip 'this platform does not support negative epochs.', 12 - if $year < 70 && ! $neg_epoch_ok; + if $year < 70 && !$neg_epoch_ok; # Test timelocal() { my $year_in = $year < 70 ? $year + 1900 : $year; - my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in); + my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in ); - my($s,$m,$h,$D,$M,$Y) = localtime($time); + my ( $s, $m, $h, $D, $M, $Y ) = localtime($time); - is($s, int($sec), "timelocal second for @$_"); - is($m, $min, "timelocal minute for @$_"); - is($h, $hour, "timelocal hour for @$_"); - is($D, $mday, "timelocal day for @$_"); - is($M, $mon, "timelocal month for @$_"); - is($Y, $year, "timelocal year for @$_"); + is( $s, int($sec), "timelocal second for @$_" ); + is( $m, $min, "timelocal minute for @$_" ); + is( $h, $hour, "timelocal hour for @$_" ); + is( $D, $mday, "timelocal day for @$_" ); + is( $M, $mon, "timelocal month for @$_" ); + is( $Y, $year, "timelocal year for @$_" ); } - # Test timegm() { my $year_in = $year < 70 ? $year + 1900 : $year; - my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in); + my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in ); - my($s,$m,$h,$D,$M,$Y) = gmtime($time); + my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time); - is($s, int($sec), "timegm second for @$_"); - is($m, $min, "timegm minute for @$_"); - is($h, $hour, "timegm hour for @$_"); - is($D, $mday, "timegm day for @$_"); - is($M, $mon, "timegm month for @$_"); - is($Y, $year, "timegm year for @$_"); + is( $s, int($sec), "timegm second for @$_" ); + is( $m, $min, "timegm minute for @$_" ); + is( $h, $hour, "timegm hour for @$_" ); + is( $D, $mday, "timegm day for @$_" ); + is( $M, $mon, "timegm month for @$_" ); + is( $Y, $year, "timegm year for @$_" ); } } } - for (@bad_time) { - my($year, $mon, $mday, $hour, $min, $sec) = @$_; + my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_; $year -= 1900; $mon--; - eval { timegm($sec,$min,$hour,$mday,$mon,$year) }; + eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) }; - like($@, qr/.*out of range.*/, 'invalid time caused an error'); + like( $@, qr/.*out of range.*/, 'invalid time caused an error' ); } { - is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600, - 'one hour difference between two calls to timelocal'); + is( + timelocal( 0, 0, 1, 1, 0, 90 ) - timelocal( 0, 0, 0, 1, 0, 90 ), 3600, + 'one hour difference between two calls to timelocal' + ); - is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600, - 'one day difference between two calls to timelocal'); + is( + timelocal( 1, 2, 3, 1, 0, 100 ) - timelocal( 1, 2, 3, 31, 11, 99 ), + 24 * 3600, + 'one day difference between two calls to timelocal' + ); # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days) - is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600, - '60 day difference between two calls to timegm'); + is( + timegm( 0, 0, 0, 1, 2, 80 ) - timegm( 0, 0, 0, 1, 0, 80 ), **** PATCH TRUNCATED AT 2000 LINES -- 203 NOT SHOWN **** -- Perl5 Master Repository
