diff options
| author | Ondřej Surý <ondrej@sury.org> | 2014-11-18 20:30:43 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2014-11-18 20:30:43 +0100 |
| commit | f40f1ce174885cd0f526c003eca3fa523e0ef269 (patch) | |
| tree | ce22a7abe1212824c0be6bace0eb49de7249f9f9 /ext/curl | |
| parent | 1dc5de7731d1bc41002f9b58f798e93f393e6f08 (diff) | |
| download | php-upstream/5.6.3+dfsg.tar.gz | |
New upstream version 5.6.3+dfsgupstream/5.6.3+dfsg
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/interface.c | 6 | ||||
| -rw-r--r-- | ext/curl/tests/check_win_config.phpt | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 9bb767624..01926a23c 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1194,6 +1194,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 diff --git a/ext/curl/tests/check_win_config.phpt b/ext/curl/tests/check_win_config.phpt index 103f1cf69..d82fe6f41 100644 --- a/ext/curl/tests/check_win_config.phpt +++ b/ext/curl/tests/check_win_config.phpt @@ -28,7 +28,7 @@ Features AsynchDNS => Yes
CharConv => No
Debug => No
-GSS-Negotiate => Yes
+GSS-Negotiate => No
IDN => Yes
IPv6 => Yes
krb4 => No
|