Skip to content

ext/curl: Refactor cURL to only use FCC #13291

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 15 commits into from
May 1, 2024
Merged

ext/curl: Refactor cURL to only use FCC #13291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8aa8c07
ext/curl: Convert handlers.progress to just be a FCC
Girgias Jan 31, 2024
854257f
ext/curl: Convert handlers.sshhostkey to just be a FCC
Girgias Jan 31, 2024
85d1820
ext/curl: Convert handlers.xferinfo to just be a FCC
Girgias Jan 31, 2024
d3fb21c
ext/curl: Convert handlers.fnmatch to just be a FCC
Girgias Jan 31, 2024
1dfce9d
ext/curl: Convert handlers.server_push to just be a FCC
Girgias Jan 31, 2024
cf9228f
ext/curl: Convert php_curl_write to just use FCC without a function n…
Girgias Jan 31, 2024
c3f60a2
ext/curl: Convert php_curl_read to just use FCC without a function na…
Girgias Jan 31, 2024
51c8e21
ext/curl: Remove workaround for old libcurl
Girgias Jan 31, 2024
fd4fafd
ext/curl: Create macros to codegen the handling of callable options
Girgias Feb 1, 2024
b9731c8
Fix test due to unavailable SSH_HOSTKEY option
Girgias Feb 6, 2024
0994ee2
Add trampoline tests
Girgias Feb 6, 2024
617b186
Remove XFAIL
Girgias Apr 16, 2024
e8391d4
Address review comments
Girgias Apr 23, 2024
4b7230b
Address review comments about missing empty FCC assignment
Girgias Apr 30, 2024
431d24a
Remove unnecessary set to NULL/empty FCC
Girgias Apr 30, 2024
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
21 changes: 7 additions & 14 deletions ext/curl/curl_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,38 +45,31 @@ PHP_MSHUTDOWN_FUNCTION(curl);
PHP_MINFO_FUNCTION(curl);

typedef struct {
zval func_name;
zend_fcall_info_cache fci_cache;
zend_fcall_info_cache fcc;
FILE *fp;
smart_str buf;
int method;
zval stream;
} php_curl_write;

typedef struct {
zval func_name;
zend_fcall_info_cache fci_cache;
zend_fcall_info_cache fcc;
FILE *fp;
zend_resource *res;
int method;
zval stream;
} php_curl_read;

typedef struct {
zval func_name;
zend_fcall_info_cache fci_cache;
} php_curl_callback;

typedef struct {
php_curl_write *write;
php_curl_write *write_header;
php_curl_read *read;
zval std_err;
php_curl_callback *progress;
php_curl_callback *xferinfo;
php_curl_callback *fnmatch;
zend_fcall_info_cache progress;
zend_fcall_info_cache xferinfo;
zend_fcall_info_cache fnmatch;
#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
php_curl_callback *sshhostkey;
zend_fcall_info_cache sshhostkey;
#endif
} php_curl_handlers;

Expand Down Expand Up @@ -114,7 +107,7 @@ typedef struct {
#define CURLOPT_SAFE_UPLOAD -1

typedef struct {
php_curl_callback *server_push;
zend_fcall_info_cache server_push;
} php_curlm_handlers;

typedef struct {
Expand Down
Loading
Loading