r55272 - in /trunk/liburi-perl: Changes META.yml URI.pm debian/changelog t/heuristic.t

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Thu Apr 1 20:06:59 UTC 2010


Author: gregoa
Date: Thu Apr  1 20:06:46 2010
New Revision: 55272

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=55272
Log:
New upstream release.

Modified:
    trunk/liburi-perl/Changes
    trunk/liburi-perl/META.yml
    trunk/liburi-perl/URI.pm
    trunk/liburi-perl/debian/changelog
    trunk/liburi-perl/t/heuristic.t

Modified: trunk/liburi-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/Changes?rev=55272&op=diff
==============================================================================
--- trunk/liburi-perl/Changes (original)
+++ trunk/liburi-perl/Changes Thu Apr  1 20:06:46 2010
@@ -1,3 +1,12 @@
+2010-03-31   Gisle Aas <gisle at ActiveState.com>
+
+   Release 1.54
+
+   Alex Kapranoff (1):
+      Fix heuristic test fails on hosts in .su (or .uk) domains [RT#56135]
+
+
+
 2010-03-14   Gisle Aas <gisle at ActiveState.com>
 
    Release 1.53

Modified: trunk/liburi-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/META.yml?rev=55272&op=diff
==============================================================================
--- trunk/liburi-perl/META.yml (original)
+++ trunk/liburi-perl/META.yml Thu Apr  1 20:06:46 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               URI
-version:            1.53
+version:            1.54
 abstract:           Uniform Resource Identifiers (absolute and relative)
 author:
     - Gisle Aas <gisle at activestate.com>

Modified: trunk/liburi-perl/URI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/URI.pm?rev=55272&op=diff
==============================================================================
--- trunk/liburi-perl/URI.pm (original)
+++ trunk/liburi-perl/URI.pm Thu Apr  1 20:06:46 2010
@@ -2,7 +2,7 @@
 
 use strict;
 use vars qw($VERSION);
-$VERSION = "1.53";
+$VERSION = "1.54";
 
 use vars qw($ABS_REMOTE_LEADING_DOTS $ABS_ALLOW_RELATIVE_SCHEME $DEFAULT_QUERY_FORM_DELIMITER);
 

Modified: trunk/liburi-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/debian/changelog?rev=55272&op=diff
==============================================================================
--- trunk/liburi-perl/debian/changelog (original)
+++ trunk/liburi-perl/debian/changelog Thu Apr  1 20:06:46 2010
@@ -1,3 +1,9 @@
+liburi-perl (1.54-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- gregor herrmann <gregoa at debian.org>  Thu, 01 Apr 2010 22:04:36 +0200
+
 liburi-perl (1.53-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/liburi-perl/t/heuristic.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liburi-perl/t/heuristic.t?rev=55272&op=diff
==============================================================================
--- trunk/liburi-perl/t/heuristic.t (original)
+++ trunk/liburi-perl/t/heuristic.t Thu Apr  1 20:06:46 2010
@@ -5,7 +5,7 @@
    exit;
 }
 
-print "1..19\n";
+print "1..20\n";
 
 use URI::Heuristic qw(uf_urlstr uf_url);
 if (shift) {
@@ -54,63 +54,71 @@
         print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(org|co)\.uk/camel\.gif$,;
         print "ok 6\n";
 
+        use Net::Domain;
         $ENV{LC_ALL} = "C";
+        { no warnings; *Net::Domain::hostfqdn = sub { return 'vasya.su' } }
+        undef $URI::Heuristic::MY_COUNTRY;
+        print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.su/camel\.gif$,;
+        print "ok 7\n";
+
+        $ENV{LC_ALL} = "C";
+        { no warnings; *Net::Domain::hostfqdn = sub { return '' } }
         undef $URI::Heuristic::MY_COUNTRY;
         print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(com|org)/camel\.gif$,;
-        print "ok 7\n";
+        print "ok 8\n";
 
         $ENV{HTTP_ACCEPT_LANGUAGE} = "en-ca";
         undef $URI::Heuristic::MY_COUNTRY;
         print "not " unless uf_urlstr("perl/camel.gif") eq "http://www.perl.ca/camel.gif";
-        print "ok 8\n";
+        print "ok 9\n";
     }
 
     $URI::Heuristic::MY_COUNTRY = "bv";
     print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(com|org)/camel\.gif$,;
-    print "ok 9\n";
+    print "ok 10\n";
 
     # Backwards compatibility; uk != United Kingdom in ISO 3166
     $URI::Heuristic::MY_COUNTRY = "uk";
     print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(org|co)\.uk/camel\.gif$,;
-    print "ok 10\n";
+    print "ok 11\n";
 
     $URI::Heuristic::MY_COUNTRY = "gb";
     print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(org|co)\.uk/camel\.gif$,;
-    print "ok 11\n";
+    print "ok 12\n";
 
     $ENV{URL_GUESS_PATTERN} = "www.ACME.org www.ACME.com";
     print "not " unless uf_urlstr("perl") eq "http://www.perl.org";
-    print "ok 12\n";
+    print "ok 13\n";
 
 } else {
     # don't make the innocent worry
     print "Skipping test 6-12 because DNS does not work\n";
-    for (6..12) { print "ok $_\n"; }
+    for (6..13) { print "ok $_\n"; }
 
 }
 
 {
 local $ENV{URL_GUESS_PATTERN} = "";
 print "not " unless uf_urlstr("perl") eq "http://perl";
-print "ok 13\n";
+print "ok 14\n";
 
 print "not " unless uf_urlstr("http:80") eq "http:80";
-print "ok 14\n";
+print "ok 15\n";
 
 print "not " unless uf_urlstr("mailto:gisle\@aas.no") eq "mailto:gisle\@aas.no";
-print "ok 15\n";
+print "ok 16\n";
 
 print "not " unless uf_urlstr("gisle\@aas.no") eq "mailto:gisle\@aas.no";
-print "ok 16\n";
+print "ok 17\n";
 
 print "not " unless uf_urlstr("Gisle.Aas\@aas.perl.org") eq "mailto:Gisle.Aas\@aas.perl.org";
-print "ok 17\n";
+print "ok 18\n";
 
 print "not " unless uf_url("gopher.sn.no")->scheme eq "gopher";
-print "ok 18\n";
+print "ok 19\n";
 
 print "not " unless uf_urlstr("123.3.3.3:8080/foo") eq "http://123.3.3.3:8080/foo";
-print "ok 19\n";
+print "ok 20\n";
 }
 
 #




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