diff options
| author | Zeev Suraski <zeev@php.net> | 2001-11-13 11:47:52 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-11-13 11:47:52 +0000 |
| commit | 8b40f3c2315bbd6164a3e8459f59b1f8df3babd3 (patch) | |
| tree | 8c77a43c9dd7c2d7cfc416154750ce128ba672a7 /ext/curl | |
| parent | a6d9db7dc1846157558bd7005bc61b5a4a50ab77 (diff) | |
| download | php-git-8b40f3c2315bbd6164a3e8459f59b1f8df3babd3.tar.gz | |
Improve OpenSSL compatibility
Diffstat (limited to 'ext/curl')
| -rw-r--r-- | ext/curl/curl.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ext/curl/curl.c b/ext/curl/curl.c index cf88a2c7ff..43dfebd5b8 100644 --- a/ext/curl/curl.c +++ b/ext/curl/curl.c @@ -103,6 +103,8 @@ PHP_MINFO_FUNCTION(curl) */ PHP_MINIT_FUNCTION(curl) { + int startup_options; + le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number); /* Constants for curl_setopt() */ @@ -254,7 +256,13 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLE_OBSOLETE); REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE); - if (curl_global_init(CURL_GLOBAL_NOTHING) != CURLE_OK) { +#if HAVE_OPENSSL_EXT /* OpenSSL already takes care of initialization */ + startup_options = CURL_GLOBAL_NOTHING; +#else + startup_options = CURL_GLOBAL_ALL; +#endif + + if (curl_global_init(startup_options) != CURLE_OK) { return FAILURE; } |