Imported Upstream version 5.837

diff --git a/Changes b/Changes
index 812b1648495b3c0d3758f19fb581891d9c1142ad..91881f0a93d940a50200b9041c850c53c59802ab 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,15 @@
+_______________________________________________________________________________
+2010-09-20  Release 5.837
+
+David E. Wheeler (1):
+      Fix for Encode 2.40
+
+Gisle Aas (2):
+      Fix Perl syntax error in synopsis
+      Allow ISO 8601 date strings when parsing Apache file listings
+
+
+
 _______________________________________________________________________________
 2010-05-13  Release 5.836
 

diff --git a/META.yml b/META.yml
index 643e0a7a61cae0f058b50926955e4cc04620cf2c..1b4c4fbd8995ccf5589641e2beb74df98814529e 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               libwww-perl
-version:            5.836
+version:            5.837
 abstract:           The World-Wide Web library for Perl
 author:
     - Gisle Aas <gisle@activestate.com>
@@ -31,7 +31,7 @@ no_index:
     directory:
         - t
         - inc
-generated_by:       ExtUtils::MakeMaker version 6.55_02
+generated_by:       ExtUtils::MakeMaker version 6.56
 meta-spec:
     url:      http://module-build.sourceforge.net/META-spec-v1.4.html
     version:  1.4

diff --git a/lib/File/Listing.pm b/lib/File/Listing.pm
index 85d44ac8827a73aa026f6c0526478682e8069d41..53a6ddc66bea074493032dd5dc1fa99e38037f48 100644 (file)
--- a/lib/File/Listing.pm
+++ b/lib/File/Listing.pm
@@ -1,7 +1,7 @@
 package File::Listing;
 
 sub Version { $VERSION; }
-$VERSION = "5.814";
+$VERSION = "5.837";
 
 require Exporter;
 @ISA = qw(Exporter);
@@ -288,9 +288,15 @@ sub line {
     local($_) = shift;
     my($tz, $error) = @_; # ignored for now...
 
-    if (m!<A\s+HREF=\"([^\"]+)\">.*</A>.*?(\d+)-([a-zA-Z]+)-(\d+)\s+(\d+):(\d+)\s+(?:([\d\.]+[kM]?|-))!i) {
+    if (m!<A\s+HREF=\"([^\"]+)\">.*</A>.*?(\d+)-([a-zA-Z]+|\d+)-(\d+)\s+(\d+):(\d+)\s+(?:([\d\.]+[kMG]?|-))!i) {
        my($filename, $filesize) = ($1, $7);
        my($d,$m,$y, $H,$M) = ($2,$3,$4,$5,$6);
+       if ($m =~ /^\d+$/) {
+           ($d,$y) = ($y,$d) # iso date
+       }
+       else {
+           $m = _monthabbrev_number($m);
+       }
 
        $filesize = 0 if $filesize eq '-';
        if ($filesize =~ s/k$//i) {
@@ -305,7 +311,7 @@ sub line {
        $filesize = int $filesize;
 
        require Time::Local;
-       my $filetime = Time::Local::timelocal(0,$M,$H,$d,_monthabbrev_number($m)-1,_guess_year($y)-1900);
+       my $filetime = Time::Local::timelocal(0,$M,$H,$d,$m-1,_guess_year($y)-1900);
        my $filetype = ($filename =~ s|/$|| ? "d" : "f");
        return [$filename, $filetype, $filesize, $filetime, undef];
     }

diff --git a/lib/HTTP/Cookies.pm b/lib/HTTP/Cookies.pm
index b37bf9d90e299408be8d9a889136c76c51b55038..831a4ace15c8e6290c269ace65a6be9b488ce01b 100644 (file)
--- a/lib/HTTP/Cookies.pm
+++ b/lib/HTTP/Cookies.pm
@@ -5,7 +5,7 @@ use HTTP::Date qw(str2time parse_date time2str);
 use HTTP::Headers::Util qw(_split_header_words join_header_words);
 
 use vars qw($VERSION $EPOCH_OFFSET);
-$VERSION = "5.833";
+$VERSION = "5.837";
 
 # Legacy: because "use "HTTP::Cookies" used be the ONLY way
 #  to load the class HTTP::Cookies::Netscape.
@@ -610,7 +610,7 @@ HTTP::Cookies - HTTP cookie jars
 
   use HTTP::Cookies;
   $cookie_jar = HTTP::Cookies->new(
-    file => "$ENV{'HOME'}/lwp_cookies.dat',
+    file => "$ENV{'HOME'}/lwp_cookies.dat",
     autosave => 1,
   );
 

diff --git a/lib/HTTP/Message.pm b/lib/HTTP/Message.pm
index 1db47205c32370e3c4b83ff0be621176f45373cd..944e88d189920238a508cc55f1e6b94083c115a9 100644 (file)
--- a/lib/HTTP/Message.pm
+++ b/lib/HTTP/Message.pm
@@ -2,7 +2,7 @@ package HTTP::Message;
 
 use strict;
 use vars qw($VERSION $AUTOLOAD);
-$VERSION = "5.835";
+$VERSION = "5.837";
 
 require HTTP::Headers;
 require Carp;
@@ -271,7 +271,7 @@ sub content_charset
                return "US-ASCII" unless /[\x80-\xFF]/;
                require Encode;
                eval {
-                   Encode::decode_utf8($_, Encode::FB_CROAK());
+                   Encode::decode_utf8($_, Encode::FB_CROAK() | Encode::LEAVE_SRC());
                };
                return "UTF-8" unless $@;
                return "ISO-8859-1";

diff --git a/lib/LWP.pm b/lib/LWP.pm
index 04dbbe83e81d583678e21dd31e23c85c23c29ec7..5ca478557018e7e55ad93cfc81da1decff741bb9 100644 (file)
--- a/lib/LWP.pm
+++ b/lib/LWP.pm
@@ -1,6 +1,6 @@
 package LWP;
 
-$VERSION = "5.836";
+$VERSION = "5.837";
 sub Version { $VERSION; }
 
 require 5.005;