r39663 - in /branches/upstream/librpc-xml-perl/current: ChangeLog ChangeLog.xml MANIFEST META.yml Makefile.PL README SIGNATURE lib/RPC/XML/Client.pm lib/RPC/XML/Server.pm t/70_compression_detect.t

carnil-guest at users.alioth.debian.org carnil-guest at users.alioth.debian.org
Fri Jul 10 18:30:13 UTC 2009


Author: carnil-guest
Date: Fri Jul 10 18:29:41 2009
New Revision: 39663

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

Added:
    branches/upstream/librpc-xml-perl/current/t/70_compression_detect.t
Modified:
    branches/upstream/librpc-xml-perl/current/ChangeLog
    branches/upstream/librpc-xml-perl/current/ChangeLog.xml
    branches/upstream/librpc-xml-perl/current/MANIFEST
    branches/upstream/librpc-xml-perl/current/META.yml
    branches/upstream/librpc-xml-perl/current/Makefile.PL
    branches/upstream/librpc-xml-perl/current/README
    branches/upstream/librpc-xml-perl/current/SIGNATURE
    branches/upstream/librpc-xml-perl/current/lib/RPC/XML/Client.pm
    branches/upstream/librpc-xml-perl/current/lib/RPC/XML/Server.pm

Modified: branches/upstream/librpc-xml-perl/current/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librpc-xml-perl/current/ChangeLog?rev=39663&op=diff
==============================================================================
--- branches/upstream/librpc-xml-perl/current/ChangeLog (original)
+++ branches/upstream/librpc-xml-perl/current/ChangeLog Fri Jul 10 18:29:41 2009
@@ -8,6 +8,15 @@
 		protocol in terms of supporting HTTP/1.1 and    
 		allowing choice of character-set encodings for  
 		XML messages.                                   
+
+0.67	Friday July 10, 2009, 01:30:00 AM -0700
+
+	* lib/RPC/XML/Client.pm
+	* lib/RPC/XML/Server.pm
+	* t/70_compression_detect.t (added)
+	RT #47219: Mis-read the patch from previous fix, this actually  
+	fixes it. Also added a test suite to check for                  
+	compression-detection.                                          
 
 0.66	Thursday July  9, 2009, 07:36:15 AM -0700
 
@@ -1145,7 +1154,7 @@
 	* *
 	All files are tracked from this point forward.                  
 
-# Generated on Thursday July  9, 2009, 07:38:10 AM -0700
+# Generated on Friday July 10, 2009, 01:30:09 AM -0700
 # Using changelog2x/0.10, App::Changelog2x/0.10, XML::LibXML/1.69,             
 # XML::LibXSLT/1.68, libxml/2.6.32, libxslt/1.1.24 (with exslt)                
 # XSLT sources:

Modified: branches/upstream/librpc-xml-perl/current/ChangeLog.xml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librpc-xml-perl/current/ChangeLog.xml?rev=39663&op=diff
==============================================================================
--- branches/upstream/librpc-xml-perl/current/ChangeLog.xml (original)
+++ branches/upstream/librpc-xml-perl/current/ChangeLog.xml Fri Jul 10 18:29:41 2009
@@ -15,6 +15,20 @@
     extensions to the base protocol in terms of supporting HTTP/1.1 and
     allowing choice of character-set encodings for XML messages.
   </description>
+  <release date="2009-07-10T01:30:00-07:00" version="0.67" sc:tag="0.67">
+    <change git:commit="67180ef41cdfa56c771e6b9dd8d5f1f116b7dc77">
+      <fileset>
+        <file path="lib/RPC/XML/Client.pm" />
+        <file path="lib/RPC/XML/Server.pm" />
+        <file path="t/70_compression_detect.t" action="ADD" />
+      </fileset>
+      <description>
+        <xhtml:a href="http://rt.cpan.org/Ticket/Display.html?id=47219">RT #47219</xhtml:a>:
+        Mis-read the patch from previous fix, this actually fixes it.
+        Also added a test suite to check for compression-detection.
+      </description>
+    </change>
+  </release>
   <release date="2009-07-09T07:36:15-07:00" version="0.66" sc:tag="0.66">
     <change git:commit="d7469ec822d50fdc48642dae60c18d0a6bd5c641">
       <fileset>

Modified: branches/upstream/librpc-xml-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librpc-xml-perl/current/MANIFEST?rev=39663&op=diff
==============================================================================
--- branches/upstream/librpc-xml-perl/current/MANIFEST (original)
+++ branches/upstream/librpc-xml-perl/current/MANIFEST Fri Jul 10 18:29:41 2009
@@ -61,6 +61,7 @@
 t/41_server_hang.t
 t/50_client.t
 t/60_net_server.t
