iliaa Thu Jul 31 22:17:32 2003 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/aggregation bug24871.phpt
Modified files:
/php-src/ext/standard aggregation.c
/php-src NEWS
Log:
Fixed bug #24871 (methods misidentified as constructors)
Index: php-src/ext/standard/aggregation.c
diff -u php-src/ext/standard/aggregation.c:1.11.4.6
php-src/ext/standard/aggregation.c:1.11.4.7
--- php-src/ext/standard/aggregation.c:1.11.4.6 Wed Jul 9 19:16:21 2003
+++ php-src/ext/standard/aggregation.c Thu Jul 31 22:17:31 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: aggregation.c,v 1.11.4.6 2003/07/09 23:16:21 sniper Exp $ */
+/* $Id: aggregation.c,v 1.11.4.7 2003/08/01 02:17:31 iliaa Exp $ */
#include "php.h"
#include "basic_functions.h"
@@ -114,7 +114,7 @@
/* We do not aggregate:
* 1. constructors */
- 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)) ||
/* 2. private methods (heh, like we really have them) */
func_name[0] == '_' ||
/* 3. explicitly excluded methods */
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.316 php-src/NEWS:1.1247.2.317
--- php-src/NEWS:1.1247.2.316 Thu Jul 31 19:00:21 2003
+++ php-src/NEWS Thu Jul 31 22:17:31 2003
@@ -4,6 +4,7 @@
- Fixed bug #22154 (Possible crash when memory_limit is reached and
output buffering in addition to session.use_trans_sid is used). (Ilia)
- Fixed bug #24883 (variables_order and gpc_order being ignored). (Ilia)
+- Fixed bug #24871 (methods misidentified as constructors). (Ilia)
30 Jul 2003, Version 4.3.3RC2
- Improved the NSAPI SAPI module (Uwe Schindler)
Index: php-src/ext/standard/tests/aggregation/bug24871.phpt
+++ php-src/ext/standard/tests/aggregation/bug24871.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
