Imported Upstream version 4.17upstream/4.17upstream

14 files changed, 30 insertions, 32 deletions

diff --git a/Changes b/Changes
index 775a023..b00b967 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,9 @@
 Revision history for the Perl binding of libcurl, WWW::Curl.
+4.17 Fri Feb 21 2014: - Balint Szilakszi <szbalint at cpan.org>
+
+    - Fixing build process for old libcurl versions without CURLOPT_RESOLVE.
+    - License is now MIT only.
+
 4.16 Thu Feb 20 2014: - Balint Szilakszi <szbalint at cpan.org>
 
     - Support for CURLOPT_RESOLVE (an slist option) [Theo Schlossnagle]
diff --git a/Curl.xs b/Curl.xs
index d062ab9..ea9f870 100644
--- a/Curl.xs
+++ b/Curl.xs
@@ -7,8 +7,7 @@
  * Copyright (C) 2000, 2001, 2002, 2005, 2008 Daniel Stenberg, Cris Bailiff, et al.  
  * You may opt to use, copy, modify, merge, publish, distribute and/or 
  * sell copies of the Software, and permit persons to whom the 
- * Software is furnished to do so, under the terms of the MPL or
- * the MIT/X-derivate licenses. You may pick one of these licenses.
+ * Software is furnished to do so, under the terms of the MIT license.
  */
 #define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
@@ -39,7 +38,9 @@ typedef enum {
     SLIST_HTTPHEADER = 0,
     SLIST_QUOTE,
     SLIST_POSTQUOTE,
+#ifdef CURLOPT_RESOLVE
     SLIST_RESOLVE,
+#endif
     SLIST_LAST
 } perl_curl_easy_slist_code;
 
@@ -128,9 +129,11 @@ slist_index(int option)
         case CURLOPT_POSTQUOTE:
             return SLIST_POSTQUOTE;
             break;
+#ifdef CURLOPT_RESOLVE
         case CURLOPT_RESOLVE:
             return SLIST_RESOLVE;
             break;
+#endif
     }
     croak("Bad slist index requested\n");
     return SLIST_LAST;
@@ -751,7 +754,9 @@ curl_easy_setopt(self, option, value, push=0)
             case CURLOPT_HTTPHEADER:
             case CURLOPT_QUOTE:
             case CURLOPT_POSTQUOTE:
+#ifdef CURLOPT_RESOLVE
             case CURLOPT_RESOLVE:
