diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2014-10-16 21:28:49 -0700 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2014-10-16 21:28:49 -0700 |
| commit | 2a8f7f88246296c013e690ad16212d9a0fc50188 (patch) | |
| tree | 57a2a56542e4cc16f1599d8c5515230f5e9b9397 | |
| parent | a9d6556971a435f71eabf142d8fb814382f3b6ac (diff) | |
| parent | 560646662433d503a47075f4c2f8ee6760bd93fd (diff) | |
| download | php-git-2a8f7f88246296c013e690ad16212d9a0fc50188.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
| -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 |