Imported Upstream version 4.16upstream/4.16

12 files changed, 33 insertions, 96 deletions

diff --git a/Changes b/Changes
index badedd8..775a023 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,10 @@
 Revision history for the Perl binding of libcurl, WWW::Curl.
+4.16 Thu Feb 20 2014: - Balint Szilakszi <szbalint at cpan.org>
+
+    - Support for CURLOPT_RESOLVE (an slist option) [Theo Schlossnagle]
+    - Fixing t/19multi.t test failures when using a threaded resolver for libcurl.
+    - Improved constant parsing when using ISO-compliant CPP. [tsibley]
+
 4.15 Sun Nov 28 2010: - Balint Szilakszi <szbalint at cpan.org>
 
     - Refactored constant handling and added thorough testing for it.
diff --git a/Curl.xs b/Curl.xs
index 0201e2e..d062ab9 100644
--- a/Curl.xs
+++ b/Curl.xs
@@ -39,6 +39,7 @@ typedef enum {
     SLIST_HTTPHEADER = 0,
     SLIST_QUOTE,
     SLIST_POSTQUOTE,
+    SLIST_RESOLVE,
     SLIST_LAST
 } perl_curl_easy_slist_code;
 
@@ -127,6 +128,9 @@ slist_index(int option)
         case CURLOPT_POSTQUOTE:
             return SLIST_POSTQUOTE;
             break;
+        case CURLOPT_RESOLVE:
+            return SLIST_RESOLVE;
+            break;
     }
     croak("Bad slist index requested\n");
     return SLIST_LAST;
@@ -747,6 +751,7 @@ curl_easy_setopt(self, option, value, push=0)
             case CURLOPT_HTTPHEADER:
             case CURLOPT_QUOTE:
             case CURLOPT_POSTQUOTE:
