diff options
| author | Anatol Belski <ab@php.net> | 2016-04-16 19:25:13 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-04-16 19:25:13 +0200 |
| commit | e015faaf8f022f6338c0254ef2fd617f29c94c84 (patch) | |
| tree | 6d371db288bbce5bf89e4c3bee46d7bd131af16c /ext/curl/interface.c | |
| parent | 8c5861e6c650a2d6b8044151b2f71b6b6fcc024c (diff) | |
| parent | 02766d0180e901d4fc6dc7a06fb09867dec40c1e (diff) | |
| download | php-git-e015faaf8f022f6338c0254ef2fd617f29c94c84.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Adds new curl option CURLOPT_SSL_VERIFYSTATUS to enable OCSP verification
Add test for bug #72028
Diffstat (limited to 'ext/curl/interface.c')
| -rw-r--r-- | ext/curl/interface.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index ca899af843..fb280a46ea 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -719,6 +719,9 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLOPT_SSL_CIPHER_LIST); REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYHOST); REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYPEER); +#if LIBCURL_VERSION_NUM >= 0x072900 /* 7.41.0 */ + REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYSTATUS); +#endif REGISTER_CURL_CONSTANT(CURLOPT_STDERR); REGISTER_CURL_CONSTANT(CURLOPT_TELNETOPTIONS); REGISTER_CURL_CONSTANT(CURLOPT_TIMECONDITION); @@ -2066,6 +2069,9 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ case CURLOPT_RESUME_FROM: case CURLOPT_SSLVERSION: case CURLOPT_SSL_VERIFYPEER: +#if LIBCURL_VERSION_NUM >= 0x072900 /* 7.41.0 */ + case CURLOPT_SSL_VERIFYSTATUS: +#endif case CURLOPT_TIMECONDITION: case CURLOPT_TIMEOUT: case CURLOPT_TIMEVALUE: |