cvs: php4(PHP_4_0_7) /ext/curl curl.c

zeev Tue Nov 13 06:46:34 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/ext/curl curl.c Log: Improve OpenSSL compatibility Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.79.2.2 php4/ext/curl/curl.c:1.79.2.3 --- php4/ext/curl/curl.c:1.79.2.2 Mon Nov 12 20:15:51 2001 +++ php4/ext/curl/curl.c Tue Nov 13 06:46:33 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.79.2.2 2001/11/13 01:15:51 zeev Exp $ */ +/* $Id: curl.c,v 1.79.2.3 2001/11/13 11:46:33 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() */ @@ -245,7 +247,13 @@ REGISTER_CURL_CONSTANT("CURLE_TELNET_OPTION_SYNTAX", CURLE_TELNET_OPTION_SYNTAX); REGISTER_CURL_CONSTANT("CURLE_ALREADY_COMPLETE", CURLE_ALREADY_COMPLETE); - if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { +#if HAVE_OPENSSL_EXT /* OpenSSL already takes care of initialization */ + startup_options = CURL_GLOBAL_NONE; +#else + startup_options = CURL_GLOBAL_ALL; +#endif + + if (curl_global_init(startup_options) != CURLE_OK) { return FAILURE; } return SUCCESS;