From: Sterling Hughes <sterling@php.net>
Date: Sun, 27 Jan 2002 06:11:50 +0000 (+0000)
Subject: hopefully fix --with-openssl issues
X-Git-Tag: PRE_ISSET_PATCH~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=094873c6d2ef138bdd6ab6742f2db2842941ce0f;p=php

hopefully fix --with-openssl issues
---

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index 92d0f037ac..41f71b0a3a 100644
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -103,8 +103,6 @@ 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() */
@@ -255,14 +253,8 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
 	REGISTER_CURL_CONSTANT(CURLE_OBSOLETE);
 	REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE);
-	
-#if HAVE_OPENSSL_EXT    /* OpenSSL already takes care of initialization */
-	startup_options = CURL_GLOBAL_NOTHING;
-#else
-	startup_options = CURL_GLOBAL_SSL;
-#endif
 
-	if (curl_global_init(startup_options) != CURLE_OK) {
+	if (curl_global_init(CURL_GLOBAL_SSL) != CURLE_OK) {
 		return FAILURE;
 	}