felipe Fri Jun 12 20:50:58 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/curl/tests bug48514.phpt
Modified files:
/php-src NEWS
/php-src/ext/curl interface.c
Log:
- MFH: Fixed bug #48514 (cURL extension uses same resource name for simple
and multi APIs)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1554&r2=1.2027.2.547.2.1555&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1554 php-src/NEWS:1.2027.2.547.2.1555
--- php-src/NEWS:1.2027.2.547.2.1554 Thu Jun 11 12:13:54 2009
+++ php-src/NEWS Fri Jun 12 20:50:58 2009
@@ -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)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.55&r2=1.62.2.14.2.56&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.55
php-src/ext/curl/interface.c:1.62.2.14.2.56
--- php-src/ext/curl/interface.c:1.62.2.14.2.55 Thu Jun 11 09:49:57 2009
+++ php-src/ext/curl/interface.c Fri Jun 12 20:50:58 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.55 2009/06/11 09:49:57 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.56 2009/06/12 20:50:58 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -367,7 +367,7 @@
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
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48514.phpt?view=markup&rev=1.1
Index: php-src/ext/curl/tests/bug48514.phpt
+++ php-src/ext/curl/tests/bug48514.phpt
--TEST--
Bug #48514 (cURL extension uses same resource name for simple and multi APIs)
--FILE--
<?php
$ch1 = curl_init();
var_dump($ch1);
var_dump(get_resource_type($ch1));
$ch2 = curl_multi_init();
var_dump($ch2);
var_dump(get_resource_type($ch2));
?>
--EXPECTF--
resource(4) of type (curl)
%string|unicode%(4) "curl"
resource(5) of type (curl_multi)
%string|unicode%(10) "curl_multi"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
