From c34ba188cc7cac052a9776c75762c48287b2f552 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Fri, 12 Jun 2009 20:50:58 +0000 Subject: [PATCH] - MFH: Fixed bug #48514 (cURL extension uses same resource name for simple and multi APIs) --- NEWS | 2 ++ ext/curl/interface.c | 2 +- ext/curl/tests/bug48514.phpt | 27 +++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 ext/curl/tests/bug48514.phpt diff --git a/NEWS b/NEWS index 3125efe75d..9fe3e5323c 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Jun 2009, PHP 5.2.10 +- Fixed bug #48514 (cURL extension uses same resource name for simple and + multi APIs). (Felipe) 11 Jun 2009, PHP 5.2.10RC2 - Updated timezone database to version 2009.9 (2009i) (Derick) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 4fcba360f6..aaac9a6697 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -367,7 +367,7 @@ PHP_MINFO_FUNCTION(curl) PHP_MINIT_FUNCTION(curl) { le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number); - le_curl_multi_handle = zend_register_list_destructors_ex(_php_curl_multi_close, NULL, "curl", module_number); + le_curl_multi_handle = zend_register_list_destructors_ex(_php_curl_multi_close, NULL, "curl_multi", module_number); /* See http://curl.haxx.se/lxr/source/docs/libcurl/symbols-in-versions or curl src/docs/libcurl/symbols-in-versions for a (almost) complete list diff --git a/ext/curl/tests/bug48514.phpt b/ext/curl/tests/bug48514.phpt new file mode 100644 index 0000000000..0ea25754f1 --- /dev/null +++ b/ext/curl/tests/bug48514.phpt @@ -0,0 +1,27 @@ +--TEST-- +Bug #48514 (cURL extension uses same resource name for simple and multi APIs) +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +resource(%d) of type (curl) +%string|unicode%(4) "curl" +resource(%d) of type (curl_multi) +%string|unicode%(10) "curl_multi" -- 2.40.0