From 550b78591c623f524c541055bb268680d54829f7 Mon Sep 17 00:00:00 2001

From: Aaron Bishop <erroneous@gmail.com>

Date: Thu, 25 Jun 2020 10:25:40 -0400

Subject: [PATCH] Fix issues with latest versions of curl

---

 Curl.xs     | 16 ++++++++++------

 Makefile.PL |  2 +-

 2 files changed, 11 insertions(+), 7 deletions(-)

--- WWW-Curl-4.17/Curl.xs	2023-03-31 20:42:43.283993951 +0300

+++ WWW-Curl-4.17/Curl.xs	2023-03-31 20:44:07.948987770 +0300

@@ -18,6 +18,10 @@

 #include <curl/easy.h>

 #include <curl/multi.h>

+#if defined(__CURL_MULTI_H) && !defined(CURLINC_MULTI_H)

+#   define CURLINC_MULTI_H

+#endif

+

 #define header_callback_func writeheader_callback_func

 /* Do a favor for older perl versions */

@@ -70,7 +74,7 @@

 typedef struct {

-#ifdef __CURL_MULTI_H

+#ifdef CURLINC_MULTI_H

     struct CURLM *curlm;

 #else

     void *curlm;

@@ -234,7 +238,7 @@

 {

     perl_curl_multi *self;

     Newz(1, self, 1, perl_curl_multi);

-#ifdef __CURL_MULTI_H

+#ifdef CURLINC_MULTI_H

     self->curlm=curl_multi_init();

 #else

     croak("curl version too old to support curl_multi_init()");

@@ -245,7 +249,7 @@

 /* delete the multi */

 static void perl_curl_multi_delete(perl_curl_multi *self)

 {

-#ifdef __CURL_MULTI_H

+#ifdef CURLINC_MULTI_H

     if (self->curlm) 

         curl_multi_cleanup(self->curlm);

     Safefree(self);

@@ -1065,7 +1069,7 @@

     WWW::Curl::Multi curlm

     WWW::Curl::Easy curl

     CODE:

-#ifdef __CURL_MULTI_H

+#ifdef CURLINC_MULTI_H

         curl_multi_add_handle(curlm->curlm, curl->curl);

 #endif

@@ -1074,7 +1078,7 @@

     WWW::Curl::Multi curlm

     WWW::Curl::Easy curl

     CODE:

-#ifdef __CURL_MULTI_H

+#ifdef CURLINC_MULTI_H

         curl_multi_remove_handle(curlm->curlm, curl->curl);

 #endif

@@ -1149,7 +1153,7 @@

     PREINIT:

         int remaining;

     CODE:

-#ifdef __CURL_MULTI_H

+#ifdef CURLINC_MULTI_H

         while(CURLM_CALL_MULTI_PERFORM ==

             curl_multi_perform(self->curlm, &remaining));

 	    RETVAL = remaining;

--- WWW-Curl-4.17/Makefile.PL	2023-03-31 20:47:15.473328465 +0300

+++ WWW-Curl-4.17/Makefile.PL	2023-03-31 20:50:16.694891914 +0300

@@ -128,7 +128,7 @@

     close H;

     for my $e (sort @syms) {

-       if($e =~ /(OBSOLETE|^CURL_DEPRECATED\z|^CURL_EXTERN|^CURL_IGNORE_DEPRECATION\z|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|^CURLOPTDEPRECATED\z|_LAST\z|_LASTENTRY\z)/) {

+       if($e =~ /(OBSOLETE|^CURL_DEPRECATED\z|^CURL_EXTERN|^CURL_IGNORE_DEPRECATION\z|^CURL_STRICTER\z|^CURL_WIN32\z|^CURLOPT\z|^CURLOPTDEPRECATED\z|^CURL_DID_MEMORY_FUNC_TYPEDEFS\z|_LAST\z|_LASTENTRY\z)/) {

           next;

        }

        my ($group) = $e =~ m/^([^_]+_)/;