[php-src] master: Remove compat hack for curl_httppost (#22821)
Sjoerd Langkemper via GitHub <[email protected]> Mon, 20 Jul 2026 13:29:05 +0000
| Newsgroups | gmane.comp.php.cvs.general |
|---|---|
| Message-ID | <[email protected]> |
Author: Sjoerd Langkemper (Sjord) Committer: GitHub (web-flow) Pusher: Girgias Date: 2026-07-20T14:29:02+01:00 Commit: https://github.com/php/php-src/commit/af43113e1e81e172aa7d53141efd44ef3639d651 Raw diff: https://github.com/php/php-src/commit/af43113e1e81e172aa7d53141efd44ef3639d651.diff Remove compat hack for curl_httppost (#22821) HttpPost was renamed to curl_httppost in curl 7.9.6. Since the minimum version for PHP is 7.61.0, we can safely depend on curl_httppost. https://github.com/curl/curl/commit/579985242455741d34df17eea94174772bbe4e32 Changed paths: M ext/curl/interface.c Diff: diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 2571eb60e42d..d5d20d825652 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -32,11 +32,6 @@ #include <curl/curl.h> #include <curl/easy.h> -/* As of curl 7.11.1 this is no longer defined inside curl.h */ -#ifndef HttpPost -#define HttpPost curl_httppost -#endif - #include "zend_smart_str.h" #include "ext/standard/info.h" #include "ext/standard/file.h" @@ -1110,7 +1105,7 @@ void init_curl_handle(php_curl *ch) memset(&ch->err, 0, sizeof(struct _php_curl_error)); - zend_llist_init(&ch->to_free->post, sizeof(struct HttpPost *), (llist_dtor_func_t)curl_free_post, 0); + zend_llist_init(&ch->to_free->post, sizeof(struct curl_httppost *), (llist_dtor_func_t)curl_free_post, 0); zend_llist_init(&ch->to_free->stream, sizeof(struct mime_data_cb_arg *), (llist_dtor_func_t)curl_free_cb_arg, 0); zend_hash_init(&ch->to_free->slist, 4, NULL, curl_free_slist, 0);