cvs: php4 /ext/curl curl.c

zeev Tue Nov 13 06:47:52 2001 EDT Modified files: /php4/ext/curl curl.c Log: Improve OpenSSL compatibility Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.96 php4/ext/curl/curl.c:1.97 --- php4/ext/curl/curl.c:1.96 Tue Nov 13 05:59:15 2001 +++ php4/ext/curl/curl.c Tue Nov 13 06:47:52 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.96 2001/11/13 10:59:15 sterling Exp $ */ +/* $Id: curl.c,v 1.97 2001/11/13 11:47:52 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -103,6 +103,8 @@ */ 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 @@ 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; }