r44801 - in /branches/upstream/libwww-perl/current: ./ lib/ lib/HTTP/ lib/HTTP/Cookies/ lib/LWP/ lib/Net/ lib/Net/HTTP/ lib/WWW/ t/base/ t/net/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Fri Sep 25 13:16:40 UTC 2009


Author: jawnsy-guest
Date: Fri Sep 25 13:16:34 2009
New Revision: 44801

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44801
Log:
[svn-upgrade] Integrating new upstream version, libwww-perl (5.832)

Modified:
    branches/upstream/libwww-perl/current/Changes
    branches/upstream/libwww-perl/current/META.yml
    branches/upstream/libwww-perl/current/lib/HTTP/Cookies.pm
    branches/upstream/libwww-perl/current/lib/HTTP/Cookies/Netscape.pm
    branches/upstream/libwww-perl/current/lib/HTTP/Message.pm
    branches/upstream/libwww-perl/current/lib/LWP.pm
    branches/upstream/libwww-perl/current/lib/LWP/UserAgent.pm
    branches/upstream/libwww-perl/current/lib/Net/HTTP.pm
    branches/upstream/libwww-perl/current/lib/Net/HTTP/Methods.pm
    branches/upstream/libwww-perl/current/lib/WWW/RobotRules.pm
    branches/upstream/libwww-perl/current/t/base/cookies.t
    branches/upstream/libwww-perl/current/t/net/config.pl.dist
    branches/upstream/libwww-perl/current/t/net/http-get.t
    branches/upstream/libwww-perl/current/t/net/http-post.t
    branches/upstream/libwww-perl/current/t/net/http-timeout.t
    branches/upstream/libwww-perl/current/t/net/mirror.t
    branches/upstream/libwww-perl/current/t/net/proxy.t

Modified: branches/upstream/libwww-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/Changes?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/Changes (original)
+++ branches/upstream/libwww-perl/current/Changes Fri Sep 25 13:16:34 2009
@@ -1,3 +1,23 @@
+_______________________________________________________________________________
+2009-09-21  Release 5.832
+
+
+Ville Skyttä (6):
+      Fix net test suite.
+      Comment spelling fixes.
+      Fix links to old Netscape cookie specification.
+      Documentation spelling fixes.
+      Improve max line length exceeded/read error messages.
+      Do not warn about seemingly wellformed but unrecognized robots.txt lines.
+
+Gisle Aas (1):
+      $mess->content_charset would fail for empty content
+
+mschilli (1):
+      Further restrict what variables env_proxy() process
+
+
+
 _______________________________________________________________________________
 2009-08-13  Release 5.831
 

Modified: branches/upstream/libwww-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/META.yml?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/META.yml (original)
+++ branches/upstream/libwww-perl/current/META.yml Fri Sep 25 13:16:34 2009
@@ -1,12 +1,14 @@
 --- #YAML:1.0
 name:               libwww-perl
-version:            5.831
+version:            5.832
 abstract:           The World-Wide Web library for Perl
 author:
     - Gisle Aas <gisle at activestate.com>
 license:            perl
 distribution_type:  module
 configure_requires:
+    ExtUtils::MakeMaker:  0
+build_requires:
     ExtUtils::MakeMaker:  0
 requires:
     Compress::Zlib:  1.10
@@ -24,7 +26,7 @@
     directory:
         - t
         - inc
-generated_by:       ExtUtils::MakeMaker version 6.4801
+generated_by:       ExtUtils::MakeMaker version 6.55_02
 meta-spec:
     url:      http://module-build.sourceforge.net/META-spec-v1.4.html
     version:  1.4

Modified: branches/upstream/libwww-perl/current/lib/HTTP/Cookies.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/lib/HTTP/Cookies.pm?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/lib/HTTP/Cookies.pm (original)
+++ branches/upstream/libwww-perl/current/lib/HTTP/Cookies.pm Fri Sep 25 13:16:34 2009
@@ -5,7 +5,7 @@
 use HTTP::Headers::Util qw(_split_header_words join_header_words);
 
 use vars qw($VERSION $EPOCH_OFFSET);
-$VERSION = "5.827";
+$VERSION = "5.832";
 
 # Legacy: because "use "HTTP::Cookies" used be the ONLY way
 #  to load the class HTTP::Cookies::Netscape.
