r36995 - in /trunk/libwww-curl-perl: Changes Curl.xs MANIFEST META.yml Makefile.PL README SIGNATURE debian/changelog 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:52:11 UTC 2009
Author: ryan52-guest
Date: Sun May 31 20:52:06 2009
New Revision: 36995
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=36995
Log:
New upstream release
Added:
trunk/libwww-curl-perl/SIGNATURE
- copied unchanged from r36993, branches/upstream/libwww-curl-perl/current/SIGNATURE
trunk/libwww-curl-perl/lib/WWW/Curl/Easy.pm
- copied unchanged from r36993, branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Easy.pm
trunk/libwww-curl-perl/lib/WWW/Curl/Share.pm
- copied unchanged from r36993, branches/upstream/libwww-curl-perl/current/lib/WWW/Curl/Share.pm
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/Makefile.PL
trunk/libwww-curl-perl/README
trunk/libwww-curl-perl/debian/changelog
trunk/libwww-curl-perl/lib/WWW/Curl.pm
trunk/libwww-curl-perl/t/01basic.t
trunk/libwww-curl-perl/t/13slowleak.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=36995&op=diff
==============================================================================
--- trunk/libwww-curl-perl/Changes (original)
+++ trunk/libwww-curl-perl/Changes Sun May 31 20:52:06 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: trunk/libwww-curl-perl/Curl.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/Curl.xs?rev=36995&op=diff
==============================================================================
--- trunk/libwww-curl-perl/Curl.xs (original)
+++ trunk/libwww-curl-perl/Curl.xs Sun May 31 20:52:06 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: trunk/libwww-curl-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/MANIFEST?rev=36995&op=diff
==============================================================================
--- trunk/libwww-curl-perl/MANIFEST (original)
+++ trunk/libwww-curl-perl/MANIFEST Sun May 31 20:52:06 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: trunk/libwww-curl-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/META.yml?rev=36995&op=diff
==============================================================================
--- trunk/libwww-curl-perl/META.yml (original)
+++ trunk/libwww-curl-perl/META.yml Sun May 31 20:52:06 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: trunk/libwww-curl-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/Makefile.PL?rev=36995&op=diff
==============================================================================
--- trunk/libwww-curl-perl/Makefile.PL (original)
+++ trunk/libwww-curl-perl/Makefile.PL Sun May 31 20:52:06 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: trunk/libwww-curl-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/README?rev=36995&op=diff
==============================================================================
--- trunk/libwww-curl-perl/README (original)
+++ trunk/libwww-curl-perl/README Sun May 31 20:52:06 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:
Modified: trunk/libwww-curl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/debian/changelog?rev=36995&op=diff
==============================================================================
--- trunk/libwww-curl-perl/debian/changelog (original)
+++ trunk/libwww-curl-perl/debian/changelog Sun May 31 20:52:06 2009
@@ -1,3 +1,9 @@
+libwww-curl-perl (4.07-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Ryan Niebur <ryanryan52 at gmail.com> Sun, 31 May 2009 13:51:57 -0700
+
libwww-curl-perl (4.06-1) unstable; urgency=low
[ gregor herrmann ]
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=36995&op=diff
==============================================================================
--- trunk/libwww-curl-perl/lib/WWW/Curl.pm (original)
+++ trunk/libwww-curl-perl/lib/WWW/Curl.pm Sun May 31 20:52:06 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
Modified: trunk/libwww-curl-perl/t/01basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/t/01basic.t?rev=36995&op=diff
==============================================================================
--- trunk/libwww-curl-perl/t/01basic.t (original)
+++ trunk/libwww-curl-perl/t/01basic.t Sun May 31 20:52:06 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: trunk/libwww-curl-perl/t/13slowleak.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libwww-curl-perl/t/13slowleak.t?rev=36995&op=diff
==============================================================================
--- trunk/libwww-curl-perl/t/13slowleak.t (original)
+++ trunk/libwww-curl-perl/t/13slowleak.t Sun May 31 20:52:06 2009
@@ -40,4 +40,3 @@
}
-WWW::Curl::Easy::global_cleanup; #noop
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=36995&op=diff
==============================================================================
--- trunk/libwww-curl-perl/template/Easy.pm.tmpl (original)
+++ trunk/libwww-curl-perl/template/Easy.pm.tmpl Sun May 31 20:52:06 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