diff options
| author | Anatol Belski <ab@php.net> | 2015-02-22 16:27:27 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-22 16:27:27 +0100 |
| commit | a31f4ef884fc5f30b6f7e7785698f6447d840e5b (patch) | |
| tree | d079db27c98a77e96b669740918e9904ebaa25b3 /ext/curl/interface.c | |
| parent | 078340b5636bab2de10a8013caca90292c24be2f (diff) | |
| parent | e656932d0e6b1378f1a5a1181d4ddf79ed651d6b (diff) | |
| download | php-git-a31f4ef884fc5f30b6f7e7785698f6447d840e5b.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix Win32 SSPI initialization for digest authentication in cURL
Diffstat (limited to 'ext/curl/interface.c')
| -rw-r--r-- | ext/curl/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index f7f6a5ed5f..4354dcdb2f 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1239,7 +1239,7 @@ PHP_MINIT_FUNCTION(curl) gcry_control(GCRYCTL_SET_THREAD_CBS, &php_curl_gnutls_tsl); #endif - if (curl_global_init(CURL_GLOBAL_SSL) != CURLE_OK) { + if (curl_global_init(CURL_GLOBAL_DEFAULT) != CURLE_OK) { return FAILURE; } |