@@ -89,7 +89,7 @@
 		if ($port) {
 		    my $found;
 		    if ($port =~ s/^_//) {
-			# The correponding Set-Cookie attribute was empty
+			# The corresponding Set-Cookie attribute was empty
 			$found++ if $port eq $req_port;
 			$port = "";
 		    }
@@ -186,7 +186,7 @@
 
     if (@ns_set) {
 	# The old Netscape cookie format for Set-Cookie
-	# http://wp.netscape.com/newsref/std/cookie_spec.html
+	# http://curl.haxx.se/rfc/cookie_spec.html
 	# can for instance contain an unquoted "," in the expires
 	# field, so we have to use this ad-hoc parser.
 	my $now = time();
@@ -261,7 +261,7 @@
 	    if ($k eq "discard" || $k eq "secure") {
 		$v = 1 unless defined $v;
 	    }
-	    next if exists $hash{$k};  # only first value is signigicant
+	    next if exists $hash{$k};  # only first value is significant
 	    $hash{$k} = $v;
 	};
 
@@ -611,7 +611,7 @@
 Cookies are a general mechanism which server side connections can use
 to both store and retrieve information on the client side of the
 connection.  For more information about cookies refer to
-<URL:http://wp.netscape.com/newsref/std/cookie_spec.html> and
+<URL:http://curl.haxx.se/rfc/cookie_spec.html> and
 <URL:http://www.cookiecentral.com/>.  This module also implements the
 new style cookies described in I<RFC 2965>.
 The two variants of cookies are supposed to be able to coexist happily.

Modified: branches/upstream/libwww-perl/current/lib/HTTP/Cookies/Netscape.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/lib/HTTP/Cookies/Netscape.pm?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/lib/HTTP/Cookies/Netscape.pm (original)
+++ branches/upstream/libwww-perl/current/lib/HTTP/Cookies/Netscape.pm Fri Sep 25 13:16:34 2009
@@ -3,7 +3,7 @@
 use strict;
 use vars qw(@ISA $VERSION);
 
-$VERSION = "5.822";
+$VERSION = "5.832";
 
 require HTTP::Cookies;
 @ISA=qw(HTTP::Cookies);
@@ -43,6 +43,8 @@
     local(*FILE, $_);
     open(FILE, ">$file") || return;
 
+    # Use old, now broken link to the old cookie spec just in case something
+    # else (not us!) requires the comment block exactly this way.
     print FILE <<EOT;
 # Netscape HTTP Cookie File
 # http://www.netscape.com/newsref/std/cookie_spec.html

Modified: branches/upstream/libwww-perl/current/lib/HTTP/Message.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/lib/HTTP/Message.pm?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/lib/HTTP/Message.pm (original)
+++ branches/upstream/libwww-perl/current/lib/HTTP/Message.pm Fri Sep 25 13:16:34 2009
@@ -2,7 +2,7 @@
 
 use strict;
 use vars qw($VERSION $AUTOLOAD);
-$VERSION = "5.831";
+$VERSION = "5.832";
 
 require HTTP::Headers;
 require Carp;
@@ -248,6 +248,7 @@
 		    if (my $c = $attr->{content}) {
 			require HTTP::Headers::Util;
 			my @v = HTTP::Headers::Util::split_header_words($c);
+			return unless @v;
 			my($ct, undef, %ct_param) = @{$v[0]};
 			$charset = $ct_param{charset};
 		    }

Modified: branches/upstream/libwww-perl/current/lib/LWP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/lib/LWP.pm?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/lib/LWP.pm (original)
+++ branches/upstream/libwww-perl/current/lib/LWP.pm Fri Sep 25 13:16:34 2009
@@ -1,6 +1,6 @@
 package LWP;
 
-$VERSION = "5.831";
+$VERSION = "5.832";
 sub Version { $VERSION; }
 
 require 5.005;

Modified: branches/upstream/libwww-perl/current/lib/LWP/UserAgent.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/lib/LWP/UserAgent.pm?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/lib/LWP/UserAgent.pm (original)
+++ branches/upstream/libwww-perl/current/lib/LWP/UserAgent.pm Fri Sep 25 13:16:34 2009
@@ -5,7 +5,7 @@
 
 require LWP::MemberMixin;
 @ISA = qw(LWP::MemberMixin);
-$VERSION = "5.829";
+$VERSION = "5.832";
 
 use HTTP::Request ();
 use HTTP::Response ();
@@ -932,6 +932,8 @@
 	else {
             # Ignore random _proxy variables, allow only valid schemes
             next unless $k =~ /^$URI::scheme_re\z/;
+            # Ignore xxx_proxy variables if xxx isn't a supported protocol
+            next unless LWP::Protocol::implementor($k);
 	    $self->proxy($k, $v);
 	}
     }
