r48962 - in /trunk/libwww-curl-perl: Changes Curl.xs MANIFEST META.yml README SIGNATURE debian/changelog lib/WWW/Curl.pm lib/WWW/Curl/Easy.pm t/01basic.t t/08ssl.t t/19multi.t template/Easy.pm.tmpl

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Fri Dec 18 23:51:53 UTC 2009 

Author: jawnsy-guest
Date: Fri Dec 18 23:51:47 2009
New Revision: 48962

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

Added:
    trunk/libwww-curl-perl/t/19multi.t
      - copied unchanged from r48961, branches/upstream/libwww-curl-perl/current/t/19multi.t
Modified:
    trunk/libwww-curl-perl/Changes
    trunk/libwww-curl-perl/Curl.xs
    trunk/libwww-curl-perl/MANIFEST
    trunk/libwww-curl-perl/META.yml
    trunk/libwww-curl-perl/README
    trunk/libwww-curl-perl/SIGNATURE
    trunk/libwww-curl-perl/debian/changelog
    trunk/libwww-curl-perl/lib/WWW/Curl.pm
    trunk/libwww-curl-perl/lib/WWW/Curl/Easy.pm
    trunk/libwww-curl-perl/t/01basic.t
    trunk/libwww-curl-perl/t/08ssl.t
    trunk/libwww-curl-perl/template/Easy.pm.tmpl

Modified: trunk/libwww-curl-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/Changes?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/Changes (original)
+++ trunk/libwww-curl-perl/Changes Fri Dec 18 23:51:47 2009
@@ -1,4 +1,14 @@
 Revision history for the Perl binding of libcurl, WWW::Curl.
+4.11 Fri Dec 18 2009: - Balint Szilakszi <szbalint at cpan.org>
+
+    - Fixed t/19multi.t for libcurl versions compiled with asyncronous dns resolution.
+
+4.10 Fri Dec 18 2009: - Balint Szilakszi <szbalint at cpan.org>
+
+    - Added support for CURLINFO_SLIST in getinfo (patch by claes).
+    - Merging documentation fixes upstream from the FreeBSD port (thanks Peter).
+    - Added support for curl_multi_fdset.
+    
 4.09 Thu Jul 09 2009: - Balint Szilakszi <szbalint at cpan.org>
 
     - Fixing broken version check.

Modified: trunk/libwww-curl-perl/Curl.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/Curl.xs?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/Curl.xs (original)
+++ trunk/libwww-curl-perl/Curl.xs Fri Dec 18 23:51:47 2009
@@ -911,6 +911,22 @@
                 RETVAL = newSVnv(vdouble);
                 break;
             }
+            case CURLINFO_SLIST:
+            {
+                struct curl_slist *vlist, *entry;
+                AV *items = newAV();
+                curl_easy_getinfo(self->curl, option, &vlist);
+                if (vlist != NULL) {
+                    entry = vlist;
+                    while (entry) {
+                        av_push(items, newSVpv(entry->data, 0));
+                        entry = entry->next;
+                    }
+                    curl_slist_free_all(vlist);
+                }
+                RETVAL = newRV(sv_2mortal((SV *) items));
+                break;
+            }
             default: {
                 RETVAL = newSViv(CURLE_BAD_FUNCTION_ARGUMENT);
                 break;
@@ -1080,6 +1096,40 @@
 	} else {
 		XSRETURN_EMPTY;
 	}
+
+SV *
+curl_multi_fdset(self)
+    WWW::Curl::Multi self
+    PREINIT:
+        fd_set fdread;
+        fd_set fdwrite;
+        fd_set fdexcep;
+        int maxfd;
+        int i;
+    PPCODE:
+        FD_ZERO(&fdread);
+        FD_ZERO(&fdwrite);
+        FD_ZERO(&fdexcep);
+        AV *readset = newAV();
+        AV *writeset = newAV();
+        AV *excepset = newAV();
+        curl_multi_fdset(self->curlm, &fdread, &fdwrite, &fdexcep, &maxfd);
+        if ( maxfd != -1 ) {
+            for (i=0;i <= maxfd;i++) {
+                if (FD_ISSET(i, &fdread)) {
+                    av_push(readset, newSViv(i));
+                }
+                if (FD_ISSET(i, &fdwrite)) {
+                    av_push(writeset, newSViv(i));
+                }
+                if (FD_ISSET(i, &fdexcep)) {
+                    av_push(excepset, newSViv(i));
+                }
+            }
+        }
+	XPUSHs(sv_2mortal(newRV(sv_2mortal((SV *) readset))));
+	XPUSHs(sv_2mortal(newRV(sv_2mortal((SV *) writeset))));
+	XPUSHs(sv_2mortal(newRV(sv_2mortal((SV *) excepset))));
 
 int
 curl_multi_perform(self)

