From 8b40f3c2315bbd6164a3e8459f59b1f8df3babd3 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Tue, 13 Nov 2001 11:47:52 +0000 Subject: [PATCH] Improve OpenSSL compatibility --- ext/curl/curl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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; } -- 2.40.0