@@ -1055,7 +1057,7 @@
 C<LWP::UserAgent> when it dispatches requests.  Most of these can also
 be initialized by options passed to the constructor method.
 
-The following attributes methods are provided.  The attribute value is
+The following attribute methods are provided.  The attribute value is
 left unchanged if no argument is given.  The return value from each
 method is the old attribute value.
 

Modified: branches/upstream/libwww-perl/current/lib/Net/HTTP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/lib/Net/HTTP.pm?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/lib/Net/HTTP.pm (original)
+++ branches/upstream/libwww-perl/current/lib/Net/HTTP.pm Fri Sep 25 13:16:34 2009
@@ -3,7 +3,7 @@
 use strict;
 use vars qw($VERSION @ISA $SOCKET_CLASS);
 
-$VERSION = "5.831";
+$VERSION = "5.832";
 unless ($SOCKET_CLASS) {
     eval { require IO::Socket::INET } || require IO::Socket;
     $SOCKET_CLASS = "IO::Socket::INET";
@@ -57,7 +57,7 @@
 The C<Net::HTTP> class is a low-level HTTP client.  An instance of the
 C<Net::HTTP> class represents a connection to an HTTP server.  The
 HTTP protocol is described in RFC 2616.  The C<Net::HTTP> class
-support C<HTTP/1.0> and C<HTTP/1.1>.
+supports C<HTTP/1.0> and C<HTTP/1.1>.
 
 C<Net::HTTP> is a sub-class of C<IO::Socket::INET>.  You can mix the
 methods described below with reading and writing from the socket
@@ -132,7 +132,7 @@
 
 =item $s->max_header_length
 
-Get/set a limit on the number of headers lines that a response can
+Get/set a limit on the number of header lines that a response can
 have.  The default is 128.  A value of 0 means no limit.
 
 =item $s->format_request($method, $uri, %headers, [$content])

Modified: branches/upstream/libwww-perl/current/lib/Net/HTTP/Methods.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/lib/Net/HTTP/Methods.pm?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/lib/Net/HTTP/Methods.pm (original)
+++ branches/upstream/libwww-perl/current/lib/Net/HTTP/Methods.pm Fri Sep 25 13:16:34 2009
@@ -5,7 +5,7 @@
 use strict;
 use vars qw($VERSION);
 
-$VERSION = "5.824";
+$VERSION = "5.832";
 
 my $CRLF = "\015\012";   # "\r\n" is not portable
 
@@ -241,6 +241,7 @@
 
 sub my_readline {
     my $self = shift;
+    my $what = shift;
     for (${*$self}{'http_buf'}) {
 	my $max_line_length = ${*$self}{'http_max_line_length'};
 	my $pos;
@@ -248,7 +249,7 @@
 	    # find line ending
 	    $pos = index($_, "\012");
 	    last if $pos >= 0;
-	    die "Line too long (limit is $max_line_length)"
+	    die "$what line too long (limit is $max_line_length)"
 		if $max_line_length && length($_) > $max_line_length;
 
 	    # need to read more data to find a line ending
@@ -265,7 +266,7 @@
                     }
                     # if we have already accumulated some data let's at least
                     # return that as a line
-                    die "read failed: $!" unless length;
+                    die "$what read failed: $!" unless length;
                 }
                 unless ($n) {
                     return undef unless length;
@@ -273,7 +274,7 @@
                 }
             }
 	}
-	die "Line too long ($pos; limit is $max_line_length)"
+	die "$what line too long ($pos; limit is $max_line_length)"
 	    if $max_line_length && $pos > $max_line_length;
 
 	my $line = substr($_, 0, $pos+1, "");
@@ -311,7 +312,7 @@
     my @headers;
     my $line_count = 0;
     my $max_header_lines = ${*$self}{'http_max_header_lines'};