Modified: trunk/libwww-curl-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/MANIFEST?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/MANIFEST (original)
+++ trunk/libwww-curl-perl/MANIFEST Fri Dec 18 23:51:47 2009
@@ -35,6 +35,7 @@
 t/16formpost.t
 t/17slist.t
 t/18twinhandles.t
+t/19multi.t
 t/meta.t
 t/new/00constants.t
 t/new/01basic.t

Modified: trunk/libwww-curl-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/META.yml?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/META.yml (original)
+++ trunk/libwww-curl-perl/META.yml Fri Dec 18 23:51:47 2009
@@ -22,4 +22,4 @@
     - template
 requires:
   perl: 5.6.1
-version: 4.09
+version: 4.11

Modified: trunk/libwww-curl-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/README?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/README (original)
+++ trunk/libwww-curl-perl/README Fri Dec 18 23:51:47 2009
@@ -3,7 +3,7 @@
 The Perl module WWW::Curl provides an interface to the cURL library "libcurl".
 See http://curl.haxx.se/ for more information on cURL and libcurl.
 
-This module requires libcurl and the corresponding headerfiles to be
+This module requires libcurl and the corresponding header files to be
 installed. You then may install this module via the usual way
 (for installation on Windows please see README.Win32):
 
@@ -27,9 +27,9 @@
 This module, starting from version 4 requires at least Perl 5.6 and libcurl 7.10.8.
 These releases are more than 5 years old and they have multiple security vulnerabilities,
 it is advised that you upgrade as soon as possible to a more recent, secure version.
-Anything older than these versions of Perl and libcurl respectively are not supported.
+Anything older than these versions of Perl and libcurl respectively is not supported.
 
-Windows specific fixes and patches are welcome as testing is mainly focused on linux.
+Windows specific fixes and patches are welcome as testing is mainly focused on Linux.
 
 The module provides the same functionality, except as noted in the documentation, 
 as libcurl provides to C programs. Please refer to the documentation of libcurl for the
@@ -45,12 +45,12 @@
 Parts of the callback support were added Forrest Cahoon
 <forrest.cahoon at merrillcorp.com>
 
-More callback support, many tests additional documentation and Makefile
+More callback support, many tests, additional documentation, and Makefile
 features have been added by Cris Bailiff <c.bailiff+curl at devsecure.com>
 
 Curl multi support has been added by Sebastian Riedel <sri at oook.de>
 
-The current maintainer is Cris Bailiff <c.bailiff+curl at devsecure.com> and
+The current maintainers are Cris Bailiff <c.bailiff+curl at devsecure.com> and
 Bálint Szilakszi <szbalint at cpan.org>
 
 The latest version is available on CPAN and can be downloaded from

Modified: trunk/libwww-curl-perl/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/SIGNATURE?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/SIGNATURE (original)
+++ trunk/libwww-curl-perl/SIGNATURE Fri Dec 18 23:51:47 2009
@@ -12,15 +12,15 @@
 not run its Makefile.PL or Build.PL.
 
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-SHA1 a4357ae9df348816f49aa7c66bc99fd35c2a20d5 Changes
-SHA1 0fc80fc01c6850ac1999bc9dbb156e65cbb3f9e5 Curl.xs
+SHA1 758725823ca0719908b1138da03481c2ba8419d7 Changes
+SHA1 32ad177360c0e370e4c1bdb83ead474961769e96 Curl.xs
 SHA1 94cbea5b3fb940e25cd4535d1c81bfd7d51dac3c LICENSE
