[PHP-CVS] svn: /SVNROOT/ header.ezt
philip Mon, 05 Apr 2010 04:35:00 + Revision: http://svn.php.net/viewvc?view=revision&revision=297493 Log: Updated look of the header navbar. And added docs, while removing pear-core. Changed paths: U SVNROOT/header.ezt Modified: SVNROOT/header.ezt === --- SVNROOT/header.ezt 2010-04-05 01:15:19 UTC (rev 297492) +++ SVNROOT/header.ezt 2010-04-05 04:35:00 UTC (rev 297493) @@ -28,12 +28,18 @@ [if-any roots_href]/[else]/[end][if-any nav_path][for nav_path][if-any nav_path.href][end][if-index nav_path first][[][nav_path.name]][else][nav_path.name][end][if-any nav_path.href][end][if-index nav_path last][else]/[end][end][end] -Main trees: PHP 5.2 | -PHP 5.3 | -PHP Trunk | -pecl | -pear | -pear-core +Common trees: + +PHP Sources +( + 5.2 | + 5.3 | + Trunk +) | + PECL | + PEAR | + PHP Docs + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/Zend/tests/ns_063.phpt branches/PHP_5_3/Zend/zend_compile.c trunk/Zend/tests/ns_063.phpt trunk/Zend/zend_compile.c
stas Sun, 04 Apr 2010 23:28:20 +
Revision: http://svn.php.net/viewvc?view=revision&revision=297482
Log:
change namespaced ctors - only __construct would work
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/Zend/tests/ns_063.phpt
U php/php-src/branches/PHP_5_3/Zend/zend_compile.c
U php/php-src/trunk/Zend/tests/ns_063.phpt
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-04-04 22:10:06 UTC (rev 297481)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-04-04 23:28:20 UTC (rev 297482)
@@ -8,6 +8,9 @@
mcrypt_filter). (Stas)
- Added full_special_chars filter to ext/filter (Rasmus)
+- Changed namespaced classes so that the ctor can only be named
+ __construct now. (Stas)
+
- Fixed a NULL pointer dereference when processing invalid XML-RPC
requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
Modified: php/php-src/branches/PHP_5_3/Zend/tests/ns_063.phpt
===
--- php/php-src/branches/PHP_5_3/Zend/tests/ns_063.phpt 2010-04-04 22:10:06 UTC
(rev 297481)
+++ php/php-src/branches/PHP_5_3/Zend/tests/ns_063.phpt 2010-04-04 23:28:20 UTC
(rev 297482)
@@ -1,5 +1,5 @@
--TEST--
-063: Support for old-style constructors in namesapces
+063: Old-style constructors in namesapces (not supported!)
--FILE--
name, '\\',
CG(active_class_entry)->name_length))) {
- short_class_name_length =
CG(active_class_entry)->name_length - (short_class_name -
CG(active_class_entry)->name) - 1;
- ++short_class_name;
- } else {
- short_class_name = CG(active_class_entry)->name;
- short_class_name_length =
CG(active_class_entry)->name_length;
- }
- short_class_lcname = do_alloca(short_class_name_length
+ 1, use_heap);
- zend_str_tolower_copy(short_class_lcname,
short_class_name, short_class_name_length);
+ char *class_lcname;
+
+ class_lcname =
do_alloca(CG(active_class_entry)->name_length + 1, use_heap);
+ zend_str_tolower_copy(class_lcname,
CG(active_class_entry)->name, CG(active_class_entry)->name_length);
/* Improve after RC: cache the lowercase class name */
- if ((short_class_name_length == name_len) &&
(!memcmp(short_class_lcname, lcname, name_len))) {
+ if ((CG(active_class_entry)->name_length == name_len)
&& (!memcmp(class_lcname, lcname, name_len))) {
if (CG(active_class_entry)->constructor) {
zend_error(E_STRICT, "Redefining
already defined constructor for class %s", CG(active_class_entry)->name);
} else {
@@ -1338,7 +1329,7 @@
} else if (!(fn_flags & ZEND_ACC_STATIC)) {
CG(active_op_array)->fn_flags |=
ZEND_ACC_ALLOW_STATIC;
}
- free_alloca(short_class_lcname, use_heap);
+ free_alloca(class_lcname, use_heap);
}
efree(lcname);
Modified: php/php-src/trunk/Zend/tests/ns_063.phpt
===
--- php/php-src/trunk/Zend/tests/ns_063.phpt2010-04-04 22:10:06 UTC (rev
297481)
+++ php/php-src/trunk/Zend/tests/ns_063.phpt2010-04-04 23:28:20 UTC (rev
297482)
@@ -1,5 +1,5 @@
--TEST--
-063: Support for old-style constructors in namesapces
+063: Old-style constructors in namesapces (not supported!)
--FILE--
name, '\\',
CG(active_class_entry)->name_length))) {
- short_class_name_length =
CG(active_class_entry)->name_length - (short_class_name -
CG(active_class_entry)->name) - 1;
- ++short_class_name;
- } else {
- short_class_name = CG(active_class_entry)->name;
- short_class_name_length =
CG(active_class_entry)->name_length;
- }
- short_class_lcname = do_alloca(short_class_name_length
+ 1, use_heap);
- zend_str_tolower_copy(short_class_lcname,
short_class_name, short_class_name_length);
+ char *class_lcname;
+
+ class_lcname =
do_alloca(CG(active_class_entry)->name_length + 1, use_heap);
+ zend_str_tolower_copy(class_lcname,
CG(active_class_entry)->name, CG(active_class_entry)->name_length);
/* Improve after RC: cache the lowercase class name */
-
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/ var_dump_64bit.phpt
felipe Sun, 04 Apr 2010 17:39:26 +
Revision: http://svn.php.net/viewvc?view=revision&revision=297463
Log:
- Fixed test
Changed paths:
U
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt
Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt
===
--- php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt 2010-04-04 17:37:02 UTC (rev 297462)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/var_dump_64bit.phpt 2010-04-04 17:39:26 UTC (rev 297463)
@@ -574,7 +574,7 @@
*** Testing var_dump() on object variables ***
-- Iteration 1 --
-object(object_class)#6 (7) {
+object(object_class)#%d (7) {
["value"]=>
int(50)
["public_var1"]=>
@@ -591,14 +591,14 @@
int(11)
}
-- Iteration 2 --
-object(no_member_class)#7 (0) {
+object(no_member_class)#%d (0) {
}
-- Iteration 3 --
-object(contains_object_class)#8 (7) {
+object(contains_object_class)#%d (7) {
["p"]=>
int(30)
["class_object1"]=>
- object(object_class)#9 (7) {
+ object(object_class)#%d (7) {
["value"]=>
int(50)
["public_var1"]=>
@@ -615,7 +615,7 @@
int(11)
}
["class_object2"]=>
- object(object_class)#10 (7) {
+ object(object_class)#%d (7) {
["value"]=>
int(50)
["public_var1"]=>
@@ -632,7 +632,7 @@
int(11)
}
["class_object3:private"]=>
- object(object_class)#9 (7) {
+ object(object_class)#%d (7) {
["value"]=>
int(50)
["public_var1"]=>
@@ -649,7 +649,7 @@
int(11)
}
["class_object4:protected"]=>
- object(object_class)#10 (7) {
+ object(object_class)#%d (7) {
["value"]=>
int(50)
["public_var1"]=>
@@ -666,93 +666,17 @@
int(11)
}
["no_member_class_object"]=>
- object(no_member_class)#11 (0) {
+ object(no_member_class)#%d (0) {
}
["class_object5"]=>
- object(contains_object_class)#8 (7) {
-["p"]=>
-int(30)
-["class_object1"]=>
-object(object_class)#9 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1:private"]=>
- int(20)
- ["private_var2:private"]=>
- int(21)
- ["protected_var1:protected"]=>
- string(8) "string_1"
- ["protected_var2:protected"]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object2"]=>
-object(object_class)#10 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1:private"]=>
- int(20)
- ["private_var2:private"]=>
- int(21)
- ["protected_var1:protected"]=>
- string(8) "string_1"
- ["protected_var2:protected"]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object3:private"]=>
-object(object_class)#9 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1:private"]=>
- int(20)
- ["private_var2:private"]=>
- int(21)
- ["protected_var1:protected"]=>
- string(8) "string_1"
- ["protected_var2:protected"]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object4:protected"]=>
-object(object_class)#10 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1:private"]=>
- int(20)
- ["private_var2:private"]=>
- int(21)
- ["protected_var1:protected"]=>
- string(8) "string_1"
- ["protected_var2:protected"]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["no_member_class_object"]=>
-object(no_member_class)#11 (0) {
-}
-["class_object5"]=>
-*RECURSION*
- }
+ *RECURSION*
}
-- Iteration 4 --
-object(contains_object_class)#1 (7) {
+object(contains_object_class)#%d (7) {
["p"]=>
int(30)
["class_object1"]=>
- object(object_class)#2 (7) {
+ object(object_class)#%d (7) {
["value"]=>
int(50)
["public_var1"]=>
@@ -769,7 +693,7 @@
int(11)
}
["class_object2"]=>
- object(object_class)#3 (7) {
+ object(object_class)#%d (7) {
["value"]=>
int(50)
["public_var1"]=>
@@ -786,7 +710,7 @@
int(11)
}
["class_object3:private"]=>
- object(object_class)#2 (7) {
+ object(object_class)#%d (7) {
["value"]=>
int(50)
["public_var1"]=>
@@ -803,7 +727,7 @@
int(11)
}
["class_object4:protected"]=>
- object(object_class)#3 (7) {
+ object(object_class)#%d (7) {
["value"]=>
int(50)
["public_var1"]=>
@@ -820,89 +744,13 @@
int(11)
}
["no_member_class_object"]=>
- object(no_member_class)#4 (0) {
+ object(no_member_class)#%d (0) {
}
["class_object5"]=>
- object(contains_object_class)#1 (7) {
-["p"]=>
-int(30)
-["class_object1"]=>
-object(object_class)#2 (7) {
- ["value"
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/tests/general_functions/ var_dump_64bit.phpt
felipe Sun, 04 Apr 2010 16:59:20 +
Revision: http://svn.php.net/viewvc?view=revision&revision=297458
Log:
- Fix test
Changed paths:
U
php/php-src/trunk/ext/standard/tests/general_functions/var_dump_64bit.phpt
Modified: php/php-src/trunk/ext/standard/tests/general_functions/var_dump_64bit.phpt
===
--- php/php-src/trunk/ext/standard/tests/general_functions/var_dump_64bit.phpt 2010-04-04 16:57:44 UTC (rev 297457)
+++ php/php-src/trunk/ext/standard/tests/general_functions/var_dump_64bit.phpt 2010-04-04 16:59:20 UTC (rev 297458)
@@ -669,83 +669,7 @@
object(no_member_class)#11 (0) {
}
["class_object5"]=>
- object(contains_object_class)#8 (7) {
-["p"]=>
-int(30)
-["class_object1"]=>
-object(object_class)#9 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object2"]=>
-object(object_class)#10 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object3":"contains_object_class":private]=>
-object(object_class)#9 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object4":protected]=>
-object(object_class)#10 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["no_member_class_object"]=>
-object(no_member_class)#11 (0) {
-}
-["class_object5"]=>
-*RECURSION*
- }
+ *RECURSION*
}
-- Iteration 4 --
object(contains_object_class)#1 (7) {
@@ -823,83 +747,7 @@
object(no_member_class)#4 (0) {
}
["class_object5"]=>
- object(contains_object_class)#1 (7) {
-["p"]=>
-int(30)
-["class_object1"]=>
-object(object_class)#2 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object2"]=>
-object(object_class)#3 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object3":"contains_object_class":private]=>
-object(object_class)#2 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object4":protected]=>
-object(object_class)#3 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["no_member_class_object"]=>
-object(no_member_class)#4 (0) {
-}
-["class_object5"]=>
-*RECURSION*
- }
+ *RECURSION*
}
-- Iteration 5 --
object(object_class)#2 (7) {
@@ -991,41 +839,7 @@
["public_var2"]=>
int(
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/ var_dump_64bit.phpt
felipe Sun, 04 Apr 2010 16:57:44 +
Revision: http://svn.php.net/viewvc?view=revision&revision=297457
Log:
- Fix test
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/var_dump_64bit.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/var_dump_64bit.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/var_dump_64bit.phpt 2010-04-04 16:57:14 UTC (rev 297456)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/var_dump_64bit.phpt 2010-04-04 16:57:44 UTC (rev 297457)
@@ -669,83 +669,7 @@
object(no_member_class)#11 (0) {
}
["class_object5"]=>
- object(contains_object_class)#8 (7) {
-["p"]=>
-int(30)
-["class_object1"]=>
-object(object_class)#9 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object2"]=>
-object(object_class)#10 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object3":"contains_object_class":private]=>
-object(object_class)#9 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object4":protected]=>
-object(object_class)#10 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["no_member_class_object"]=>
-object(no_member_class)#11 (0) {
-}
-["class_object5"]=>
-*RECURSION*
- }
+ *RECURSION*
}
-- Iteration 4 --
object(contains_object_class)#1 (7) {
@@ -823,83 +747,7 @@
object(no_member_class)#4 (0) {
}
["class_object5"]=>
- object(contains_object_class)#1 (7) {
-["p"]=>
-int(30)
-["class_object1"]=>
-object(object_class)#2 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object2"]=>
-object(object_class)#3 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object3":"contains_object_class":private]=>
-object(object_class)#2 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["class_object4":protected]=>
-object(object_class)#3 (7) {
- ["value"]=>
- int(50)
- ["public_var1"]=>
- int(10)
- ["private_var1":"object_class":private]=>
- int(20)
- ["private_var2":"object_class":private]=>
- int(21)
- ["protected_var1":protected]=>
- string(8) "string_1"
- ["protected_var2":protected]=>
- string(8) "string_2"
- ["public_var2"]=>
- int(11)
-}
-["no_member_class_object"]=>
-object(no_member_class)#4 (0) {
-}
-["class_object5"]=>
-*RECURSION*
- }
+ *RECURSION*
}
-- Iteration 5 --
object(object_class)#2 (7) {
@@ -991,4
