From: Zeev Suraski <zeev@php.net>
Date: Tue, 13 Nov 2001 11:47:52 +0000 (+0000)
Subject: Improve OpenSSL compatibility
X-Git-Tag: ChangeLog~331
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b40f3c2315bbd6164a3e8459f59b1f8df3babd3;p=php

Improve OpenSSL compatibility
---

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;
 	}