2 files changed, 48 insertions, 19 deletions

diff --git a/lib/Time/Local.pm b/lib/Time/Local.pm
index e5c4f886d3..fe698d44e7 100644
--- a/lib/Time/Local.pm
+++ b/lib/Time/Local.pm
@@ -6,7 +6,7 @@ use Config;
 use strict;
 
 use vars qw( $VERSION @ISA @EXPORT @EXPORT_OK );
-$VERSION   = '1.18_01';
+$VERSION   = '1.1901';
 
 @ISA       = qw( Exporter );
 @EXPORT    = qw( timegm timelocal );
@@ -90,12 +90,6 @@ sub timegm {
     }
 
     unless ( $Options{no_range_check} ) {
-        if ( abs($year) >= 0x7fff ) {
-            $year += 1900;
-            croak
-                "Cannot handle date ($sec, $min, $hour, $mday, $month, *$year*)";
-        }
-
         croak "Month '$month' out of range 0..11"
             if $month > 11
             or $month < 0;
diff --git a/lib/Time/Local.t b/lib/Time/Local.t
index 17e811583f..0f3ccbd1f5 100755
--- a/lib/Time/Local.t
+++ b/lib/Time/Local.t
@@ -9,6 +9,7 @@ BEGIN {
 
 use strict;
 
+use Config;
 use Test::More;
 use Time::Local;
 
@@ -62,13 +63,24 @@ my @years =
      [ 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;
+
+# use vmsish 'time' makes for oddness around the Unix epoch
+if ($^O eq 'VMS') {
+    $time[0][2]++;
+    $neg_epoch_ok = 0; # time_t is unsigned
+}
+
+my $epoch_is_64 = eval { $Config{ivsize} == 8 && ( gmtime 2**40 )[5] == 34912 };
+
 my $tests = (@time * 12);
 $tests += @neg_time * 12;
 $tests += @bad_time;
 $tests += @years;
-$tests += 10;
-$tests += 2 if $ENV{PERL_CORE};
-$tests += 8 if $ENV{MAINTAINER};
+$tests += 23;
 
 plan tests => $tests;
 
@@ -174,7 +186,24 @@ for my $p (@years) {
     is($@, '', 'no error with leap day of 1996 (year passed as 96)');
 }
 
-if ($ENV{MAINTAINER}) {
+SKIP:
+{
+    skip 'These tests require a system with 64-bit time_t.', 3
+        unless $epoch_is_64;
+
+    is( timegm( 8, 14, 3, 19, 0, ( 1900 + 138 ) ), 2**31,
+        'can call timegm for 2**31 epoch seconds' );
+    is( timegm( 16, 28, 6, 7, 1, ( 1900 + 206 ) ), 2**32,
+        'can call timegm for 2**32 epoch seconds (on a 64-bit system)' );
+    is( timegm( 16, 36, 0, 20, 1, ( 34912 + 1900 ) ), 2**40,
+        'can call timegm for 2**40 epoch seconds (on a 64-bit system)' );
+}
+
+SKIP:
+{
+    skip 'These tests only run for the package maintainer.', 8
+        unless $ENV{MAINTAINER};
+
     require POSIX;
 
     local $ENV{TZ} = 'Europe/Vienna';
@@ -228,14 +257,20 @@ if ($ENV{MAINTAINER}) {
         'hour is 2 when given 2:00 AM on Europe/London date change' );
 }
 
-if ($ENV{PERL_CORE}) {
-  package test;
-  require 'timelocal.pl';
+SKIP:
+{
+    skip 'These tests are only run when $ENV{PERL_CORE} is true.', 2
+        unless $ENV{PERL_CORE};
+
+    {
+        package test;
+        require 'timelocal.pl';
 
-  # need to get ok() from main package
-  ::is(timegm(0,0,0,1,0,80), main::timegm(0,0,0,1,0,80),
-     'timegm in timelocal.pl');
+        # need to get ok() from main package
+        ::is(timegm(0,0,0,1,0,80), main::timegm(0,0,0,1,0,80),
+             'timegm in timelocal.pl');
 
-  ::is(timelocal(1,2,3,4,5,88), main::timelocal(1,2,3,4,5,88),
-     'timelocal in timelocal.pl');
+        ::is(timelocal(1,2,3,4,5,88), main::timelocal(1,2,3,4,5,88),
+             'timelocal in timelocal.pl');
+    }
 }