diff -Nru libnet-http-perl-6.01/Changes libnet-http-perl-6.02/Changes --- libnet-http-perl-6.01/Changes 2011-04-17 11:22:33.000000000 +0000 +++ libnet-http-perl-6.02/Changes 2011-11-21 20:26:39.000000000 +0000 @@ -1,4 +1,13 @@ _______________________________________________________________________________ +2011-11-21 Net-HTTP 6.02 + +Don't disable blocking method [RT#72580] +Don't stop on unrecognized Makefile.PL arguments [RT#68337] +Document Net:HTTPS [RT#71599] + + + +_______________________________________________________________________________ 2011-03-17 Net-HTTP 6.01 Don't run live test by default. Run 'perl Makefile.PL --live-tests' to enable. diff -Nru libnet-http-perl-6.01/debian/changelog libnet-http-perl-6.02/debian/changelog --- libnet-http-perl-6.01/debian/changelog 2011-04-23 19:11:23.000000000 +0000 +++ libnet-http-perl-6.02/debian/changelog 2011-11-26 14:58:39.000000000 +0000 @@ -1,3 +1,19 @@ +libnet-http-perl (6.02-1) unstable; urgency=low + + [ Florian Schlichting ] + * Imported Upstream version 6.02 + * Bump debhelper compatibility to 8 (no changes) + * Add myself to Uploaders and Copyright + + [ Ansgar Burchardt ] + * debian/control: Convert Vcs-* fields to Git. + + [ Salvatore Bonaccorso ] + * debian/copyright: Replace DEP5 Format-Specification URL from + svn.debian.org to anonscm.debian.org URL. + + -- Florian Schlichting Fri, 25 Nov 2011 21:08:41 +0000 + libnet-http-perl (6.01-1) unstable; urgency=low * Adding recommends clause for libio-socket-ssl-perl diff -Nru libnet-http-perl-6.01/debian/compat libnet-http-perl-6.02/debian/compat --- libnet-http-perl-6.01/debian/compat 2011-03-13 01:10:07.000000000 +0000 +++ libnet-http-perl-6.02/debian/compat 2011-11-26 14:58:39.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru libnet-http-perl-6.01/debian/control libnet-http-perl-6.02/debian/control --- libnet-http-perl-6.01/debian/control 2011-04-23 19:11:23.000000000 +0000 +++ libnet-http-perl-6.02/debian/control 2011-11-26 14:58:39.000000000 +0000 @@ -1,14 +1,15 @@ Source: libnet-http-perl Section: perl Priority: optional -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper (>= 8) Build-Depends-Indep: perl Maintainer: Debian Perl Group -Uploaders: Nicholas Bamber +Uploaders: Nicholas Bamber , + Florian Schlichting Standards-Version: 3.9.2 Homepage: http://search.cpan.org/dist/Net-HTTP/ -Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libnet-http-perl/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libnet-http-perl/ +Vcs-Git: git://git.debian.org/pkg-perl/packages/libnet-http-perl.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libnet-http-perl.git Package: libnet-http-perl Architecture: all diff -Nru libnet-http-perl-6.01/debian/copyright libnet-http-perl-6.02/debian/copyright --- libnet-http-perl-6.01/debian/copyright 2011-03-13 01:10:07.000000000 +0000 +++ libnet-http-perl-6.02/debian/copyright 2011-11-26 14:58:39.000000000 +0000 @@ -1,4 +1,4 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=135 Maintainer: Gisle Aas Source: http://search.cpan.org/dist/Net-HTTP/ Name: Net-HTTP @@ -8,7 +8,8 @@ License: Artistic or GPL-1+ Files: debian/* -Copyright: 2011, Nicholas Bamber +Copyright: 2011, Nicholas Bamber , + 2011, Florian Schlichting License: Artistic or GPL-1+ License: Artistic diff -Nru libnet-http-perl-6.01/lib/Net/HTTP.pm libnet-http-perl-6.02/lib/Net/HTTP.pm --- libnet-http-perl-6.01/lib/Net/HTTP.pm 2011-04-17 11:20:42.000000000 +0000 +++ libnet-http-perl-6.02/lib/Net/HTTP.pm 2011-11-21 20:23:21.000000000 +0000 @@ -3,7 +3,7 @@ use strict; use vars qw($VERSION @ISA $SOCKET_CLASS); -$VERSION = "6.01"; +$VERSION = "6.02"; unless ($SOCKET_CLASS) { eval { require IO::Socket::INET } || require IO::Socket; $SOCKET_CLASS = "IO::Socket::INET"; diff -Nru libnet-http-perl-6.01/lib/Net/HTTPS.pm libnet-http-perl-6.02/lib/Net/HTTPS.pm --- libnet-http-perl-6.01/lib/Net/HTTPS.pm 2011-03-20 11:36:18.000000000 +0000 +++ libnet-http-perl-6.02/lib/Net/HTTPS.pm 2011-11-21 20:23:04.000000000 +0000 @@ -3,7 +3,7 @@ use strict; use vars qw($VERSION $SSL_SOCKET_CLASS @ISA); -$VERSION = "6.00"; +$VERSION = "6.02"; # Figure out which SSL implementation to use if ($SSL_SOCKET_CLASS) { @@ -72,9 +72,32 @@ 443; } -# The underlying SSLeay classes fails to work if the socket is -# placed in non-blocking mode. This override of the blocking -# method makes sure it stays the way it was created. -sub blocking { } # noop - 1; + +=head1 NAME + +Net::HTTPS - Low-level HTTP over SSL/TLS connection (client) + +=head1 DESCRIPTION + +The C is a low-level HTTP over SSL/TLS client. The interface is the same +as the interface for C, but the constructor method take additional parameters +as accepted by L. The C object isa C +too, which make it inherit additional methods from that base class. + +For historical reasons this module also supports using C (from the +Crypt-SSLeay distribution) as its SSL driver and base class. This base is +automatically selected if available and C isn't. You might +also force which implementation to use by setting $Net::HTTPS::SSL_SOCKET_CLASS +before loading this module. If not set this variable is initialized from the +C environment variable. + +=head1 ENVIRONMENT + +You might set the C environment variable to the name +of the base SSL implementation (and Net::HTTPS base class) to use. The default +is C. Currently the only other supported value is C. + +=head1 SEE ALSO + +L, L diff -Nru libnet-http-perl-6.01/Makefile.PL libnet-http-perl-6.02/Makefile.PL --- libnet-http-perl-6.01/Makefile.PL 2011-04-17 11:14:27.000000000 +0000 +++ libnet-http-perl-6.02/Makefile.PL 2011-11-21 19:53:45.000000000 +0000 @@ -4,7 +4,7 @@ use strict; use ExtUtils::MakeMaker; use Getopt::Long qw(GetOptions); -GetOptions(\my %opt, 'live-tests',) or die "Usage: $0 [--live-tests]\n"; +GetOptions(\my %opt, 'live-tests',) or warn "Usage: $0 [--live-tests]\n"; my $flag_file = "t/LIVE_TESTS"; if ($opt{"live-tests"}) { diff -Nru libnet-http-perl-6.01/MANIFEST libnet-http-perl-6.02/MANIFEST --- libnet-http-perl-6.01/MANIFEST 2011-04-17 11:23:59.000000000 +0000 +++ libnet-http-perl-6.02/MANIFEST 2011-11-21 20:28:31.000000000 +0000 @@ -8,4 +8,5 @@ README t/http.t t/apache.t +t/apache-https.t META.yml Module meta-data (added by MakeMaker) diff -Nru libnet-http-perl-6.01/META.yml libnet-http-perl-6.02/META.yml --- libnet-http-perl-6.01/META.yml 2011-04-17 11:23:59.000000000 +0000 +++ libnet-http-perl-6.02/META.yml 2011-11-21 20:28:31.000000000 +0000 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: Net-HTTP -version: 6.01 +version: 6.02 abstract: Low-level HTTP connection (client) author: - Gisle Aas @@ -23,7 +23,7 @@ directory: - t - inc -generated_by: ExtUtils::MakeMaker version 6.56 +generated_by: ExtUtils::MakeMaker version 6.57_05 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 diff -Nru libnet-http-perl-6.01/t/apache-https.t libnet-http-perl-6.02/t/apache-https.t --- libnet-http-perl-6.01/t/apache-https.t 1970-01-01 00:00:00.000000000 +0000 +++ libnet-http-perl-6.02/t/apache-https.t 2011-11-21 19:49:44.000000000 +0000 @@ -0,0 +1,73 @@ +#!perl -w + +BEGIN { + unless (-f "t/LIVE_TESTS" || -f "LIVE_TESTS") { + print "1..0 # SKIP Live tests disabled; pass --live-tests to Makefile.PL to enable\n"; + exit; + } + eval { + require IO::Socket::INET; + my $s = IO::Socket::INET->new( + PeerHost => "www.apache.org:443", + Timeout => 5, + ); + die "Can't connect: $@" unless $s; + }; + if ($@) { + print "1..0 # SKIP Can't connect to www.apache.org\n"; + print $@; + exit; + } + + unless (eval { require IO::Socket::SSL} || eval { require Net::SSL }) { + print "1..0 # SKIP IO::Socket::SSL or Net::SSL not available\n"; + print $@; + exit; + } +} + +use strict; +use Test; +plan tests => 8; + +use Net::HTTPS; + + +my $s = Net::HTTPS->new(Host => "www.apache.org", + KeepAlive => 1, + Timeout => 15, + PeerHTTPVersion => "1.1", + MaxLineLength => 512) || die "$@"; + +for (1..2) { + $s->write_request(TRACE => "/libwww-perl", + 'User-Agent' => 'Mozilla/5.0', + 'Accept-Language' => 'no,en', + Accept => '*/*'); + + my($code, $mess, %h) = $s->read_response_headers; + print "# ----------------------------\n"; + print "# $code $mess\n"; + for (sort keys %h) { + print "# $_: $h{$_}\n"; + } + print "#\n"; + + my $buf; + while (1) { + my $tmp; + my $n = $s->read_entity_body($tmp, 20); + last unless $n; + $buf .= $tmp; + } + $buf =~ s/\r//g; + (my $out = $buf) =~ s/^/# /gm; + print $out; + + ok($code, "200"); + ok($h{'Content-Type'}, "message/http"); + + ok($buf, qr/^TRACE \/libwww-perl HTTP\/1/); + ok($buf, qr/^User-Agent: Mozilla\/5.0$/m); +} +