r73087 - in /branches/upstream/libnet-http-perl/current: Changes META.yml Makefile.PL lib/Net/HTTP.pm t/apache.t

[periapt-guest at users.alioth.debian.org]

Author: periapt-guest
Date: Fri Apr 22 09:40:36 2011
New Revision: 73087

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=73087
Log:
[svn-upgrade] new version libnet-http-perl (6.01)

Modified:
    branches/upstream/libnet-http-perl/current/Changes
    branches/upstream/libnet-http-perl/current/META.yml
    branches/upstream/libnet-http-perl/current/Makefile.PL
    branches/upstream/libnet-http-perl/current/lib/Net/HTTP.pm
    branches/upstream/libnet-http-perl/current/t/apache.t

Modified: branches/upstream/libnet-http-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-http-perl/current/Changes?rev=73087&op=diff
==============================================================================
--- branches/upstream/libnet-http-perl/current/Changes (original)
+++ branches/upstream/libnet-http-perl/current/Changes Fri Apr 22 09:40:36 2011
@@ -1,3 +1,11 @@
+_______________________________________________________________________________
+2011-03-17 Net-HTTP 6.01
+
+Don't run live test by default.  Run 'perl Makefile.PL --live-tests' to enable.
+More relaxed apache test; should pass even if proxies has added headers.
+
+
+
 _______________________________________________________________________________
 2011-02-27 Net-HTTP 6.00
 

Modified: branches/upstream/libnet-http-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-http-perl/current/META.yml?rev=73087&op=diff
==============================================================================
--- branches/upstream/libnet-http-perl/current/META.yml (original)
+++ branches/upstream/libnet-http-perl/current/META.yml Fri Apr 22 09:40:36 2011
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Net-HTTP
-version:            6.00
+version:            6.01
 abstract:           Low-level HTTP connection (client)
 author:
     - Gisle Aas <gisle at activestate.com>
@@ -18,7 +18,7 @@
     perl:                 5.008008
 resources:
     MailingList:  mailto:libwww at perl.org
-    repository:   http://github.com/gisle/libwww-perl
+    repository:   http://github.com/gisle/libwww-perl/tree/Net-HTTP/master
 no_index:
     directory:
         - t

Modified: branches/upstream/libnet-http-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-http-perl/current/Makefile.PL?rev=73087&op=diff
==============================================================================
--- branches/upstream/libnet-http-perl/current/Makefile.PL (original)
+++ branches/upstream/libnet-http-perl/current/Makefile.PL Fri Apr 22 09:40:36 2011
@@ -3,6 +3,16 @@
 require 5.008008;
 use strict;
 use ExtUtils::MakeMaker;
+use Getopt::Long qw(GetOptions);
+GetOptions(\my %opt, 'live-tests',) or die "Usage: $0 [--live-tests]\n";
+
+my $flag_file = "t/LIVE_TESTS";
+if ($opt{"live-tests"}) {
+    open(my $fh, ">", $flag_file) || die;
+}
+else {
+    unlink($flag_file);
+}
 
 WriteMakefile(
     NAME => 'Net::HTTP',
@@ -22,7 +32,7 @@
             'IO::Socket::SSL' => "1.38",
         },
 	resources => {
-            repository => 'http://github.com/gisle/libwww-perl',
+            repository => 'http://github.com/gisle/libwww-perl/tree/Net-HTTP/master',
 	    MailingList => 'mailto:libwww at perl.org',
         }
     },

Modified: branches/upstream/libnet-http-perl/current/lib/Net/HTTP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-http-perl/current/lib/Net/HTTP.pm?rev=73087&op=diff
==============================================================================
--- branches/upstream/libnet-http-perl/current/lib/Net/HTTP.pm (original)
+++ branches/upstream/libnet-http-perl/current/lib/Net/HTTP.pm Fri Apr 22 09:40:36 2011
@@ -3,7 +3,7 @@
 use strict;
 use vars qw($VERSION @ISA $SOCKET_CLASS);
 
-$VERSION = "6.00";
+$VERSION = "6.01";
 unless ($SOCKET_CLASS) {
     eval { require IO::Socket::INET } || require IO::Socket;
     $SOCKET_CLASS = "IO::Socket::INET";

Modified: branches/upstream/libnet-http-perl/current/t/apache.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-http-perl/current/t/apache.t?rev=73087&op=diff
==============================================================================
--- branches/upstream/libnet-http-perl/current/t/apache.t (original)
+++ branches/upstream/libnet-http-perl/current/t/apache.t Fri Apr 22 09:40:36 2011
@@ -1,6 +1,10 @@
 #!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(
@@ -18,7 +22,7 @@
 
 use strict;
 use Test;
-plan tests => 6;
+plan tests => 8;
 
 use Net::HTTP;
 
@@ -36,14 +40,12 @@
 		      Accept => '*/*');
 
     my($code, $mess, %h) = $s->read_response_headers;
+    print "# ----------------------------\n";
     print "# $code $mess\n";
     for (sort keys %h) {
 	print "# $_: $h{$_}\n";
     }
-    print "\n";
-
-    ok($code, "200");
-    ok($h{'Content-Type'}, "message/http");
+    print "#\n";
 
     my $buf;
     while (1) {
@@ -53,14 +55,13 @@
 	$buf .= $tmp;
     }
     $buf =~ s/\r//g;
+    (my $out = $buf) =~ s/^/# /gm;
+    print $out;
 
-    ok($buf, <<EOT);
-TRACE /libwww-perl HTTP/1.1
-Host: www.apache.org
-User-Agent: Mozilla/5.0
-Accept-Language: no,en
-Accept: */*
+    ok($code, "200");
+    ok($h{'Content-Type'}, "message/http");
 
-EOT
+    ok($buf, qr/^TRACE \/libwww-perl HTTP\/1/);
+    ok($buf, qr/^User-Agent: Mozilla\/5.0$/m);
 }