r36992 - in /branches/upstream/libwww-curl-perl/current: Changes Curl.xs MANIFEST META.yml Makefile.PL README SIGNATURE lib/WWW/Curl.pm lib/WWW/Curl/Easy.pm lib/WWW/Curl/Share.pm t/01basic.t t/13slowleak.t template/Easy.pm.tmpl
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Sun May 31 20:50:52 UTC 2009
Author: ryan52-guest
Date: Sun May 31 20:50:47 2009
New Revision: 36992
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=36992
Log:
[svn-upgrade] Integrating new upstream version, libwww-curl-perl (4.07)
Added:
branches/upstream/libwww-curl-perl/current/SIGNATURE
branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Easy.pm
branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Share.pm
Modified:
branches/upstream/libwww-curl-perl/current/Changes
branches/upstream/libwww-curl-perl/current/Curl.xs
branches/upstream/libwww-curl-perl/current/MANIFEST
branches/upstream/libwww-curl-perl/current/META.yml
branches/upstream/libwww-curl-perl/current/Makefile.PL
branches/upstream/libwww-curl-perl/current/README
branches/upstream/libwww-curl-perl/current/lib/WWW/Curl.pm
branches/upstream/libwww-curl-perl/current/t/01basic.t
branches/upstream/libwww-curl-perl/current/t/13slowleak.t
branches/upstream/libwww-curl-perl/current/template/Easy.pm.tmpl
Modified: branches/upstream/libwww-curl-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/Changes?rev=36992&op=diff
==============================================================================
--- branches/upstream/libwww-curl-perl/current/Changes (original)
+++ branches/upstream/libwww-curl-perl/current/Changes Sun May 31 20:50:47 2009
@@ -1,4 +1,17 @@
Revision history for Perl extension WWW::Curl.
+4.07 Sun May 31 2009: - Balint Szilakszi <szbalint at cpan.org>
+
+ - Fixed >32bit integer option passing to libcurl on 32bit systems.
+ (Thanks to Peter Heuchert for the report and fix suggestion!)
+ - The CURL_CONFIG environment variable can now be used to specify
+ which curl-config to use (contributed by claes).
+ - Fixed segfault when a string option with setopt was set to undef
+ (contributed by claes).
+ - Fixed incomplete cleanup routine at destruction time
+ (contributed by claes).
+ - Readded Easy.pm and Share.pm stubs so that they are indexed by
+ CPAN, thus avoiding complications with outdated versions appearing.
+
4.06 Sun Apr 05 2009: - Balint Szilakszi <szbalint at cpan.org>
- Fixed a setopt issue that could cause a setopt string to get
Modified: branches/upstream/libwww-curl-perl/current/Curl.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/Curl.xs?rev=36992&op=diff
==============================================================================
--- branches/upstream/libwww-curl-perl/current/Curl.xs (original)
+++ branches/upstream/libwww-curl-perl/current/Curl.xs Sun May 31 20:50:47 2009
@@ -572,6 +572,13 @@
typedef perl_curl_multi * WWW__Curl__Multi;
typedef perl_curl_share * WWW__Curl__Share;
+
+MODULE = WWW::Curl PACKAGE = WWW::Curl PREFIX = curl_
+
+void
+curl__global_cleanup()
+ CODE:
+ curl_global_cleanup();
MODULE = WWW::Curl PACKAGE = WWW::Curl::Easy PREFIX = curl_easy_
@@ -818,7 +825,7 @@
}
else if (option < CURLOPTTYPE_FUNCTIONPOINT) { /* An objectpoint - string */
/* FIXME: Does curl really want NULL for empty strings? */
- STRLEN dummy;
+ STRLEN dummy = 0;
/* Pre 7.17.0, the strings aren't copied by libcurl.*/
char* pv = SvOK(value) ? SvPV(value, dummy) : "";
I32 len = (I32)dummy;
@@ -831,8 +838,15 @@
else if (option < CURLOPTTYPE_OFF_T) { /* A function - notreached? */
croak("Unknown curl option of type function");
}
- else { /* A LARGE file option using curl_off_t */
- RETVAL = curl_easy_setopt(self->curl, option, (curl_off_t)SvIV(value));
+ else { /* A LARGE file option using curl_off_t, handling larger than 32bit sizes without 64bit integer support */
+ if (SvOK(value) && looks_like_number(value)) {
+ STRLEN dummy = 0;
+ char* pv = SvPV(value, dummy);
+ char* pdummy;
+ RETVAL = curl_easy_setopt(self->curl, option, (curl_off_t) strtoll(pv,&pdummy,10));
+ } else {
+ RETVAL = 0;
+ }
}
#endif
;
@@ -928,11 +942,6 @@
WWW::Curl::Easy self
CODE:
perl_curl_easy_delete(self);
-
-void
-curl_easy_global_cleanup()
- CODE:
- curl_global_cleanup();
SV *
curl_easy_strerror(self, errornum)
Modified: branches/upstream/libwww-curl-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/MANIFEST?rev=36992&op=diff
==============================================================================
--- branches/upstream/libwww-curl-perl/current/MANIFEST (original)
+++ branches/upstream/libwww-curl-perl/current/MANIFEST Sun May 31 20:50:47 2009
@@ -8,14 +8,17 @@
inc/Module/Install/MakeMaker.pm
inc/Module/Install/Metadata.pm
lib/WWW/Curl.pm
+lib/WWW/Curl/Easy.pm
lib/WWW/Curl/Form.pm
lib/WWW/Curl/Multi.pm
+lib/WWW/Curl/Share.pm
LICENSE
Makefile.PL
MANIFEST
META.yml
README
README.Win32
+SIGNATURE
t/00constants.t
t/01basic.t
t/02callbacks.t
Modified: branches/upstream/libwww-curl-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/META.yml?rev=36992&op=diff
==============================================================================
--- branches/upstream/libwww-curl-perl/current/META.yml (original)
+++ branches/upstream/libwww-curl-perl/current/META.yml Sun May 31 20:50:47 2009
@@ -2,6 +2,7 @@
abstract: 'Perl extension interface for libcurl'
author:
- 'Cris Bailiff <c.bailiff+curl at devsecure.com>'
+ - 'Balint Szilakszi <szbalint at cpan.org>'
configure_requires:
ExtUtils::MakeMaker: 6.50
distribution_type: module
@@ -19,4 +20,4 @@
- template
requires:
perl: 5.6.1
-version: 4.06
+version: 4.07
Modified: branches/upstream/libwww-curl-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/Makefile.PL?rev=36992&op=diff
==============================================================================
--- branches/upstream/libwww-curl-perl/current/Makefile.PL (original)
+++ branches/upstream/libwww-curl-perl/current/Makefile.PL Sun May 31 20:50:47 2009
@@ -12,12 +12,16 @@
# This is a hack. If you have libcurl installed, just specify curl.h below
# and comment out this line.
if ($^O ne 'MSWin32') {
- requires_external_bin 'curl-config';
+ if (!$ENV{CURL_CONFIG}) {
+ requires_external_bin 'curl-config';
+ }
} else {
print "Sorry, no automated install is available on Windows,\n".
"please see the README.Win32 file on instructions for a manual install.\n";
exit(0);
}
+
+my $curl_config = $ENV{CURL_CONFIG} || 'curl-config';
my @includes = qw();
my ($cflags,$lflags, $ldflags) = ('','','');
@@ -43,8 +47,8 @@
if ($^O ne 'MSWin32') {
- $cflags = `curl-config --cflags`;
- $lflags = `curl-config --libs`;
+ $cflags = `${curl_config} --cflags`;
+ $lflags = `${curl_config} --libs`;
}
# can't find link flags, make some guesses
Modified: branches/upstream/libwww-curl-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/README?rev=36992&op=diff
==============================================================================
--- branches/upstream/libwww-curl-perl/current/README (original)
+++ branches/upstream/libwww-curl-perl/current/README Sun May 31 20:50:47 2009
@@ -18,6 +18,9 @@
an explicit path when building the Makefile:
perl Makefile.PL /home/foo/curl/include
+
+If you want to specify which curl-config to use instead of the first in path
+set the environment variable CURL_CONFIG to point at the curl-config to use.
Minimum version requirements:
Added: branches/upstream/libwww-curl-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/SIGNATURE?rev=36992&op=file
==============================================================================
--- branches/upstream/libwww-curl-perl/current/SIGNATURE (added)
+++ branches/upstream/libwww-curl-perl/current/SIGNATURE Sun May 31 20:50:47 2009
@@ -1,0 +1,77 @@
+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: SHA1
+
+SHA1 3eaacfd02186062a36432d49fe55736404c4f927 Changes
+SHA1 1e14dddfdfb8255f50be4c82b21dda67d755ee3a Curl.xs
+SHA1 94cbea5b3fb940e25cd4535d1c81bfd7d51dac3c LICENSE
+SHA1 9da6d1654f2d8f05677f40f40b0d9b4b755974e9 MANIFEST
+SHA1 f17c0bd99e5432f2e8ccef8157d18a0570f8e93a META.yml
+SHA1 0925c498455cacf86c3ddd2018bd8483a202fdfd Makefile.PL
+SHA1 d748092a930511edbcc59a3e84e5a60fb8eb25e9 README
+SHA1 ed6f9f399075307a33bd02902ebbadbbbfbd8bab README.Win32
+SHA1 0ee138b692d09ede5107b5e90fcb0559c14ccf00 inc/Module/Install.pm
+SHA1 85ada888142a3992433fa164ed103afc5f4b88a0 inc/Module/Install/Base.pm
+SHA1 74f79103450ad44d6e9cd3deffb1cd5bdee4f047 inc/Module/Install/Can.pm
+SHA1 6339c952618b1251b6160fb419206682c64b0c26 inc/Module/Install/External.pm
+SHA1 0b2c068f052002ff4df14479ac409399082de694 inc/Module/Install/MakeMaker.pm
+SHA1 b444632abd605e508a89a21af4690226a2ac92a9 inc/Module/Install/Makefile.pm
+SHA1 0436aa3e436884a3ce9f5a3edc4c3482cd4aaf1f inc/Module/Install/Metadata.pm
+SHA1 eb0303d98939bfcd7f3412ac563c82c3721fda42 lib/WWW/Curl.pm
+SHA1 3ab482bda9bc0713981ddf1d47948ed85451b9e3 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 63798ef74199b69b88a3acc3bf8d90790655daed 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 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 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 87bb2a86f20e8c77371c0305840210272c91de4d template/Easy.pm.tmpl
+SHA1 b4841adcad866b70d9d72f171d3d0f8f9d5b3c79 template/Share.pm.tmpl
+SHA1 468b011caaf4d54609b421027d7c6262a9260e89 typemap
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkoi04QACgkQ+22TSbOiiI9BHQCgoD+vvx4PHW248lEWv3U0Yefn
+BXEAoIuQHWqtZP8VXeE/lzOHz4RHD/OT
+=czCF
+-----END PGP SIGNATURE-----
Modified: branches/upstream/libwww-curl-perl/current/lib/WWW/Curl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/lib/WWW/Curl.pm?rev=36992&op=diff
==============================================================================
--- branches/upstream/libwww-curl-perl/current/lib/WWW/Curl.pm (original)
+++ branches/upstream/libwww-curl-perl/current/lib/WWW/Curl.pm Sun May 31 20:50:47 2009
@@ -6,9 +6,13 @@
use DynaLoader;
BEGIN {
- $VERSION = '4.06';
+ $VERSION = '4.07';
@ISA = qw(DynaLoader);
__PACKAGE__->bootstrap;
+}
+
+END {
+ _global_cleanup();
}
1;
@@ -242,6 +246,10 @@
Not implemented.
+=item curl_global_cleanup
+
+Only used internally and called automatically upon exit.
+
=item curl_slist_append
Only used internally, not exposed through the public API.
@@ -279,7 +287,7 @@
=head1 CHANGES
-Version 4.01 - 4.06 adds several bugfixes and extends functionality coverage. See Changes file.
+Version 4.01 - 4.07 adds several bugfixes and extends functionality coverage. See Changes file.
Version 4.00 added new documentation, the build system changed to Module::Install,
the test suite was rewritten to use Test::More, a new calling syntax for WWW::Curl::Multi
@@ -311,7 +319,8 @@
=head1 AUTHORS
-Currently maintained by Cris Bailiff <c.bailiff+curl at devsecure.com>
+Currently maintained by Cris Bailiff <c.bailiff+curl at devsecure.com> and
+Balint Szilakszi <szbalint at cpan.org>.
Original Author Georg Horn <horn at koblenz-net.de>, with additional callback,
pod and test work by Cris Bailiff <c.bailiff+curl at devsecure.com> and
@@ -321,7 +330,7 @@
=head1 COPYRIGHT
-Copyright (C) 2000-2005,2008 Daniel Stenberg, Cris Bailiff,
+Copyright (C) 2000-2005,2008,2009 Daniel Stenberg, Cris Bailiff,
Sebastian Riedel, Balint Szilakszi et al.
You may opt to use, copy, modify, merge, publish, distribute and/or sell
Added: branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Easy.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Easy.pm?rev=36992&op=file
==============================================================================
--- branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Easy.pm (added)
+++ branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Easy.pm Sun May 31 20:50:47 2009
@@ -1,0 +1,45 @@
+package WWW::Curl::Easy;
+
+use strict;
+use warnings;
+use Carp;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD);
+
+$VERSION = '4.07';
+
+require WWW::Curl;
+require Exporter;
+require AutoLoader;
+
+ at ISA = qw(Exporter DynaLoader);
+
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+
+ at EXPORT = qw(
+);
+
+$WWW::Curl::Easy::headers = "";
+$WWW::Curl::Easy::content = "";
+
+sub AUTOLOAD {
+
+ # This AUTOLOAD is used to 'autoload' constants from the constant()
+ # XS function.
+
+ ( my $constname = $AUTOLOAD ) =~ s/.*:://;
+ return constant( $constname, 0 );
+}
+
+1;
+
+__END__
+
+Copyright (C) 2000-2005,2008 Daniel Stenberg, Cris Bailiff,
+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.
Added: branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Share.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Share.pm?rev=36992&op=file
==============================================================================
--- branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Share.pm (added)
+++ branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Share.pm Sun May 31 20:50:47 2009
@@ -1,0 +1,35 @@
+package WWW::Curl::Share;
+
+use strict;
+use warnings;
+use Carp;
+use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD);
+
+use WWW::Curl;
+require Exporter;
+require AutoLoader;
+
+ at ISA = qw(Exporter DynaLoader);
+
+ at EXPORT = qw(
+);
+
+sub AUTOLOAD {
+
+ # This AUTOLOAD is used to 'autoload' constants from the constant()
+ # XS function.
+
+ ( my $constname = $AUTOLOAD ) =~ s/.*:://;
+ return constant( $constname, 0 );
+}
+
+1;
+__END__
+
+
+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.
Modified: branches/upstream/libwww-curl-perl/current/t/01basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/t/01basic.t?rev=36992&op=diff
==============================================================================
--- branches/upstream/libwww-curl-perl/current/t/01basic.t (original)
+++ branches/upstream/libwww-curl-perl/current/t/01basic.t Sun May 31 20:50:47 2009
@@ -2,12 +2,13 @@
use strict;
use warnings;
-use Test::More tests => 14;
+use Test::More tests => 16;
use File::Temp qw/tempfile/;
BEGIN { use_ok( 'WWW::Curl::Easy' ); }
my $url = $ENV{CURL_TEST_URL} || "http://www.google.com";
+
my $memfile = '';
# Init the curl session
@@ -18,6 +19,8 @@
ok(! $curl->setopt(CURLOPT_NOPROGRESS, 1), "Setting CURLOPT_NOPROGRESS");
ok(! $curl->setopt(CURLOPT_FOLLOWLOCATION, 1), "Setting CURLOPT_FOLLOWLOCATION");
ok(! $curl->setopt(CURLOPT_TIMEOUT, 30), "Setting CURLOPT_TIMEOUT");
+ok(! $curl->setopt(CURLOPT_ENCODING, undef), "Setting CURLOPT_ENCODING to undef");
+ok(! $curl->setopt(CURLOPT_RESUME_FROM_LARGE, 0), "Setting CURLOPT_ENCODING to undef");
$curl->setopt(CURLOPT_HEADER, 1);
my $head = tempfile();
Modified: branches/upstream/libwww-curl-perl/current/t/13slowleak.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/t/13slowleak.t?rev=36992&op=diff
==============================================================================
--- branches/upstream/libwww-curl-perl/current/t/13slowleak.t (original)
+++ branches/upstream/libwww-curl-perl/current/t/13slowleak.t Sun May 31 20:50:47 2009
@@ -40,4 +40,3 @@
}
-WWW::Curl::Easy::global_cleanup; #noop
Modified: branches/upstream/libwww-curl-perl/current/template/Easy.pm.tmpl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libwww-curl-perl/current/template/Easy.pm.tmpl?rev=36992&op=diff
==============================================================================
--- branches/upstream/libwww-curl-perl/current/template/Easy.pm.tmpl (original)
+++ branches/upstream/libwww-curl-perl/current/template/Easy.pm.tmpl Sun May 31 20:50:47 2009
@@ -5,7 +5,7 @@
use Carp;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD);
-$VERSION = '4.06';
+$VERSION = '4.07';
require WWW::Curl;
require Exporter;
More information about the Pkg-perl-cvs-commits
mailing list