r18652 - in /trunk/libwww-perl: Changes MANIFEST META.yml debian/changelog lib/HTTP/Message.pm lib/LWP.pm lib/LWP/Authen/Digest.pm lib/LWP/Protocol/http.pm lib/Net/HTTP.pm lib/Net/HTTP/Methods.pm t/base/http.t t/base/message.t t/live/https.t

gregoa-guest at users.alioth.debian.org gregoa-guest at users.alioth.debian.org
Wed Apr 16 14:32:32 UTC 2008


Author: gregoa-guest
Date: Wed Apr 16 14:32:31 2008
New Revision: 18652

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18652
Log:
New upstream release, fixes the SSL regression (closes: #476390).

Added:
    trunk/libwww-perl/t/live/https.t
      - copied unchanged from r18651, branches/upstream/libwww-perl/current/t/live/https.t
Modified:
    trunk/libwww-perl/Changes
    trunk/libwww-perl/MANIFEST
    trunk/libwww-perl/META.yml
    trunk/libwww-perl/debian/changelog
    trunk/libwww-perl/lib/HTTP/Message.pm
    trunk/libwww-perl/lib/LWP.pm
    trunk/libwww-perl/lib/LWP/Authen/Digest.pm
    trunk/libwww-perl/lib/LWP/Protocol/http.pm
    trunk/libwww-perl/lib/Net/HTTP.pm
    trunk/libwww-perl/lib/Net/HTTP/Methods.pm
    trunk/libwww-perl/t/base/http.t
    trunk/libwww-perl/t/base/message.t

Modified: trunk/libwww-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/Changes?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/Changes (original)
+++ trunk/libwww-perl/Changes Wed Apr 16 14:32:31 2008
@@ -1,3 +1,20 @@
+2008-04-16   Gisle Aas <gisle at ActiveState.com>
+
+     Release 5.812
+
+     Gisle Aas (6):
+           Typo fix.
+           Simplified Net::HTTP::Methods constructor call.
+           Croak if Net::HTTP constructor called with no argument.
+           Avoid calling $self->peerport to figure out what the port is.
+           5.811 breaks SSL requests [RT#35090]
+           Make test suite compatible with perl-5.6.1.
+     
+     Toru Yamaguchi (1):
+           Wrong treatment of qop value in Digest Authentication [RT#35055]
+     
+
+
 2008-04-14   Gisle Aas <gisle at ActiveState.com>
 
      Release 5.811

Modified: trunk/libwww-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/MANIFEST?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/MANIFEST (original)
+++ trunk/libwww-perl/MANIFEST Wed Apr 16 14:32:31 2008
@@ -88,6 +88,7 @@
 t/html/form-maxlength.t         More HTML::Form tests
 t/live/apache.t
 t/live/apache-listing.t		Test File::Listing::apache package
+t/live/https.t
 t/live/jigsaw-auth-b.t
 t/live/jigsaw-auth-d.t
 t/live/jigsaw-chunk.t

Modified: trunk/libwww-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/META.yml?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/META.yml (original)
+++ trunk/libwww-perl/META.yml Wed Apr 16 14:32:31 2008
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                libwww-perl
-version:             5.811
+version:             5.812
 abstract:            ~
 license:             ~
 generated_by:        ExtUtils::MakeMaker version 6.3201

Modified: trunk/libwww-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/debian/changelog?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/debian/changelog (original)
+++ trunk/libwww-perl/debian/changelog Wed Apr 16 14:32:31 2008
@@ -1,3 +1,9 @@
+libwww-perl (5.812-1) UNRELEASED; urgency=low
+
+  * New upstream release, fixes the SSL regression (closes: #476390).
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 16 Apr 2008 16:27:07 +0200
+
 libwww-perl (5.811-1) unstable; urgency=low
 
   * New upstream release (closes: #476237).

Modified: trunk/libwww-perl/lib/HTTP/Message.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/lib/HTTP/Message.pm?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/lib/HTTP/Message.pm (original)
+++ trunk/libwww-perl/lib/HTTP/Message.pm Wed Apr 16 14:32:31 2008
@@ -2,7 +2,7 @@
 
 use strict;
 use vars qw($VERSION $AUTOLOAD);
-$VERSION = "5.811";
+$VERSION = "5.812";
 
 require HTTP::Headers;
 require Carp;
@@ -623,7 +623,7 @@
 
 =item C<charset_strict>
 
-Abort decoding when if malformed characters is found in the content.  By
+Abort decoding if malformed characters is found in the content.  By
 default you get the substitution character ("\x{FFFD}") in place of
 malformed characters.
 
@@ -665,7 +665,7 @@
 If the content type is C<message/http>, then the return value will be
 either an C<HTTP::Request> or an C<HTTP::Response> object.
 
-If an @parts argument is given, then the content of the message will
+If an @parts argument is given, then the content of the message will be
 modified. The array reference form is provided so that an empty list
 can be provided.  The @parts array should contain C<HTTP::Message>
 objects.  The @parts objects are owned by $mess after this call and

Modified: trunk/libwww-perl/lib/LWP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/lib/LWP.pm?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/lib/LWP.pm (original)
+++ trunk/libwww-perl/lib/LWP.pm Wed Apr 16 14:32:31 2008
@@ -1,6 +1,6 @@
 package LWP;
 
-$VERSION = "5.811";
+$VERSION = "5.812";
 sub Version { $VERSION; }
 
 require 5.005;

Modified: trunk/libwww-perl/lib/LWP/Authen/Digest.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/lib/LWP/Authen/Digest.pm?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/lib/LWP/Authen/Digest.pm (original)
+++ trunk/libwww-perl/lib/LWP/Authen/Digest.pm Wed Apr 16 14:32:31 2008
@@ -28,7 +28,7 @@
     push(@digest, $auth_param->{nonce});
 
     if ($auth_param->{qop}) {
-	push(@digest, $nc, $cnonce, $auth_param->{qop});
+	push(@digest, $nc, $cnonce, ($auth_param->{qop} =~ m|^auth[,;]auth-int$|) ? 'auth' : $auth_param->{qop});
     }
 
     $md5->add(join(":", $request->method, $uri));
@@ -42,7 +42,7 @@
     my %resp = map { $_ => $auth_param->{$_} } qw(realm nonce opaque);
     @resp{qw(username uri response algorithm)} = ($user, $uri, $digest, "MD5");
 
-    if (($auth_param->{qop} || "") eq "auth") {
+    if (($auth_param->{qop} || "") =~ m|^auth([,;]auth-int)?$|) {
 	@resp{qw(qop cnonce nc)} = ("auth", $cnonce, $nc);
     }
 

Modified: trunk/libwww-perl/lib/LWP/Protocol/http.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/lib/LWP/Protocol/http.pm?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/lib/LWP/Protocol/http.pm (original)
+++ trunk/libwww-perl/lib/LWP/Protocol/http.pm Wed Apr 16 14:32:31 2008
@@ -206,7 +206,7 @@
         do {
             # Since this just writes out the header block it should almost
             # always succeed to send the whole buffer in a single write call.
-            my $n = syswrite($socket, $req_buf, length($req_buf));
+            my $n = $socket->syswrite($req_buf, length($req_buf));
             unless (defined $n) {
                 redo if $!{EINTR};
                 if ($!{EAGAIN}) {
@@ -290,7 +290,7 @@
 	    if (defined($rbits) && $rbits =~ /[^\0]/) {
 		# readable
 		my $buf = $socket->_rbuf;
-		my $n = sysread($socket, $buf, 1024, length($buf));
+		my $n = $socket->sysread($buf, 1024, length($buf));
                 unless (defined $n) {
                     die "read failed: $!" unless  $!{EINTR} || $!{EAGAIN};
                     # if we get here the rest of the block will do nothing
@@ -320,7 +320,7 @@
 		}
 	    }
 	    if (defined($wbits) && $wbits =~ /[^\0]/) {
-		my $n = syswrite($socket, $$wbuf, length($$wbuf), $woffset);
+		my $n = $socket->syswrite($$wbuf, length($$wbuf), $woffset);
                 unless (defined $n) {
                     die "write failed: $!" unless $!{EINTR} || $!{EAGAIN};
                     $n = 0;  # will retry write on the next round

Modified: trunk/libwww-perl/lib/Net/HTTP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/lib/Net/HTTP.pm?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/lib/Net/HTTP.pm (original)
+++ trunk/libwww-perl/lib/Net/HTTP.pm Wed Apr 16 14:32:31 2008
@@ -3,11 +3,18 @@
 use strict;
 use vars qw($VERSION @ISA);
 
-$VERSION = "5.811";
+$VERSION = "5.812";
 eval { require IO::Socket::INET } || require IO::Socket;
 require Net::HTTP::Methods;
+require Carp;
 
 @ISA=qw(IO::Socket::INET Net::HTTP::Methods);
+
+sub new {
+    my $class = shift;
+    Carp::croak("No Host option provided") unless @_;
+    $class->SUPER::new(@_);
+}
 
 sub configure {
     my($self, $cnf) = @_;

Modified: trunk/libwww-perl/lib/Net/HTTP/Methods.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/lib/Net/HTTP/Methods.pm?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/lib/Net/HTTP/Methods.pm (original)
+++ trunk/libwww-perl/lib/Net/HTTP/Methods.pm Wed Apr 16 14:32:31 2008
@@ -5,12 +5,14 @@
 use strict;
 use vars qw($VERSION);
 
-$VERSION = "5.811";
+$VERSION = "5.812";
 
 my $CRLF = "\015\012";   # "\r\n" is not portable
 
 sub new {
-    my($class, %cnf) = @_;
+    my $class = shift;
+    unshift(@_, "Host") if @_ == 1;
+    my %cnf = @_;
     require Symbol;
     my $self = bless Symbol::gensym(), $class;
     return $self->http_configure(\%cnf);
@@ -23,14 +25,27 @@
     my $explict_host = (exists $cnf->{Host});
     my $host = delete $cnf->{Host};
     my $peer = $cnf->{PeerAddr} || $cnf->{PeerHost};
-    if ($host) {
-	$cnf->{PeerAddr} = $host unless $peer;
-    }
-    elsif (!$explict_host) {
+    if (!$peer) {
+	die "No Host option provided" unless $host;
+	$cnf->{PeerAddr} = $peer = $host;
+    }
+
+    if ($peer =~ s,:(\d+)$,,) {
+	$cnf->{PeerPort} = int($1);  # always override
+    }
+    if (!$cnf->{PeerPort}) {
+	$cnf->{PeerPort} = $self->http_default_port;
+    }
+
+    if (!$explict_host) {
 	$host = $peer;
 	$host =~ s/:.*//;
     }
-    $cnf->{PeerPort} = $self->http_default_port unless $cnf->{PeerPort};
+    if ($host && $host !~ /:/) {
+	my $p = $cnf->{PeerPort};
+	$host .= ":$p" if $p != $self->http_default_port;
+    }
+
     $cnf->{Proto} = 'tcp';
 
     my $keep_alive = delete $cnf->{KeepAlive};
@@ -46,10 +61,6 @@
 
     return undef unless $self->http_connect($cnf);
 
-    if ($host && $host !~ /:/) {
-	my $p = $self->peerport;
-	$host .= ":$p" if $p != $self->http_default_port;
-    }
     $self->host($host);
     $self->keep_alive($keep_alive);
     $self->send_te($send_te);

Modified: trunk/libwww-perl/t/base/http.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/t/base/http.t?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/t/base/http.t (original)
+++ trunk/libwww-perl/t/base/http.t Wed Apr 16 14:32:31 2008
@@ -1,6 +1,6 @@
 #!./perl -w
 
-print "1..14\n";
+print "1..15\n";
 
 use strict;
 #use Data::Dump ();
@@ -31,10 +31,6 @@
 	return $self;
     }
 
-    sub peerport {
-	return 80;
-    }
-
     sub print {
 	my $self = shift;
 	#Data::Dump::dump("PRINT", @_);
@@ -153,7 +149,7 @@
 print "ok 6\n";
 $h = undef;  # it is in a bad state now
 
-$h = HTTP->new(Host => "a") || die;  # reconnect
+$h = HTTP->new("a") || die;  # reconnect
 $res = $h->request(GET => "/09", [], {laxed => 1});
 print "not " unless $res->{code} eq "200" && $res->{message} eq "Assumed OK" &&
                     $res->{content} eq "Hello${CRLF}World!${CRLF}" &&
@@ -196,3 +192,12 @@
 $res = $h->request(TRACE => "/");
 print "not " unless $res->{code} eq "200" && $res->{content} eq "TRACE / HTTP/1.0\r\n\r\n";
 print "ok 14\n";
+
+require Net::HTTP;
+eval {
+    $h = Net::HTTP->new;
+};
+print "# $@";
+print "not " unless $@;
+print "ok 15\n";
+

Modified: trunk/libwww-perl/t/base/message.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-perl/t/base/message.t?rev=18652&op=diff
==============================================================================
--- trunk/libwww-perl/t/base/message.t (original)
+++ trunk/libwww-perl/t/base/message.t Wed Apr 16 14:32:31 2008
@@ -388,7 +388,7 @@
     ok($@ =~ /bytes/);
 }
 else {
-    skip("Missing is_utf8 test") for 1..3;
+    skip("Missing is_utf8 test", undef) for 1..3;
 }
 
 # test the add_content_utf8 method
@@ -400,5 +400,5 @@
     ok($m->decoded_content, "\x{263A}-\x{00C5}");
 }
 else {
-    skip("Missing is_utf8 test") for 1..2;
+    skip("Missing is_utf8 test", undef) for 1..2;
 }




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