-SHA1 9da6d1654f2d8f05677f40f40b0d9b4b755974e9 MANIFEST
-SHA1 00d1744ad952cdf511d1705dc520a1714b3f1081 META.yml
+SHA1 a33cdbb8996d5b8dfc92da6d34e7327ebde1b1c5 MANIFEST
+SHA1 122bbde2eee75a39914d2b64b8bcc1d9462385b3 META.yml
 SHA1 3025d3ee924e6e7a2f9b5249a646331502c9be72 Makefile.PL
-SHA1 66e1c652fecb2223bb94d4a7f726458be8ee65d8 README
+SHA1 a21d7184f91692fb3d6d7175e4a526f9d99fe3c7 README
 SHA1 ed6f9f399075307a33bd02902ebbadbbbfbd8bab README.Win32
 SHA1 fd5f3c4f0418efee3b9b16cf8c3902e8374909df inc/Module/Install.pm
 SHA1 7cd7c349afdf3f012e475507b1017bdfa796bfbd inc/Module/Install/Base.pm
@@ -29,19 +29,19 @@
 SHA1 dbec1085a29a855202ee797a5bac319cf426827f inc/Module/Install/MakeMaker.pm
 SHA1 3e83972921d54198d1246f7278f08664006cd65d inc/Module/Install/Makefile.pm
 SHA1 12bf1867955480d47d5171a9e9c6a96fabe0b58f inc/Module/Install/Metadata.pm
-SHA1 09ef704f6e72b1d6214a43e23cef96f4e5575f23 lib/WWW/Curl.pm
-SHA1 c911b63919e0dc3f9a2d9d4ec80a8722723cd740 lib/WWW/Curl/Easy.pm
+SHA1 7c063f5e01e0489f3725092ea2da3699d9b925d7 lib/WWW/Curl.pm
+SHA1 4e95036c5543aecf91e3d97fa79df03f4a367ffa lib/WWW/Curl/Easy.pm
 SHA1 3fc2f9b503827e28b96c4ea49034039b7f23ab20 lib/WWW/Curl/Form.pm
 SHA1 0bddc700447a50dd26d13119ee60349556ce1811 lib/WWW/Curl/Multi.pm
 SHA1 bcf4bc64399691f1871b9592ced73ce5fef86fea lib/WWW/Curl/Share.pm
 SHA1 802cb1fcd35fe78e4cdb10164a05e54ce1427543 t/00constants.t
-SHA1 a34d7760468a36938f50296161c72795700c9ab3 t/01basic.t
+SHA1 263f02465cc31d3233585dc7e387137edcf560f0 t/01basic.t
 SHA1 07b63b1baca142a0e34e79633d0eb57684524bed t/02callbacks.t
 SHA1 905c848deb6492d539c5bdf89c49632a412af15a t/04abort-test.t
 SHA1 f9c842503835908a0687ab41655042a16b8b5112 t/05progress.t
 SHA1 6406f237b74c8b847d233e5570c2769d7445c307 t/06http-post.t
 SHA1 a252ca35aaf428e566e8f24bb59f3b56e4c8511d t/07ftp-upload.t
-SHA1 4811cc6d6af52f7adaf5e0a3332df980ea377d27 t/08ssl.t
+SHA1 264e51909488be715566f9341ac438d5a8dc7de1 t/08ssl.t
 SHA1 ec62c062c627e7f52df512eae496223bd49ad2f3 t/09times.t
 SHA1 9499f362a6d06a19aa6bc41d3647dbd5dc5aca63 t/10errbuf.t
 SHA1 2c5793062538fdff6e3d837bb6c8a35c59a2b61e t/13slowleak.t
@@ -50,6 +50,7 @@
 SHA1 785507b3fa6f414298cdcf7ceaba1f9274aa07d2 t/16formpost.t
 SHA1 e784a874eb36fd5b16a12fc58365cce697ecbbab t/17slist.t
 SHA1 9b80d6de1675261d43abea2f76cfd610f42a4494 t/18twinhandles.t
