diff options
| author | Anatol Belski <ab@php.net> | 2014-10-17 10:13:08 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-17 10:13:08 +0200 |
| commit | 2942a4aa451452c354b2eb2e14f583978388a61a (patch) | |
| tree | 4afe9f92c6e54a0349417cf6dce9171d9a8535d5 /ext/curl/interface.c | |
| parent | aac7b1db7c9df59ffb0860de7692c653719cf4d0 (diff) | |
| parent | 1f6bd981433cdfc90238a95aa7339d72e7f2bc01 (diff) | |
| download | php-git-2942a4aa451452c354b2eb2e14f583978388a61a.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
check for zlib headers as well as lib for mysqlnd
a realpath cache key can be int or float, catching this
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
Micro optimizations for isset/empty
Micro optimization for zend_hash_next_index_insert_new()
Fix array_keys() on $GLOBALS
Fix procedural finfo calls in methods
Conflicts:
ext/mysqlnd/config.w32
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 affcd02d39..af1ccdd4cf 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1201,6 +1201,12 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLSSLOPT_ALLOW_BEAST); #endif +#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */ + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_0); + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_1); + REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_2); +#endif + #if CURLOPT_FTPASCII != 0 REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII); #endif |