php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

curl: Deduplicate features array

Browse Source
This commit is contained in:
Giovanni Giacobbi
2025-12-28 14:52:08 +01:00
committed by Gina Peter Banyard
parent 50af7c7373
commit fd0ed00ff3
1 changed files with 53 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
ext/curl/interface.c
View File

@@ -221,6 +221,54 @@ static zend_object *curl_clone_obj(zend_object *object);
php_curl *init_curl_handle_into_zval(zval *curl);
static inline zend_result build_mime_structure_from_hash(php_curl *ch, zval *zpostfields);
struct php_curl_feature {
const char *name;
int bitmask;
};
/* To update on each new cURL release using src/main.c in cURL sources */
static const struct php_curl_feature php_curl_features[] = {
{ "AsynchDNS", CURL_VERSION_ASYNCHDNS },
{ "CharConv", CURL_VERSION_CONV },
{ "Debug", CURL_VERSION_DEBUG },
{ "GSS-Negotiate", CURL_VERSION_GSSNEGOTIATE },
{ "IDN", CURL_VERSION_IDN },
{ "IPv6", CURL_VERSION_IPV6 },
{ "krb4", CURL_VERSION_KERBEROS4 },
{ "Largefile", CURL_VERSION_LARGEFILE },
{ "libz", CURL_VERSION_LIBZ },
{ "NTLM", CURL_VERSION_NTLM },
{ "NTLMWB", CURL_VERSION_NTLM_WB },
{ "SPNEGO", CURL_VERSION_SPNEGO },
{ "SSL", CURL_VERSION_SSL },
{ "SSPI", CURL_VERSION_SSPI },
{ "TLS-SRP", CURL_VERSION_TLSAUTH_SRP },
{ "HTTP2", CURL_VERSION_HTTP2 },
{ "GSSAPI", CURL_VERSION_GSSAPI },
{ "KERBEROS5", CURL_VERSION_KERBEROS5 },
{ "UNIX_SOCKETS", CURL_VERSION_UNIX_SOCKETS },
{ "PSL", CURL_VERSION_PSL },
{ "HTTPS_PROXY", CURL_VERSION_HTTPS_PROXY },
{ "MULTI_SSL", CURL_VERSION_MULTI_SSL },
{ "BROTLI", CURL_VERSION_BROTLI },
#if LIBCURL_VERSION_NUM >= 0x074001 /* Available since 7.64.1 */
{ "ALTSVC", CURL_VERSION_ALTSVC },
#endif
#if LIBCURL_VERSION_NUM >= 0x074200 /* Available since 7.66.0 */
{ "HTTP3", CURL_VERSION_HTTP3 },
#endif
#if LIBCURL_VERSION_NUM >= 0x074800 /* Available since 7.72.0 */
{ "UNICODE", CURL_VERSION_UNICODE },
{ "ZSTD", CURL_VERSION_ZSTD },
#endif
#if LIBCURL_VERSION_NUM >= 0x074a00 /* Available since 7.74.0 */
{ "HSTS", CURL_VERSION_HSTS },
#endif
#if LIBCURL_VERSION_NUM >= 0x074c00 /* Available since 7.76.0 */
{ "GSASL", CURL_VERSION_GSASL },
#endif
};
/* {{{ PHP_INI_BEGIN */
PHP_INI_BEGIN()
PHP_INI_ENTRY("curl.cainfo", "", PHP_INI_SYSTEM, NULL)
@@ -242,64 +290,12 @@ PHP_MINFO_FUNCTION(curl)
snprintf(str, sizeof(str), "%d", d->age);
php_info_print_table_row(2, "Age", str);
/* To update on each new cURL release using src/main.c in cURL sources */
/* make sure to sync this list with curl_version as well */
if (d->features) {
struct feat {
const char *name;
int bitmask;
};
unsigned int i;
static const struct feat feats[] = {
{"AsynchDNS", CURL_VERSION_ASYNCHDNS},
{"CharConv", CURL_VERSION_CONV},
{"Debug", CURL_VERSION_DEBUG},
{"GSS-Negotiate", CURL_VERSION_GSSNEGOTIATE},
{"IDN", CURL_VERSION_IDN},
{"IPv6", CURL_VERSION_IPV6},
{"krb4", CURL_VERSION_KERBEROS4},
{"Largefile", CURL_VERSION_LARGEFILE},
{"libz", CURL_VERSION_LIBZ},
{"NTLM", CURL_VERSION_NTLM},
{"NTLMWB", CURL_VERSION_NTLM_WB},
{"SPNEGO", CURL_VERSION_SPNEGO},
{"SSL", CURL_VERSION_SSL},
{"SSPI", CURL_VERSION_SSPI},
{"TLS-SRP", CURL_VERSION_TLSAUTH_SRP},
{"HTTP2", CURL_VERSION_HTTP2},
{"GSSAPI", CURL_VERSION_GSSAPI},
{"KERBEROS5", CURL_VERSION_KERBEROS5},
{"UNIX_SOCKETS", CURL_VERSION_UNIX_SOCKETS},
{"PSL", CURL_VERSION_PSL},
{"HTTPS_PROXY", CURL_VERSION_HTTPS_PROXY},
{"MULTI_SSL", CURL_VERSION_MULTI_SSL},
{"BROTLI", CURL_VERSION_BROTLI},
#if LIBCURL_VERSION_NUM >= 0x074001 /* Available since 7.64.1 */
{"ALTSVC", CURL_VERSION_ALTSVC},
#endif
#if LIBCURL_VERSION_NUM >= 0x074200 /* Available since 7.66.0 */
{"HTTP3", CURL_VERSION_HTTP3},
#endif
#if LIBCURL_VERSION_NUM >= 0x074800 /* Available since 7.72.0 */
{"UNICODE", CURL_VERSION_UNICODE},
{"ZSTD", CURL_VERSION_ZSTD},
#endif
#if LIBCURL_VERSION_NUM >= 0x074a00 /* Available since 7.74.0 */
{"HSTS", CURL_VERSION_HSTS},
#endif
#if LIBCURL_VERSION_NUM >= 0x074c00 /* Available since 7.76.0 */
{"GSASL", CURL_VERSION_GSASL},
#endif
{NULL, 0}
};
php_info_print_table_row(1, "Features");
for(i=0; i<sizeof(feats)/sizeof(feats[0]); i++) {
if (feats[i].name) {
php_info_print_table_row(2, feats[i].name, d->features & feats[i].bitmask ? "Yes" : "No");
}
for (i = 0; i < sizeof(php_curl_features) / sizeof(php_curl_features[0]); i++) {
php_info_print_table_row(2, php_curl_features[i].name, d->features & php_curl_features[i].bitmask ? "Yes" : "No");
}
}
@@ -970,62 +966,12 @@ PHP_FUNCTION(curl_version)
CAAL("features", d->features);
/* Add an array of features */
{
struct feat {
const char *name;
int bitmask;
};
unsigned int i;
zval feature_list;
array_init(&feature_list);
/* Sync this list with PHP_MINFO_FUNCTION(curl) as well */
static const struct feat feats[] = {
{"AsynchDNS", CURL_VERSION_ASYNCHDNS},
{"CharConv", CURL_VERSION_CONV},
{"Debug", CURL_VERSION_DEBUG},
{"GSS-Negotiate", CURL_VERSION_GSSNEGOTIATE},
{"IDN", CURL_VERSION_IDN},
{"IPv6", CURL_VERSION_IPV6},
{"krb4", CURL_VERSION_KERBEROS4},
{"Largefile", CURL_VERSION_LARGEFILE},
{"libz", CURL_VERSION_LIBZ},
{"NTLM", CURL_VERSION_NTLM},
{"NTLMWB", CURL_VERSION_NTLM_WB},
{"SPNEGO", CURL_VERSION_SPNEGO},
{"SSL", CURL_VERSION_SSL},
{"SSPI", CURL_VERSION_SSPI},
{"TLS-SRP", CURL_VERSION_TLSAUTH_SRP},
{"HTTP2", CURL_VERSION_HTTP2},
{"GSSAPI", CURL_VERSION_GSSAPI},
{"KERBEROS5", CURL_VERSION_KERBEROS5},
{"UNIX_SOCKETS", CURL_VERSION_UNIX_SOCKETS},
{"PSL", CURL_VERSION_PSL},
{"HTTPS_PROXY", CURL_VERSION_HTTPS_PROXY},
{"MULTI_SSL", CURL_VERSION_MULTI_SSL},
{"BROTLI", CURL_VERSION_BROTLI},
#if LIBCURL_VERSION_NUM >= 0x074001 /* Available since 7.64.1 */
{"ALTSVC", CURL_VERSION_ALTSVC},
#endif
#if LIBCURL_VERSION_NUM >= 0x074200 /* Available since 7.66.0 */
{"HTTP3", CURL_VERSION_HTTP3},
#endif
#if LIBCURL_VERSION_NUM >= 0x074800 /* Available since 7.72.0 */
{"UNICODE", CURL_VERSION_UNICODE},
{"ZSTD", CURL_VERSION_ZSTD},
#endif
#if LIBCURL_VERSION_NUM >= 0x074a00 /* Available since 7.74.0 */
{"HSTS", CURL_VERSION_HSTS},
#endif
#if LIBCURL_VERSION_NUM >= 0x074c00 /* Available since 7.76.0 */
{"GSASL", CURL_VERSION_GSASL},
#endif
};
for(i = 0; i < sizeof(feats) / sizeof(feats[0]); i++) {
if (feats[i].name) {
add_assoc_bool(&feature_list, feats[i].name, d->features & feats[i].bitmask ? true : false);
}
array_init_size(&feature_list, sizeof(php_curl_features) / sizeof(php_curl_features[0]));
for (i = 0; i < sizeof(php_curl_features) / sizeof(php_curl_features[0]); i++) {
add_assoc_bool(&feature_list, php_curl_features[i].name, d->features & php_curl_features[i].bitmask ? true : false);
}
CAAZ("feature_list", &feature_list);