mike Tue Dec 19 21:41:25 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
Log:
MFH: check CRYPTO_get_id_callback() if anyone else already set thread lock
callbacks
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.15&r2=1.62.2.14.2.16&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.15
php-src/ext/curl/interface.c:1.62.2.14.2.16
--- php-src/ext/curl/interface.c:1.62.2.14.2.15 Tue Nov 21 15:53:23 2006
+++ php-src/ext/curl/interface.c Tue Dec 19 21:41:25 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.15 2006/11/21 15:53:23 iliaa Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.16 2006/12/19 21:41:25 mike Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -614,7 +614,7 @@
#endif
#ifdef PHP_CURL_NEED_OPENSSL_TSL
- {
+ if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T));
@@ -667,16 +667,11 @@
php_unregister_url_stream_wrapper("ftp" TSRMLS_CC);
php_unregister_url_stream_wrapper("ldap" TSRMLS_CC);
#endif
-#ifdef PHP_CURL_NEED_OPENSSL_TSL
- /* ensure there are valid callbacks set */
- CRYPTO_set_id_callback(php_curl_ssl_id);
- CRYPTO_set_locking_callback(php_curl_ssl_lock);
-#endif
curl_global_cleanup();
#ifdef PHP_CURL_NEED_OPENSSL_TSL
if (php_curl_openssl_tsl) {
int i, c = CRYPTO_num_locks();
-
+
CRYPTO_set_id_callback(NULL);
CRYPTO_set_locking_callback(NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