+            case CURLOPT_RESOLVE:
             {
                 /* This is an option specifying a list, which we put in a curl_slist struct */
                 AV *array = (AV *)SvRV(value);
diff --git a/MANIFEST b/MANIFEST
index 75fdc43..9c4bc64 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -18,7 +18,6 @@ MANIFEST
 META.yml
 README
 README.Win32
-SIGNATURE
 t/00constants.t
 t/01basic.t
 t/02callbacks.t
diff --git a/META.yml b/META.yml
index 253ea7f..6ea2c80 100644
--- a/META.yml
+++ b/META.yml
@@ -23,5 +23,5 @@ no_index:
 requires:
   perl: 5.6.1
 resources:
-  repository: http://github.com/szbalint/WWW--Curl
-version: 4.15
+  repository: https://github.com/szbalint/WWW--Curl
+version: 4.16
diff --git a/Makefile.PL b/Makefile.PL
index dea727b..e29019d 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -101,12 +101,16 @@ if (!defined($curl_h)) {
      my @syms;
      my $has_cpp = 0;
      open(H_IN, "-|", "cpp", $curl_h) and $has_cpp++;
-     unless ($has_cpp) { open(H_IN, "<", $curl_h) or die("Can't open curl.h at path $curl_h, because: ".$!); }
+     unless ($has_cpp) {
+         warn "No working cpp ($!).  Parsing curl.h in Perl";
+         open(H_IN, "<", $curl_h) or die("Can't open curl.h at path $curl_h, because: ".$!);
+     }
      while ( <H_IN> ) {
          if ( /enum\s+(\S+\s+)?{/ .. /}/ ) {
              s/^\s+//;
              next unless /^CURL/;
              chomp;
+             s/^(CURL[A-Za-z0-9_]*_) ([A-Za-z0-9_])/$1$2/;  # Strip intervening space from ISO CPP macro
              s/[,\s].*//;
              s/=.*$//;
              next unless /^\w+$/;
diff --git a/README b/README
index e13caaf..33b2266 100644
--- a/README
+++ b/README
@@ -4,7 +4,12 @@ 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 header files to be
-installed. You then may install this module via the usual way
+installed. 
+
+For example on Ubuntu installing libcurl4-openssl-dev will satisfy this
+dependency.
+
+You then may install this module via the usual way
 (for installation on Windows please see README.Win32):
 
     perl Makefile.PL
@@ -53,10 +58,9 @@ Curl multi support has been added by Sebastian Riedel <sri at oook.de>
 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
-http://search.cpan.org/perldoc?WWW::Curl .
+The latest version is available on CPAN - https://metacpan.org/pod/WWW::Curl .
 
-The source code repository is available at http://github.com/szbalint/WWW--Curl/tree .
+The source code repository is available at https://github.com/szbalint/WWW--Curl .
  
 Copyright (C) 2000-2005, 2008-2010 Daniel Stenberg, Cris Bailiff, Bálint Szilakszi, et al.  
 You may opt to use, copy, modify, merge, publish, distribute and/or sell
diff --git a/SIGNATURE b/SIGNATURE
deleted file mode 100644
index e41e457..0000000
--- a/SIGNATURE
+++ /dev/null
@@ -1,81 +0,0 @@
-This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.55.
-
-To verify the content in this distribution, first make sure you have
-Module::Signature installed, then type:
-
-    % cpansign -v
-
-It will check each file's integrity, as well as the signature's
-validity.  If "==> Signature verified OK! <==" is not displayed,
-the distribution may already have been compromised, and you should
-not run its Makefile.PL or Build.PL.
-
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-SHA1 c23d2d3256e487cfeb2fba5d11861e6ef1f9c6dd Changes
-SHA1 65a31f18075b247c6d4bc38ba5fe408f3bd9b2c5 Curl.xs
-SHA1 94cbea5b3fb940e25cd4535d1c81bfd7d51dac3c LICENSE
-SHA1 7cae1c2346a6ce99ac5325cabb51b7ce4ebad209 MANIFEST
-SHA1 3c88c4db0ddf4624cc22454d5e1f996ef2b0988a META.yml
-SHA1 03e0e48557e565a4663c30bfe8f75660c1336e0f Makefile.PL
-SHA1 3e8bbd9aa6cd273aef05f78cfef0116a0e3d59b0 README
-SHA1 ed6f9f399075307a33bd02902ebbadbbbfbd8bab README.Win32
-SHA1 fd5f3c4f0418efee3b9b16cf8c3902e8374909df inc/Module/Install.pm
-SHA1 7cd7c349afdf3f012e475507b1017bdfa796bfbd inc/Module/Install/Base.pm
-SHA1 ba186541bbf6439111f01fc70769cf24d22869bf inc/Module/Install/Can.pm
-SHA1 a9d6306080cee9c32b18f6cbd3c7636ece67e81a inc/Module/Install/External.pm
-SHA1 dbec1085a29a855202ee797a5bac319cf426827f inc/Module/Install/MakeMaker.pm
-SHA1 3e83972921d54198d1246f7278f08664006cd65d inc/Module/Install/Makefile.pm
-SHA1 12bf1867955480d47d5171a9e9c6a96fabe0b58f inc/Module/Install/Metadata.pm
-SHA1 2d3ace586b9c815af387d69d5c6645e139777775 lib/WWW/Curl.pm
-SHA1 7909ec25b1dfe3499fd9fab597ed958dbe1169e1 lib/WWW/Curl/Easy.pm
-SHA1 0f4db7cb0e4ba57e0c7869f6932322911b55d4cd lib/WWW/Curl/Form.pm
-SHA1 0bddc700447a50dd26d13119ee60349556ce1811 lib/WWW/Curl/Multi.pm
-SHA1 7dbc5c2e1144c4e4ae75d6259bc16d713913f6f5 lib/WWW/Curl/Share.pm
-SHA1 3874fe0b4d751149e6ede0967ccec514f3b90756 t/00constants.t
-SHA1 83dbfe8cf1c1c567436daa3cc2a7f92e40285139 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 264e51909488be715566f9341ac438d5a8dc7de1 t/08ssl.t
-SHA1 ec62c062c627e7f52df512eae496223bd49ad2f3 t/09times.t
-SHA1 9499f362a6d06a19aa6bc41d3647dbd5dc5aca63 t/10errbuf.t
-SHA1 2c5793062538fdff6e3d837bb6c8a35c59a2b61e t/13slowleak.t
-SHA1 f911c90eaf0fdd2ee60f913262ee6ca3236037f0 t/14duphandle.t
-SHA1 62551de2e5da5df233b296b716093cea8d791d70 t/15duphandle-callback.t
-SHA1 785507b3fa6f414298cdcf7ceaba1f9274aa07d2 t/16formpost.t
-SHA1 e784a874eb36fd5b16a12fc58365cce697ecbbab t/17slist.t
-SHA1 9b80d6de1675261d43abea2f76cfd610f42a4494 t/18twinhandles.t
-SHA1 2591e39d5346fb4effca23d3ccef224322d843d7 t/19multi.t
-SHA1 42f7f35d7ac8b38838cc71fdc7a89402b63e01b7 t/20undefined_subs.t
-SHA1 c0daf235a136f623fc29ae5c2c2ce6cfc68a9b5f t/21write-to-scalar.t
-SHA1 2924361d0713031b92c6b888f11e860d357837f7 t/meta.t
-SHA1 3cd20c1711b43058550922404f53a844fb2695e6 t/new/00constants.t
-SHA1 d9863d2e71f618a58d419534867cda8bd97dcfbf t/new/01basic.t
-SHA1 f4a3ea4777e0905d2cf0f6cdb18d04a39892c69d t/new/02header-callback.t
-SHA1 4aa1ab99c68aa4069a37419f439520b639fdb1e6 t/new/03body-callback.t
-SHA1 1470b63fda40ae09ce5faa891b6b30d804709c93 t/new/04abort.t
-SHA1 0d80cbde8d56c32ada4284f4738357cce1346b2b t/new/05progress.t
-SHA1 fda1cb27df8d45a6e00fb0f1ca664b815a5d9b47 t/new/06http-post.t
-SHA1 66c9b543a13c328a5b49b79d29aaa6345702ec71 t/new/07errbuf.t
-SHA1 63aecf6590d0d4268be8f23ba406d5b957710cde t/new/08duphandle.t
-SHA1 a20c28c3e06ebf836e837da4c5d1afb2998d5cc7 t/new/09duphandle-callback.t
-SHA1 eee30cfb57132e7c8bdd4a5dd2f32273ab222115 t/new/10multi-callback.t
-SHA1 20ec0bd03ff2600505d38623153a6eb3087b5814 t/new/README
-SHA1 ac25bfa56d36f19cbee72a968b06372e88602a61 t/pod-coverage.t
-SHA1 0190346d7072d458c8a10a45c19f86db641dcc48 t/pod.t
-SHA1 1811cc3766dbb601d0ae0aea284b6e0a642a483a t/symbols-in-versions
-SHA1 dc1cf787a6dec7d4e263f95a1566369f51b94746 template/Easy.pm.tmpl
-SHA1 f6f5d52b1d34bff9d085ac40bbc6f8b2a6269c58 template/Share.pm.tmpl
-SHA1 468b011caaf4d54609b421027d7c6262a9260e89 typemap
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iF4EAREIAAYFAkzyt84ACgkQ9vEeIen/Zj4wSAD/Z0JHQVK5ie0xOBkD+4A1vAWb
-A0JWUq6/8e9GNyVtjJoA/20hxeygZr4zddpfZ4AakE6f9m3+g3KEKo73+26HgZYq
-=YZHu
------END PGP SIGNATURE-----
diff --git a/lib/WWW/Curl.pm b/lib/WWW/Curl.pm
index 4d87f9a..efb7c37 100644
--- a/lib/WWW/Curl.pm
+++ b/lib/WWW/Curl.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use XSLoader;
 
-our $VERSION = '4.15';
+our $VERSION = '4.16';
 XSLoader::load(__PACKAGE__, $VERSION);
 
 END {
diff --git a/lib/WWW/Curl/Easy.pm b/lib/WWW/Curl/Easy.pm
index f0e8454..e07e1c0 100644
--- a/lib/WWW/Curl/Easy.pm
+++ b/lib/WWW/Curl/Easy.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = '4.15';
+our $VERSION = '4.16';
 
 use WWW::Curl ();
 use Exporter  ();
diff --git a/lib/WWW/Curl/Form.pm b/lib/WWW/Curl/Form.pm
index 76e536e..08912dd 100644
--- a/lib/WWW/Curl/Form.pm
+++ b/lib/WWW/Curl/Form.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = '4.15';
+our $VERSION = '4.16';
 
 use WWW::Curl ();
 use Exporter  ();
diff --git a/t/19multi.t b/t/19multi.t
index 6f4c1cc..3d58557 100644
--- a/t/19multi.t
+++ b/t/19multi.t
@@ -58,13 +58,13 @@ sub action_wait {
     ok( ! @{$fds[0]} && ! @{$fds[1]} && !@{$fds[2]} , "The three returned arrayrefs are still empty after perform and add_handle");
     $curlm->perform;
     @fds = $curlm->fdset;
-    ok( @{$fds[0]} == 1 || @{$fds[1]} == 1, "The read or write fdset contains one fd");
+    ok( @{$fds[0]} <= 1 || @{$fds[1]} <= 1, "The read or write fdset contains one or less fd");
     $curlm->add_handle($curl2);
     @fds = $curlm->fdset;
-    ok(@{$fds[0]} == 1 || @{$fds[1]} == 1, "The read or write fdset still only contains one fd");
+    ok(@{$fds[0]} <= 1 || @{$fds[1]} <= 1, "The read or write fdset still only contains one or less fd");
     $curlm->perform;
     @fds = $curlm->fdset;
-    ok( @{$fds[0]} + @{$fds[1]} == 2, "The read or write fdset contains two fds");
+    ok( @{$fds[0]} + @{$fds[1]} <= 2, "The read or write fdset contains two or less fds");
     my $active = 2;
     while ($active != 0) {
 	my $ret = $curlm->perform;
diff --git a/template/Easy.pm.tmpl b/template/Easy.pm.tmpl
index 26fa853..83d856a 100644
--- a/template/Easy.pm.tmpl
+++ b/template/Easy.pm.tmpl
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = '4.15';
+our $VERSION = '4.16';
 
 use WWW::Curl ();
 use Exporter  ();