Skip to content

Fewer deprecation warnings for removed/no longer operational libcurl … #153

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
afflerbach wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fewer deprecation warnings for removed/no longer operational libcurl … #153

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
8 changes: 8 additions & 0 deletions src/php_http_client_curl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,15 +677,19 @@ static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info)
}
#endif
break;
#if !PHP_HTTP_CURL_VERSION(8,3,0)
case CURLSSLBACKEND_NSS:
backend = "nss";
break;
case CURLSSLBACKEND_GSKIT:
backend = "gskit";
break;
#endif
#if !PHP_HTTP_CURL_VERSION(7,69,0)
case CURLSSLBACKEND_POLARSSL:
backend = "polarssl";
break;
#endif
case CURLSSLBACKEND_CYASSL:
backend = "cyassl";
break;
Expand Down Expand Up @@ -1592,6 +1596,7 @@ static void php_http_curle_options_init(php_http_options_t *registry)
# endif
}
#endif
#if !PHP_HTTP_CURL_VERSION(7,84,0)
if ((opt = php_http_option_register(ssl_registry, ZEND_STRL("random_file"), CURLOPT_RANDOM_FILE, IS_STRING))) {
opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
Expand All @@ -1600,6 +1605,7 @@ static void php_http_curle_options_init(php_http_options_t *registry)
opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
}
#endif
if ((opt = php_http_option_register(ssl_registry, ZEND_STRL("issuercert"), CURLOPT_ISSUERCERT, IS_STRING))) {
opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
Expand All @@ -1615,9 +1621,11 @@ static void php_http_curle_options_init(php_http_options_t *registry)
ZVAL_FALSE(&opt->defval);
}
#endif
#if !PHP_HTTP_CURL_VERSION(7,86,0)
if ((opt = php_http_option_register(ssl_registry, ZEND_STRL("enable_npn"), CURLOPT_SSL_ENABLE_NPN, _IS_BOOL))) {
ZVAL_BOOL(&opt->defval, 1);
}
#endif
if ((opt = php_http_option_register(ssl_registry, ZEND_STRL("enable_alpn"), CURLOPT_SSL_ENABLE_ALPN, _IS_BOOL))) {
ZVAL_BOOL(&opt->defval, 1);
}
Expand Down
Loading