-    while (my $line = my_readline($self)) {
+    while (my $line = my_readline($self, 'Header')) {
 	if ($line =~ /^(\S+?)\s*:\s*(.*)/s) {
 	    push(@headers, $1, $2);
 	}
@@ -339,7 +340,7 @@
     my($self, %opt) = @_;
     my $laxed = $opt{laxed};
 
-    my($status, $eol) = my_readline($self);
+    my($status, $eol) = my_readline($self, 'Status');
     unless (defined $status) {
 	die "Server closed connection without sending any data back";
     }
@@ -471,11 +472,11 @@
 	#   $chunked > 0:    bytes left in current chunk to read
 
 	if ($chunked <= 0) {
-	    my $line = my_readline($self);
+	    my $line = my_readline($self, 'Entity body');
 	    if ($chunked == 0) {
 		die "Missing newline after chunk data: '$line'"
 		    if !defined($line) || $line ne "";
-		$line = my_readline($self);
+		$line = my_readline($self, 'Entity body');
 	    }
 	    die "EOF when chunk header expected" unless defined($line);
 	    my $chunk_len = $line;

Modified: branches/upstream/libwww-perl/current/lib/WWW/RobotRules.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/lib/WWW/RobotRules.pm?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/lib/WWW/RobotRules.pm (original)
+++ branches/upstream/libwww-perl/current/lib/WWW/RobotRules.pm Fri Sep 25 13:16:34 2009
@@ -1,6 +1,6 @@
 package WWW::RobotRules;
 
-$VERSION = "5.824";
+$VERSION = "5.832";
 sub Version { $VERSION; }
 
 use strict;
@@ -105,11 +105,11 @@
 		push(@anon_disallowed, $disallow);
 	    }
 	}
-        elsif (/^\s*Sitemap\s*:/i) {
+        elsif (/\S\s*:/) {
              # ignore
         }
 	else {
-	    warn "RobotRules <$robot_txt_uri>: Unexpected line: $_\n" if $^W;
+	    warn "RobotRules <$robot_txt_uri>: Malformed record: <$_>\n" if $^W;
 	}
     }
 
@@ -132,7 +132,7 @@
 
     # See whether my short-name is a substring of the
     #  "User-Agent: ..." line that we were passed:
-    
+
     if(index(lc($me), lc($ua_line)) >= 0) {
       return 1;
     }
@@ -145,10 +145,10 @@
 sub allowed {
     my($self, $uri) = @_;
     $uri = URI->new("$uri");
-    
+
     return 1 unless $uri->scheme eq 'http' or $uri->scheme eq 'https';
      # Robots.txt applies to only those schemes.
-    
+
     my $netloc = $uri->host . ":" . $uri->port;
 
     my $fresh_until = $self->fresh_until($netloc);
@@ -358,7 +358,7 @@
 
 The format and semantics of the "/robots.txt" file are as follows
 (this is an edited abstract of
-<http://www.robotstxt.org/wc/norobots.html> ):
+<http://www.robotstxt.org/wc/norobots.html>):
 
 The file consists of one or more records separated by one or more
 blank lines. Each record contains lines of the form
@@ -395,6 +395,8 @@
 starts with this value will not be retrieved
 
 =back
+
+Unrecognized records are ignored.
 
 =head1 ROBOTS.TXT EXAMPLES
 
@@ -433,7 +435,7 @@
   Disallow: /west-wing/ # except the west wing!
   # It's good to be the Prince...
   User-agent: Beast
-  Disallow: 
+  Disallow:
 
 This file is missing the required blank lines between records.
 However, the intention is clear.

Modified: branches/upstream/libwww-perl/current/t/base/cookies.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/t/base/cookies.t?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/t/base/cookies.t (original)
+++ branches/upstream/libwww-perl/current/t/base/cookies.t Fri Sep 25 13:16:34 2009
@@ -9,7 +9,7 @@
 
 #-------------------------------------------------------------------
 # First we check that it works for the original example at
-# http://www.netscape.com/newsref/std/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 
 # Client requests a document, and receives in the response:
 # 

Modified: branches/upstream/libwww-perl/current/t/net/config.pl.dist
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/t/net/config.pl.dist?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/t/net/config.pl.dist (original)
+++ branches/upstream/libwww-perl/current/t/net/config.pl.dist Fri Sep 25 13:16:34 2009
@@ -1,6 +1,6 @@
 package net;
 
-# Configure these for you local system
+# Configure these for your local system
 $httpserver  = "localhost:80";
 $cgidir      = "/cgi-bin/lwp";
 

Modified: branches/upstream/libwww-perl/current/t/net/http-get.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/t/net/http-get.t?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/t/net/http-get.t (original)
+++ branches/upstream/libwww-perl/current/t/net/http-get.t Fri Sep 25 13:16:34 2009
@@ -6,7 +6,7 @@
 print "1..2\n";
 
 require "net/config.pl";
-require LWP::Protocol::http;
+require HTTP::Request;
 require LWP::UserAgent;
 
 my $ua = new LWP::UserAgent;    # create a useragent to test
@@ -14,7 +14,7 @@
 $netloc = $net::httpserver;
 $script = $net::cgidir . "/test";
 
-$url = new URI::URL("http://$netloc$script?query");
+$url = "http://$netloc$script?query";
 
 my $request = new HTTP::Request('GET', $url);
 

Modified: branches/upstream/libwww-perl/current/t/net/http-post.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/t/net/http-post.t?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/t/net/http-post.t (original)
+++ branches/upstream/libwww-perl/current/t/net/http-post.t Fri Sep 25 13:16:34 2009
@@ -6,7 +6,7 @@
 print "1..2\n";
 
 require "net/config.pl";
-require LWP::Protocol::http;
+require HTTP::Request;
 require LWP::UserAgent;
 
 $netloc = $net::httpserver;
@@ -14,7 +14,7 @@
 
 my $ua = new LWP::UserAgent;    # create a useragent to test
 
-$url = new URI::URL("http://$netloc$script");
+$url = "http://$netloc$script";
 
 my $form = 'searchtype=Substring';
 

Modified: branches/upstream/libwww-perl/current/t/net/http-timeout.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/t/net/http-timeout.t?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/t/net/http-timeout.t (original)
+++ branches/upstream/libwww-perl/current/t/net/http-timeout.t Fri Sep 25 13:16:34 2009
@@ -5,8 +5,7 @@
 print "1..1\n";
 
 require "net/config.pl";
-require HTTP::Status;
-require LWP::Protocol::http;
+require HTTP::Request;
 require LWP::UserAgent;
 
 my $ua = new LWP::UserAgent;    # create a useragent to test
@@ -16,7 +15,7 @@
 $netloc = $net::httpserver;
 $script = $net::cgidir . "/timeout";
 
-$url = new URI::URL("http://$netloc$script");
+$url = "http://$netloc$script";
 
 my $request = new HTTP::Request('GET', $url);
 

Modified: branches/upstream/libwww-perl/current/t/net/mirror.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/t/net/mirror.t?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/t/net/mirror.t (original)
+++ branches/upstream/libwww-perl/current/t/net/mirror.t Fri Sep 25 13:16:34 2009
@@ -3,7 +3,6 @@
 #
 
 require "net/config.pl";
-require LWP::Protocol::http;
 require LWP::UserAgent;
 require HTTP::Status;
 
@@ -29,7 +28,7 @@
     print "ok 2\n";
 }
 else {
-    print "nok ok 2\n";
+    print "not ok 2\n";
 }
 unlink($copy);
 

Modified: branches/upstream/libwww-perl/current/t/net/proxy.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-perl/current/t/net/proxy.t?rev=44801&op=diff
==============================================================================
--- branches/upstream/libwww-perl/current/t/net/proxy.t (original)
+++ branches/upstream/libwww-perl/current/t/net/proxy.t Fri Sep 25 13:16:34 2009
@@ -12,13 +12,14 @@
     exit 0;
 }
 
+require HTTP::Request;
 require LWP::UserAgent;
 
 my $ua = new LWP::UserAgent;    # create a useragent to test
 
 $ua->proxy('ftp', $net::ftp_proxy);
 
-my $url = new URI::URL('ftp://ftp.uninett.no/');
+my $url = 'ftp://ftp.uninett.no/';
 
 my $request = new HTTP::Request('GET', $url);
 




More information about the Pkg-perl-cvs-commits mailing list