+t/70_compression_detect.t
 t/meth_bad_1.xpl
 t/meth_bad_2.xpl
 t/meth_good_1.xpl

Modified: branches/upstream/librpc-xml-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librpc-xml-perl/current/META.yml?rev=39663&op=diff
==============================================================================
--- branches/upstream/librpc-xml-perl/current/META.yml (original)
+++ branches/upstream/librpc-xml-perl/current/META.yml Fri Jul 10 18:29:41 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               RPC-XML
-version:            0.66
+version:            0.67
 abstract:           Data, client and server classes for XML-RPC
 author:
     - Randy J. Ray

Modified: branches/upstream/librpc-xml-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librpc-xml-perl/current/Makefile.PL?rev=39663&op=diff
==============================================================================
--- branches/upstream/librpc-xml-perl/current/Makefile.PL (original)
+++ branches/upstream/librpc-xml-perl/current/Makefile.PL Fri Jul 10 18:29:41 2009
@@ -84,7 +84,7 @@
 
 WriteMakefile(
               NAME      => 'RPC::XML',
-              VERSION   => '0.66',
+              VERSION   => '0.67',
               AUTHOR    => 'Randy J. Ray',
               ABSTRACT  => 'Data, client and server classes for XML-RPC',
               EXE_FILES => \@scripts,

Modified: branches/upstream/librpc-xml-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librpc-xml-perl/current/README?rev=39663&op=diff
==============================================================================
--- branches/upstream/librpc-xml-perl/current/README (original)
+++ branches/upstream/librpc-xml-perl/current/README Fri Jul 10 18:29:41 2009
@@ -1,6 +1,6 @@
 RPC::XML - An implementation of XML-RPC
 
-Version: 0.66
+Version: 0.67
 
 WHAT IS IT
 
@@ -68,27 +68,6 @@
 
 * lib/RPC/XML/Client.pm
 * lib/RPC/XML/Server.pm
-RT #47219: Re-did the detection of compression availability     
-(testing for the Compress::Zlib module) based on comments in    
-this bug.                                                       
-
-* t/60_net_server.t
-RT #47220: Net::Server tests are not (currently) viable on      
-Windows. Also made script taint-safe.                           
-
-* t/40_server.t
-* t/50_client.t
-* t/util.pl
-RT #47221: Applied a patch from kmx at volny.cz, for better        
-Windows testing.                                                
-
-* lib/Apache/RPC/Server.pm
-* lib/Apache/RPC/Status.pm
-* lib/RPC/XML.pm
-* lib/RPC/XML/Client.pm
-* lib/RPC/XML/Function.pm
-* lib/RPC/XML/Method.pm
-* lib/RPC/XML/Parser.pm
-* lib/RPC/XML/Procedure.pm
-* lib/RPC/XML/Server.pm
-All modules now use the "warnings" pragma.                      
+* t/70_compression_detect.t (added)
+RT #47219: Mis-read the patch from previous fix, this actually
+fixes it. Also added a test suite to check for compression-detection.                                          

Modified: branches/upstream/librpc-xml-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librpc-xml-perl/current/SIGNATURE?rev=39663&op=diff
==============================================================================
--- branches/upstream/librpc-xml-perl/current/SIGNATURE (original)
+++ branches/upstream/librpc-xml-perl/current/SIGNATURE Fri Jul 10 18:29:41 2009
@@ -14,12 +14,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-SHA1 feb330708524619c424c588955a1e117fe1793c3 ChangeLog
-SHA1 3faeffd41763adfca6c99c0ed5646b69322d4252 ChangeLog.xml
-SHA1 ccb9bb6b01c777a7dbd8b62d713ea73455eb0af0 MANIFEST
-SHA1 e39371c894f2cd39ad6b658cb1641adc0358f2d2 META.yml
-SHA1 1984430c2418745903a04e33dbdf6f874831ee7b Makefile.PL
-SHA1 3b68f4977cb022558478d350f6278a419af39d20 README
+SHA1 906fca9d72d8534b59eb659f1f610cdb4af0f8b5 ChangeLog
+SHA1 1b4c52cbfcf208911c985169e0950f7b2eb0a578 ChangeLog.xml
+SHA1 4bfed1e5bed91fe3bfc1a83ec43bdb6dc7fcedd8 MANIFEST
+SHA1 46e6e9e3cb6b7476496192bdb1f0cae499393737 META.yml
+SHA1 a77a4132a614fbcd166ecbd434cd7cfa4adcc489 Makefile.PL
+SHA1 f0fd357de4399e8b9e30712fb92e4ab5963d0f99 README
 SHA1 d210d832fa02c0f0b79d7c5c65c4a72c3315e230 README.apache2
 SHA1 4389a5f0ad9caa86b4d3d2578dcabe67105302ca etc/make_method
 SHA1 e6a42047da332c81c196ce8f043977d25ccfde8e etc/rpc-method.dtd
@@ -37,12 +37,12 @@
 SHA1 d87580bfe927be390284fd2f3712ba2b5f4173b2 lib/Apache/RPC/status.code
 SHA1 9ef9b17398ef8bd90a84d6b64b7721a9ed7717af lib/Apache/RPC/status.help
 SHA1 a68515510bab1a3dbf5c4de1fce7842e748d7b0c lib/RPC/XML.pm
-SHA1 0d2935b44b86a6453f5f2d9a94b8bd60fd3ff393 lib/RPC/XML/Client.pm
+SHA1 888be0d7e7ffdaf3c53fc05340cb96fd83194c29 lib/RPC/XML/Client.pm
 SHA1 d94c5845f1bee94677794c1d022f975b8a5ec99a lib/RPC/XML/Function.pm
 SHA1 f3f34dc634762ea8bde150b9080ad73b595b356d lib/RPC/XML/Method.pm
 SHA1 17b18032f64a42774ba3c87a51f245b1813c506c lib/RPC/XML/Parser.pm
 SHA1 e8a147ef5ebdea6e319879779ee6ed85ad1830fe lib/RPC/XML/Procedure.pm
-SHA1 9369a7ca139f1f581fc60ad7cfd780dcdbfd8c6f lib/RPC/XML/Server.pm
+SHA1 7cd469ff8481636f2ff3564bb76eb3862ddfb82a lib/RPC/XML/Server.pm
 SHA1 3b1b1815be69edabfad34b45f93259aeab6e314e methods/identity.base
 SHA1 dfb493b476b4284b10597ddcfa33c3fbb1f38658 methods/identity.code
 SHA1 2ac37e1c74e4a534e55f20cb53a2023b2eaf80bc methods/identity.help
@@ -78,6 +78,7 @@
 SHA1 1f84874e532cfd374465b4483718984739d84971 t/41_server_hang.t
 SHA1 006615241f01a80b4ac43f17477ea042917f29fa t/50_client.t
 SHA1 159600810136f11de3fa41d160fda57a2f0647a7 t/60_net_server.t
+SHA1 5bd19f446ce3ac8f47928f80679694e1943f8e74 t/70_compression_detect.t
 SHA1 99b3f1434b7223d74a8ed49e5b67d87d27c2e457 t/meth_bad_1.xpl
 SHA1 14e3dfb6129a9d6f5bfd15bd490daa9010f6bac9 t/meth_bad_2.xpl
 SHA1 99509569e177902aceaac0a7681c421f22a356b6 t/meth_good_1.xpl
@@ -89,7 +90,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkpWAY4ACgkQ3Cp33jjp81W6sACeLqa0x3UbInLQGmc30fnzKze3
-SM4An2oZE/ng2wkgGlX5NjKG53gn5081
-=qMhk
+iEYEARECAAYFAkpW/L0ACgkQ3Cp33jjp81XiSwCfUJwlrJPPyNrrCLy40Pvpj2Fd
+DdEAn3gqEckabiXZ8pGzPrUCd3zUlypj
+=jLJ4
 -----END PGP SIGNATURE-----

Modified: branches/upstream/librpc-xml-perl/current/lib/RPC/XML/Client.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librpc-xml-perl/current/lib/RPC/XML/Client.pm?rev=39663&op=diff
==============================================================================
--- branches/upstream/librpc-xml-perl/current/lib/RPC/XML/Client.pm (original)
+++ branches/upstream/librpc-xml-perl/current/lib/RPC/XML/Client.pm Fri Jul 10 18:29:41 2009
@@ -48,11 +48,11 @@
 BEGIN
 {
     # Check for compression support
-    eval "require Compress::Zlib";
+    eval { require Compress::Zlib; };
     $COMPRESSION_AVAILABLE = ($@) ? '' : 'deflate';
 }
 
-$VERSION = '1.28';
+$VERSION = '1.29';
 
 ###############################################################################
 #

Modified: branches/upstream/librpc-xml-perl/current/lib/RPC/XML/Server.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librpc-xml-perl/current/lib/RPC/XML/Server.pm?rev=39663&op=diff
==============================================================================
--- branches/upstream/librpc-xml-perl/current/lib/RPC/XML/Server.pm (original)
+++ branches/upstream/librpc-xml-perl/current/lib/RPC/XML/Server.pm Fri Jul 10 18:29:41 2009
@@ -81,7 +81,8 @@
 use RPC::XML::Parser;
 use RPC::XML::Procedure;
 
-BEGIN {
+BEGIN
+{
     $INSTALL_DIR = (File::Spec->splitpath(__FILE__))[1];
     @XPL_PATH = ($INSTALL_DIR, File::Spec->curdir);
 
@@ -92,12 +93,12 @@
     $IO_SOCKET_SSL_HACK_NEEDED = 1;
 
     # Check for compression support
-    eval "require Compress::Zlib";
+    eval { require Compress::Zlib; };
     $COMPRESSION_AVAILABLE = ($@) ? '' : 'deflate';
 }
 
 
-$VERSION = '1.51';
+$VERSION = '1.52';
 
 ###############################################################################
 #

Added: branches/upstream/librpc-xml-perl/current/t/70_compression_detect.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librpc-xml-perl/current/t/70_compression_detect.t?rev=39663&op=file
==============================================================================
--- branches/upstream/librpc-xml-perl/current/t/70_compression_detect.t (added)
+++ branches/upstream/librpc-xml-perl/current/t/70_compression_detect.t Fri Jul 10 18:29:41 2009
@@ -1,0 +1,86 @@
+#!/usr/bin/perl
+
+# Test whether the client and server classes correctly detect the presence
+# or absence of compression support.
+
+use strict;
+use warnings;
+use vars qw($compression_available %TEST_PKGS);
+
+use Test::More;
+
+# First, determine if we actually *do* have Compress::Zlib available:
+eval { require Compress::Zlib; };
+$compression_available = ($@) ? 0 : 1;
+
+# These are the modules that need to correctly detect compression:
+%TEST_PKGS = ( 'RPC::XML::Client' => 'RPC/XML/Client.pm',
+               'RPC::XML::Server' => 'RPC/XML/Server.pm' );
+
+plan tests => (2 * (scalar keys %TEST_PKGS));
+
+# Clear out Compress::Zlib so it'll try to load again:
+clear('Compress::Zlib', 'Compress/Zlib.pm');
+
+# If compression is truly not available, just test that the modules correctly
+# detect this. Otherwise, get crafty.
+
+# Start by testing failure-to-detect
+unshift(@INC, sub {
+    die "Force-failing Compress::Zlib" if ($_[1] eq 'Compress/Zlib.pm');
+    return undef;
+}) if ($compression_available);
+
+for my $pkg (sort keys %TEST_PKGS)
+{
+    no strict 'refs';
+
+    eval "require $pkg;";
+
+    is(${"${pkg}::COMPRESSION_AVAILABLE"}, '',
+       "$pkg correctly saw no Compress::Zlib");
+
+    # Remove from %INC so later tests still run
+    clear($pkg, $TEST_PKGS{$pkg});
+}
+
+SKIP: {
+    # Test successful detection, but only if we actually have Compress::Zlib
+    skip 'Compress::Zlib truly not available', (scalar keys %TEST_PKGS)
+        unless $compression_available;
+
+    shift(@INC); # Drop the force-failure sub from above
+    for my $pkg (sort keys %TEST_PKGS)
+    {
+        no strict 'refs';
+
+        clear('Compress::Zlib', 'Compress/Zlib.pm');
+        for (qw(deflate flush inflate))
+        {
+            clear('Compress::Zlib', 'Compress/Zlib.pm', $_);
+        }
+        eval "require $pkg;";
+
+        # I am not explicitly testing for "deflate" here, because that might
+        # change in the future. What matters is that it is not null.
+        isnt(${"${pkg}::COMPRESSION_AVAILABLE"}, '',
+           "$pkg correctly detected Compress::Zlib");
+    }
+}
+
+exit;
+
+sub clear
+{
+    no strict 'refs';
+
+    my ($pkg, $file, $name) = @_;
+
+    delete $INC{$file};
+    %{"${pkg}::"} = ();
+    if ($pkg eq 'Compress::Zlib')
+    {
+        delete @Zlib::OldDeflate::{qw(deflate flush)};
+        delete $Zlib::OldInflate::{'inflate'};
+    }
+}




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