diff options
| author | Anatol Belski <ab@php.net> | 2015-02-22 16:26:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-22 16:26:02 +0100 |
| commit | 68afd75ecdd764d75217d7c6362a736588cb7ca4 (patch) | |
| tree | 749342488ace97598a30cae151b8d4b6c912733b | |
| parent | 6751f8b314e60193534f7d8c1c1d32660a27efc8 (diff) | |
| parent | 7988f703f8a0f2bf1edc20001dc2dd3d08a92e3e (diff) | |
| download | php-git-68afd75ecdd764d75217d7c6362a736588cb7ca4.tar.gz | |
Merge branch 'pull-request/1112' into PHP-5.5
| -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 079eaa16c7..56cc51c453 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1240,7 +1240,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; } |