dmitry Mon Oct 24 02:58:42 2005 EDT
Removed files: (Branch: PHP_5_1)
/php-src/ext/standard/tests/array bug34934.phpt
Modified files:
/php-src NEWS
/php-src/ext/standard array.c
Log:
Reverted patch for bug #34934. Bug is marked as bogus.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.155&r2=1.2027.2.156&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.155 php-src/NEWS:1.2027.2.156
--- php-src/NEWS:1.2027.2.155 Sun Oct 23 14:34:25 2005
+++ php-src/NEWS Mon Oct 24 02:58:39 2005
@@ -5,7 +5,6 @@
- Fixed bug #34957 (PHP doesn't respect ACLs for access checks). (Wez)
- Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and
leaks). (Tony)
-- Fixed bug #34934 (offsetExists is not called from array_key_exists). (Dmitry)
- Fixed bug #34905 (Digest authentication does not work with Apache 1). (Ilia)
- Fixed bug #34902 (mysqli::character_set_name() - undefined method). (Tony)
- Fixed bug #34893 (PHP5.1 overloading, Cannot access private property).
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.308.2.8&r2=1.308.2.9&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.8
php-src/ext/standard/array.c:1.308.2.9
--- php-src/ext/standard/array.c:1.308.2.8 Fri Oct 21 11:53:22 2005
+++ php-src/ext/standard/array.c Mon Oct 24 02:58:41 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.8 2005/10/21 15:53:22 tony2001 Exp $ */
+/* $Id: array.c,v 1.308.2.9 2005/10/24 06:58:41 dmitry Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -4390,17 +4390,6 @@
RETURN_FALSE;
}
- if (Z_TYPE_PP(array) == IS_OBJECT &&
- Z_OBJ_HT_PP(array)->has_dimension &&
- (Z_OBJ_HT_PP(array)->has_dimension !=
std_object_handlers.has_dimension ||
- instanceof_function_ex(Z_OBJCE_PP(array), zend_ce_arrayaccess, 1
TSRMLS_CC))) {
- if (Z_OBJ_HT_PP(array)->has_dimension(*array, *key, 0
TSRMLS_CC)) {
- RETURN_TRUE;
- } else {
- RETURN_FALSE;
- }
- }
-
switch (Z_TYPE_PP(key)) {
case IS_STRING:
if (zend_symtable_exists(HASH_OF(*array),
Z_STRVAL_PP(key), Z_STRLEN_PP(key)+1)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
