Skip to content

ext/curl: curl_getinfo, curl_multi_get_handles and curl_multi_setopt … #18389

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

Merged
merged 1 commit into from
Apr 21, 2025
Merged

ext/curl: curl_getinfo, curl_multi_get_handles and curl_multi_setopt … #18389

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions ext/curl/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2747,6 +2747,7 @@ PHP_FUNCTION(curl_getinfo)
if (curl_easy_getinfo(ch->cp, option, &slist) == CURLE_OK) {
struct curl_slist *current = slist;
array_init(return_value);
zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
while (current) {
add_next_index_string(return_value, current->data);
current = current->next;
Expand Down
8 changes: 5 additions & 3 deletions ext/curl/multi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ PHP_FUNCTION(curl_multi_get_handles)

mh = Z_CURL_MULTI_P(z_mh);

array_init(return_value);
array_init_size(return_value, zend_llist_count(&mh->easyh));
zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
zend_llist_position pos;
zval *pz_ch;

Expand Down Expand Up @@ -420,10 +421,11 @@ static int _php_server_push_callback(CURL *parent_ch, CURL *easy, size_t num_hea
ch->cp = easy;
_php_setup_easy_copy_handlers(ch, parent);

array_init(&headers);
array_init_size(&headers, num_headers);
zend_hash_real_init_packed(Z_ARRVAL(headers));
for (size_t i = 0; i < num_headers; i++) {
char *header = curl_pushheader_bynum(push_headers, i);
add_next_index_string(&headers, header);
add_index_string(&headers, i, header);
}

ZEND_ASSERT(pz_parent_ch);
Expand Down
Loading