Browse Source

Merge pull request #10096 from ryzhovau/perl-www-curl

perl-www-curl: curl 7.66.0 compatibility
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
902b79fcf5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 1 deletions
  1. +1
    -1
      lang/perl-www-curl/Makefile
  2. +56
    -0
      lang/perl-www-curl/patches/210-curl_7.66_compat.patch

+ 1
- 1
lang/perl-www-curl/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=perl-www-curl PKG_NAME:=perl-www-curl
PKG_VERSION:=4.17 PKG_VERSION:=4.17
PKG_RELEASE:=5
PKG_RELEASE:=6
PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SZ/SZBALINT/ PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SZ/SZBALINT/
PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz


+ 56
- 0
lang/perl-www-curl/patches/210-curl_7.66_compat.patch View File

@ -0,0 +1,56 @@
--- a/Curl.xs
+++ b/Curl.xs
@@ -70,7 +70,7 @@
typedef struct {
-#ifdef __CURL_MULTI_H
+#ifdef CURLINC_MULTI_H
struct CURLM *curlm;
#else
struct void *curlm;
@@ -234,7 +234,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 +245,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 +1065,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 +1074,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 +1149,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;

Loading…
Cancel
Save