summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlaven Rezic <cpansand@cloud1.bbbike.org>2019-09-29 16:19:57 +0000
committergregor herrmann <gregoa@debian.org>2020-09-27 21:32:25 +0200
commit347b36fb7aa3a270becc5c55686ba301da4bf1fa (patch)
treeb866b4b8ab423cf502310ee44e3970eed9dec83b
parentf0ab4b0c9c861fd39870577c163773e2e7c11c2b (diff)
[PATCH] compat for libcurl 7.66.0 (fix for RT #130591)HEADarchive/debian/4.17-7master
From 0ef6ea22479b4696a0d62cd44aac8f4fe866db2f Mon Sep 17 00:00:00 2001 Origin: CPAN RT #130591 Bug: https://rt.cpan.org/Public/Bug/Display.html?id=130591 https://github.com/szbalint/WWW--Curl/pull/24 Bug-Debian: https://bugs.debian.org/941915 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971107 Reviewed-by: gregor herrmann <gregoa@debian.org> Last-Update: 2020-09-27 Gbp-Pq: Name WWW-Curl-4.17-RT130591.patch
-rw-r--r--Curl.xs4
-rw-r--r--Makefile.PL2
2 files changed, 5 insertions, 1 deletions
diff --git a/Curl.xs b/Curl.xs
index ea9f870..e81c415 100644
--- a/Curl.xs
+++ b/Curl.xs
@@ -18,6 +18,10 @@
#include <curl/easy.h>
#include <curl/multi.h>
+#ifdef CURLINC_MULTI_H
+#define __CURL_MULTI_H
+#endif
+
#define header_callback_func writeheader_callback_func
/* Do a favor for older perl versions */
diff --git a/Makefile.PL b/Makefile.PL
index 21f758f..32cb157 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -132,7 +132,7 @@ if (!defined($curl_h)) {
close H;
for my $e (sort @syms) {
- if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) {
+ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_WIN32\z|^CURLOPT\z|^CURL_STRICTER\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z|^CURLINC_)/) {
next;
}
my ($group) = $e =~ m/^([^_]+_)/;