bjori Sat Aug 26 14:15:07 2006 UTC
Added files: (Branch: PHP_4_4)
/php-src/ext/standard/tests/aggregation bug37812.phpt
Modified files:
/php-src/ext/standard aggregation.c
/php-src NEWS
Log:
Fixed bug #37812 aggregate_methods_by_list fails to take certain methods
Add test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/aggregation.c?r1=1.11.4.7.4.1&r2=1.11.4.7.4.2&diff_format=u
Index: php-src/ext/standard/aggregation.c
diff -u php-src/ext/standard/aggregation.c:1.11.4.7.4.1
php-src/ext/standard/aggregation.c:1.11.4.7.4.2
--- php-src/ext/standard/aggregation.c:1.11.4.7.4.1 Sun Jan 1 13:46:57 2006
+++ php-src/ext/standard/aggregation.c Sat Aug 26 14:15:06 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: aggregation.c,v 1.11.4.7.4.1 2006/01/01 13:46:57 sniper Exp $ */
+/* $Id: aggregation.c,v 1.11.4.7.4.2 2006/08/26 14:15:06 bjori Exp $ */
#include "php.h"
#include "basic_functions.h"
@@ -146,7 +146,7 @@
*/
zend_hash_internal_pointer_reset(Z_ARRVAL_P(list_hash));
while (zend_hash_get_current_key_ex(Z_ARRVAL_P(list_hash),
&func_name, &func_name_len, &num_key, 0, NULL) == HASH_KEY_IS_STRING) {
- if (!strncmp(func_name, from_ce->name,
MIN(func_name_len-1, from_ce->name_length)) ||
+ if (!strncmp(func_name, from_ce->name,
MAX(func_name_len-1, from_ce->name_length)) ||
func_name[0] == '_' ||
zend_hash_find(&from_ce->function_table,
func_name, func_name_len, (void**)&function) == FAILURE) {
zend_hash_move_forward(Z_ARRVAL_P(list_hash));
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.159&r2=1.1247.2.920.2.160&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.159 php-src/NEWS:1.1247.2.920.2.160
--- php-src/NEWS:1.1247.2.920.2.159 Thu Aug 24 08:42:16 2006
+++ php-src/NEWS Sat Aug 26 14:15:07 2006
@@ -5,6 +5,8 @@
stream wrappers). (Tony)
- Fixed bug #38378 (wddx_serialize_value() generates no wellformed xml).
(sj at sjaensch dot org, grzegorz dot nosek at netart dot pl, Tony).
+- Fixed bug #37812 (aggregate_methods_by_list fails to take certain methods).
+ (Hannes)
17 Aug 2006, Version 4.4.4
- Fixed memory_limit on 64bit systems. (Stefan E.)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/aggregation/bug37812.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/aggregation/bug37812.phpt
+++ php-src/ext/standard/tests/aggregation/bug37812.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
