Skip to content

Fix PHP 8.3 support for libcurl 7.29.0 #20816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thg2k wants to merge 1 commit into
base: PHP-8.3
Choose a base branch
from
+12 −0
Open

Fix PHP 8.3 support for libcurl 7.29.0 #20816

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ext/curl/multi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,18 @@ static void curl_multi_free_obj(zend_object *object)
}
}

#if LIBCURL_VERSION_NUM < 0x071e00 /* 7.30.0 */
/* In 7.29.0 curl_multi_cleanup segfaults if there no handles have been
* added. To avoid this, just add and then remove a dummy handle. */
CURL *tmp_cp = curl_easy_init();
if (tmp_cp) {
if (curl_multi_add_handle(mh->multi, tmp_cp) == CURLM_OK) {
curl_multi_remove_handle(mh->multi, tmp_cp);
}
curl_easy_cleanup(tmp_cp);
}
#endif

curl_multi_cleanup(mh->multi);
zend_llist_clean(&mh->easyh);
if (mh->handlers.server_push) {
Expand Down
Loading