cvs: php4 /ext/curl curl.c

sterling Sun Jan 27 01:11:50 2002 EDT Modified files: /php4/ext/curl curl.c Log: hopefully fix --with-openssl issues Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.104 php4/ext/curl/curl.c:1.105 --- php4/ext/curl/curl.c:1.104 Tue Jan 22 12:06:16 2002 +++ php4/ext/curl/curl.c Sun Jan 27 01:11:50 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.104 2002/01/22 17:06:16 sterling Exp $ */ +/* $Id: curl.c,v 1.105 2002/01/27 06:11:50 sterling Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -103,8 +103,6 @@ */ 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 @@ 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; }