Skip to content

#299: Hand a throwing fnmatch or host-key callback to the coroutine #37

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
EdmondDantes merged 2 commits into from
Sep 10, 2026
Merged

#299: Hand a throwing fnmatch or host-key callback to the coroutine #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c9e0be
#299: Hand a throwing fnmatch or host-key callback to the coroutine
EdmondDantes Sep 10, 2026
fd408b8
#299: Say what the overwritten result codes stand for
EdmondDantes Sep 10, 2026
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
29 changes: 29 additions & 0 deletions ext/curl/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,22 @@ static int curl_fnmatch(void *ctx, const char *pattern, const char *string)
/* TODO Check callback returns an int or something castable to int */
rval = php_curl_get_long(&retval);
}

/* Capture an exception from the user callback onto the async event so it is
* delivered through the coroutine to the awaiter. Without this, EG(exception)
* stays set across further libcurl iterations and escapes outside the coroutine
* as an uncaught error. The result is overwritten because a warning raised as
* an exception leaves the callback's own answer in rval. libcurl has no code
* for a failing fnmatch callback, only match and non-match, so the transfer
* reports the generic abort. */
if (EG(exception) && ch->async_event != NULL) {
curl_async_event_t *curl_event = (curl_async_event_t *) ch->async_event;
GC_ADDREF(EG(exception));
curl_async_event_set_callback_exception(curl_event, EG(exception), CURLE_ABORTED_BY_CALLBACK);
zend_clear_exception();
rval = CURL_FNMATCHFUNC_FAIL;
}

zval_ptr_dtor(&argv[0]);
zval_ptr_dtor(&argv[1]);
zval_ptr_dtor(&argv[2]);
Expand Down Expand Up @@ -855,6 +871,19 @@ static int curl_ssh_hostkeyfunction(void *clientp, int keytype, const char *key,
}
}

/* Same handoff as the other callbacks: the exception is carried on the event
* rather than left in EG(exception) past the transfer. It takes a throw from
* the callback and the wrong-return error above alike, and overwrites the
* result in both, since either can leave the callback's own answer in rval.
* Anything but CURLKHMATCH_OK fails verification in libcurl. */
if (EG(exception) && ch->async_event != NULL) {
curl_async_event_t *curl_event = (curl_async_event_t *) ch->async_event;
GC_ADDREF(EG(exception));
curl_async_event_set_callback_exception(curl_event, EG(exception), CURLE_PEER_FAILED_VERIFICATION);
zend_clear_exception();
rval = CURLKHMATCH_MISMATCH;
}

zval_ptr_dtor(&args[0]);
zval_ptr_dtor(&args[2]);
return rval;
Expand Down
Loading