+SHA1 7c7e12a6a5afa9afaec967958e1396d41f2697c8 t/19multi.t
 SHA1 2924361d0713031b92c6b888f11e860d357837f7 t/meta.t
 SHA1 3cd20c1711b43058550922404f53a844fb2695e6 t/new/00constants.t
 SHA1 d9863d2e71f618a58d419534867cda8bd97dcfbf t/new/01basic.t
@@ -65,13 +66,13 @@
 SHA1 20ec0bd03ff2600505d38623153a6eb3087b5814 t/new/README
 SHA1 ac25bfa56d36f19cbee72a968b06372e88602a61 t/pod-coverage.t
 SHA1 0190346d7072d458c8a10a45c19f86db641dcc48 t/pod.t
-SHA1 ea03750695bf2d81436ec300da0201f50a64bb9c template/Easy.pm.tmpl
+SHA1 1916f03aef4da23a6a998c855f7ef57781b79b51 template/Easy.pm.tmpl
 SHA1 b4841adcad866b70d9d72f171d3d0f8f9d5b3c79 template/Share.pm.tmpl
 SHA1 468b011caaf4d54609b421027d7c6262a9260e89 typemap
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkpVyI8ACgkQ+22TSbOiiI+dTACeIoP3QzPHCmhuWdydQ9+nDVQa
-6c4AniUQBP/axKBrMuwHpV7HwZvuJewL
-=rkWu
+iF4EAREIAAYFAksrrC4ACgkQ9vEeIen/Zj4GswEAl8QU2W9k3rsyWMCP2Kfn0JXp
+Si/audyYpl6y592ug60A/1pLz1HUg29JBVunnnTbxbn51wNSz/xgzF6dOooHGL2C
+=bATu
 -----END PGP SIGNATURE-----

Modified: trunk/libwww-curl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/debian/changelog?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/changelog (original)
+++ trunk/libwww-curl-perl/debian/changelog Fri Dec 18 23:51:47 2009
@@ -1,13 +1,14 @@
-libwww-curl-perl (4.09-2) UNRELEASED; urgency=low
+libwww-curl-perl (4.11-1) UNRELEASED; urgency=low
 
   [ Jonathan Yu ]