+#endif
             {
                 /* This is an option specifying a list, which we put in a curl_slist struct */
                 AV *array = (AV *)SvRV(value);
diff --git a/LICENSE b/LICENSE
index 6dcf455..2f291f9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,3 @@
 You may opt to use, copy, modify, merge, publish, distribute and/or sell
 copies of the Software, and permit persons to whom the Software is furnished
-to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
-pick one of these licenses.
+to do so, under the terms of the MIT license.
diff --git a/META.yml b/META.yml
index 6ea2c80..7b630e5 100644
--- a/META.yml
+++ b/META.yml
@@ -9,7 +9,7 @@ configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
 generated_by: 'Module::Install version 0.91'
-license: 'MPL or MIT/X-derivate'
+license: 'mit'
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
   version: 1.4
@@ -24,4 +24,4 @@ requires:
   perl: 5.6.1
 resources:
   repository: https://github.com/szbalint/WWW--Curl
-version: 4.16
+version: 4.17
diff --git a/Makefile.PL b/Makefile.PL
index e29019d..f9170bb 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,7 +6,7 @@ use inc::Module::Install;
 name			'WWW-Curl';
 abstract		'Perl extension interface for libcurl';
 author			'Cris Bailiff <c.bailiff+curl at devsecure.com>';
-license			'MPL or MIT/X-derivate';
+license			'mit';
 perl_version		'5.006001';
 no_index		directory => 'template';
 repository		'http://github.com/szbalint/WWW--Curl';
diff --git a/README b/README
index 33b2266..51700e2 100644
--- a/README
+++ b/README
@@ -62,8 +62,7 @@ The latest version is available on CPAN - https://metacpan.org/pod/WWW::Curl .
 
 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.  
+Copyright (C) 2000-2005, 2008-2014 Daniel Stenberg, Cris Bailiff, Bálint Szilakszi, et al.  
 You may opt to use, copy, modify, merge, publish, distribute and/or sell
 copies of the Software, and permit persons to whom the Software is
-furnished to do so, under the terms of the MPL or the MIT/X-derivate 
-licenses. You may pick one of these licenses.
+furnished to do so, under the terms of the MIT license.
diff --git a/lib/WWW/Curl.pm b/lib/WWW/Curl.pm
index efb7c37..5909572 100644
--- a/lib/WWW/Curl.pm
+++ b/lib/WWW/Curl.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use XSLoader;
 
-our $VERSION = '4.16';
+our $VERSION = '4.17';
 XSLoader::load(__PACKAGE__, $VERSION);
 
 END {
@@ -133,7 +133,7 @@ a new batch of easy handles for processing.
 
 =head1 WWW::Curl::Share
 
-	use WWW::CURL::Share;
+	use WWW::Curl::Share;
 	my $curlsh = new WWW::Curl::Share;
 	$curlsh->setopt(CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
 	$curlsh->setopt(CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS);
@@ -390,13 +390,12 @@ repackaged the module into a more modern form.
 
 =head1 COPYRIGHT
 
-Copyright (C) 2000-2005,2008-2010 Daniel Stenberg, Cris Bailiff,
+Copyright (C) 2000-2005,2008-2014 Daniel Stenberg, Cris Bailiff,
 Sebastian Riedel, Balint Szilakszi et al.
 
 You may opt to use, copy, modify, merge, publish, distribute and/or sell
 copies of the Software, and permit persons to whom the Software is furnished
-to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
-pick one of these licenses.
+to do so, under the terms of the MIT license.
 
 =head1 SEE ALSO
 
diff --git a/lib/WWW/Curl/Easy.pm b/lib/WWW/Curl/Easy.pm
index e07e1c0..b4dd1c5 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.16';
+our $VERSION = '4.17';
 
 use WWW::Curl ();
 use Exporter  ();
@@ -58,5 +58,4 @@ Sebastian Riedel, et al.
  
 You may opt to use, copy, modify, merge, publish, distribute and/or sell
 copies of the Software, and permit persons to whom the Software is furnished
-to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
-pick one of these licenses.
+to do so, under the terms of the MIT license.
diff --git a/lib/WWW/Curl/Form.pm b/lib/WWW/Curl/Form.pm
index 08912dd..67aa1b1 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.16';
+our $VERSION = '4.17';
 
 use WWW::Curl ();
 use Exporter  ();
diff --git a/lib/WWW/Curl/Multi.pm b/lib/WWW/Curl/Multi.pm
index e95949f..bf22312 100644
--- a/lib/WWW/Curl/Multi.pm
+++ b/lib/WWW/Curl/Multi.pm
@@ -11,5 +11,4 @@ Copyright (C) 2004 Sebastian Riedel, et al.
 
 You may opt to use, copy, modify, merge, publish, distribute and/or sell
 copies of the Software, and permit persons to whom the Software is furnished
-to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
-pick one of these licenses.
+to do so, under the terms of the MIT license.
diff --git a/lib/WWW/Curl/Share.pm b/lib/WWW/Curl/Share.pm
index 2bd9aff..6751732 100644
--- a/lib/WWW/Curl/Share.pm
+++ b/lib/WWW/Curl/Share.pm
@@ -38,5 +38,4 @@ Copyright (C) 2008, Anton Fedorov (datacompboy <at> mail.ru)
 
 You may opt to use, copy, modify, merge, publish, distribute and/or sell
 copies of the Software, and permit persons to whom the Software is furnished
-to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
-pick one of these licenses.
+to do so, under the terms of the MIT license.
diff --git a/t/21write-to-scalar.t b/t/21write-to-scalar.t
index b457d5c..85d916e 100644
--- a/t/21write-to-scalar.t
+++ b/t/21write-to-scalar.t
@@ -35,7 +35,3 @@ my $realurl = $curl->getinfo(CURLINFO_EFFECTIVE_URL);
 ok( $realurl, "getinfo returns CURLINFO_EFFECTIVE_URL");
 my $httpcode = $curl->getinfo(CURLINFO_HTTP_CODE);
 ok( $httpcode, "getinfo returns CURLINFO_HTTP_CODE");
-
-note("Bytes: $bytes");
-note("realurl: $realurl");
-note("httpcode: $httpcode");
diff --git a/template/Easy.pm.tmpl b/template/Easy.pm.tmpl
index 83d856a..bded4a7 100644
--- a/template/Easy.pm.tmpl
+++ b/template/Easy.pm.tmpl
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = '4.16';
+our $VERSION = '4.17';
 
 use WWW::Curl ();
 use Exporter  ();
@@ -59,5 +59,4 @@ Sebastian Riedel, et al.
  
 You may opt to use, copy, modify, merge, publish, distribute and/or sell
 copies of the Software, and permit persons to whom the Software is furnished
-to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
-pick one of these licenses.
+to do so, under the terms of the MIT license.
diff --git a/template/Share.pm.tmpl b/template/Share.pm.tmpl
index 3c73db2..9382b93 100644
--- a/template/Share.pm.tmpl
+++ b/template/Share.pm.tmpl
@@ -39,5 +39,4 @@ Copyright (C) 2008, Anton Fedorov (datacompboy <at> mail.ru)
 
 You may opt to use, copy, modify, merge, publish, distribute and/or sell
 copies of the Software, and permit persons to whom the Software is furnished
-to do so, under the terms of the MPL or the MIT/X-derivate licenses. You may
-pick one of these licenses.
+to do so, under the terms of the MIT license.