summaryrefslogtreecommitdiffstats
path: root/0001-fix-incompatible-pointer-type.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-10-10 08:36:49 +0200
committerRemi Collet <remi@php.net>2025-10-10 08:36:49 +0200
commitc9c87abe9a0bf7b045e989ce9e9fc16ac1cc97dc (patch)
tree1e046907478593a46bd1775feee2d959d4977852 /0001-fix-incompatible-pointer-type.patch
parent9ccd57189357a54ccbd12a01734f933357620790 (diff)
update to 4.3.1HEADmaster
open https://github.com/m6w6/ext-http/issues/151 test suite hangs with old libcurl (EL-8) fix build with libcurl 7.61 (EL-8) using patch from https://github.com/m6w6/ext-http/pull/152
Diffstat (limited to '0001-fix-incompatible-pointer-type.patch')
-rw-r--r--0001-fix-incompatible-pointer-type.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/0001-fix-incompatible-pointer-type.patch b/0001-fix-incompatible-pointer-type.patch
deleted file mode 100644
index f10cbb2..0000000
--- a/0001-fix-incompatible-pointer-type.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From aa9b18e49f2c4e9033e6f32bc6af9cb11c44d332 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 23 Jan 2025 07:41:55 +0100
-Subject: [PATCH] fix incompatible pointer type
-
----
- src/php_http_client_curl.h | 2 +-
- src/php_http_client_curl_event.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/php_http_client_curl.h b/src/php_http_client_curl.h
-index 61723b9..42feff7 100644
---- a/src/php_http_client_curl.h
-+++ b/src/php_http_client_curl.h
-@@ -25,7 +25,7 @@ typedef struct php_http_client_curl_handle {
- } php_http_client_curl_handle_t;
-
- typedef struct php_http_client_curl_ops {
-- void *(*init)();
-+ void *(*init)(php_http_client_t *client, void *user_data);
- void (*dtor)(void **ctx_ptr);
- ZEND_RESULT_CODE (*once)(void *ctx);
- ZEND_RESULT_CODE (*wait)(void *ctx, struct timeval *custom_timeout);
-diff --git a/src/php_http_client_curl_event.c b/src/php_http_client_curl_event.c
-index 2e663ed..b532e11 100644
---- a/src/php_http_client_curl_event.c
-+++ b/src/php_http_client_curl_event.c
-@@ -242,7 +242,7 @@ static ZEND_RESULT_CODE php_http_client_curl_event_exec(void *context)
- return SUCCESS;
- }
-
--static void *php_http_client_curl_event_init(php_http_client_t *client)
-+static void *php_http_client_curl_event_init(php_http_client_t *client, void *user_data)
- {
- php_http_client_curl_t *curl = client->ctx;
- php_http_client_curl_event_context_t *ctx;
---
-2.48.1
-