+  * New upstream release
   * Removed Michael Zehrer from Uploaders (Closes: #540825)
 
   [ Ryan Niebur ]
   * Update jawnsy's email address
   * Update ryan52's email address
 
- -- Ryan Niebur <ryan at debian.org>  Fri, 25 Sep 2009 00:26:58 -0700
+ -- Jonathan Yu <jawnsy at cpan.org>  Fri, 18 Dec 2009 15:44:12 -0500
 
 libwww-curl-perl (4.09-1) unstable; urgency=low
 

Modified: trunk/libwww-curl-perl/lib/WWW/Curl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/lib/WWW/Curl.pm?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/lib/WWW/Curl.pm (original)
+++ trunk/libwww-curl-perl/lib/WWW/Curl.pm Fri Dec 18 23:51:47 2009
@@ -6,7 +6,7 @@
 use DynaLoader;
 
 BEGIN {
-    $VERSION = '4.09';
+    $VERSION = '4.11';
     @ISA     = qw(DynaLoader);
     __PACKAGE__->bootstrap;
 }
@@ -271,6 +271,11 @@
 Most methods are either not exposed through the WWW::Curl::Multi API or they behave differently
 than it's C counterpart. Please see the section about WWW::Curl::Multi above.
 
+=item curl_multi_fdset
+
+This method returns three arrayrefs: the read, write and exception fds libcurl knows about.
+In the case of no file descriptors in the given set, an empty array is returned.
+
 =back
 
 =head1 USAGE CASES
@@ -311,7 +316,7 @@
 
 Version 3.01 added some support for pre-multi versions of libcurl.
 
-Version 3.00 adds WWW::Curl::Multi interface, and a new module names
+Version 3.00 adds WWW::Curl::Multi interface, and new module names
 following perl conventions (WWW::Curl::Easy rather than WWW::Curl::easy),
 by Sebastian Riedel <sri at cpan.org>.
 

Modified: trunk/libwww-curl-perl/lib/WWW/Curl/Easy.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/lib/WWW/Curl/Easy.pm?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/lib/WWW/Curl/Easy.pm (original)
+++ trunk/libwww-curl-perl/lib/WWW/Curl/Easy.pm Fri Dec 18 23:51:47 2009
@@ -5,7 +5,7 @@
 use Carp;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 
-$VERSION = '4.08';
+$VERSION = '4.11';
 
 require WWW::Curl;
 require Exporter;

Modified: trunk/libwww-curl-perl/t/01basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/t/01basic.t?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/t/01basic.t (original)
+++ trunk/libwww-curl-perl/t/01basic.t Fri Dec 18 23:51:47 2009
@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use Test::More tests => 16;
+use Test::More tests => 18;
 use File::Temp qw/tempfile/;
 
 BEGIN { use_ok( 'WWW::Curl::Easy' ); }
@@ -35,6 +35,7 @@
 $myheaders[1] = "User-Agent: Perl interface for libcURL";
 ok(! $curl->setopt(CURLOPT_HTTPHEADER, \@myheaders), "Setting CURLOPT_HTTPHEADER");
 
+$curl->setopt(CURLOPT_COOKIEFILE, "");
 my $retcode = $curl->perform();
 
 ok(! $retcode, "Curl return code ok");
@@ -45,6 +46,14 @@
 ok( $realurl, "getinfo returns CURLINFO_EFFECTIVE_URL");
 my $httpcode = $curl->getinfo(CURLINFO_HTTP_CODE);
 ok( $httpcode, "getinfo returns CURLINFO_HTTP_CODE");
+
+SKIP: {
+    skip "Only testing cookies against google.com", 2 unless $url eq "http://www.google.com";
+    my $cookies = $curl->getinfo(CURLINFO_COOKIELIST);
+    is(ref $cookies, "ARRAY", "Returned array reference");
+    ok(@$cookies > 0, "Got 1 or more cookies");
+}
+
 #diag ("Bytes: $bytes");
 #diag ("realurl: $realurl");
 #diag ("httpcode: $httpcode");

Modified: trunk/libwww-curl-perl/t/08ssl.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/t/08ssl.t?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/t/08ssl.t (original)
+++ trunk/libwww-curl-perl/t/08ssl.t Fri Dec 18 23:51:47 2009
@@ -10,10 +10,6 @@
 #         site-url, verifypeer(0,1), verifyhost(0,2), result(0=ok, 1=fail), result-openssl0.9.5
 my $url_list=[
 
-        [ 'https://65.205.248.243/',  0, 0, 0 , 0 ], # www.thawte.com
-#        [ 'https://65.205.248.243/',  0, 2, 1 , 1 ], # www.thawte.com
-	[ 'https://65.205.249.60/',  0, 0, 0 , 0 ], # www.verisign.com
-#	[ 'https://65.205.249.60/',  0, 2, 1 , 1 ], # www.verisign.com
 	[ 'https://www.microsoft.com/', 0, 0, 0 , 0 ],
 	[ 'https://www.microsoft.com/', 0, 0, 0 , 0 ],
 	[ 'https://www.verisign.com/', 1, 2, 0 , 0 ], # verisign have had broken ssl - do this first
@@ -32,7 +28,7 @@
 ];
 
 
-if (&WWW::Curl::Easy::version() !~ /ssl/i) {
+if (&WWW::Curl::Easy::version() !~ /ssl|nss/i) {
 	plan skip_all => 'libcurl was compiled without ssl support, skipping ssl tests';
 } else {
 	plan tests => scalar(@{$url_list})+7;

Modified: trunk/libwww-curl-perl/template/Easy.pm.tmpl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/template/Easy.pm.tmpl?rev=48962&op=diff
==============================================================================
--- trunk/libwww-curl-perl/template/Easy.pm.tmpl (original)
+++ trunk/libwww-curl-perl/template/Easy.pm.tmpl Fri Dec 18 23:51:47 2009
@@ -5,7 +5,7 @@
 use Carp;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD);
 
-$VERSION = '4.09';
+$VERSION = '4.11';
 
 require WWW::Curl;
 require Exporter;

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