[PHP-CVS] cvs: php-src /ext/standard array.c /ext/standard/tests/array bug27782.phpt ZendEngine2 zend_builtin_functions.c

[Ilia Alshanetsky]

iliaa           Thu Apr  1 17:07:42 2004 EDT

  Removed files:               
    /php-src/ext/standard/tests/array   bug27782.phpt 

  Modified files:              
    /ZendEngine2        zend_builtin_functions.c 
    /php-src/ext/standard       array.c 
  Log:
  MFB: Revert patch for bug #27782.
  
  
http://cvs.php.net/diff.php/ZendEngine2/zend_builtin_functions.c?r1=1.228&r2=1.229&ty=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.228 
ZendEngine2/zend_builtin_functions.c:1.229
--- ZendEngine2/zend_builtin_functions.c:1.228  Tue Mar 30 14:08:43 2004
+++ ZendEngine2/zend_builtin_functions.c        Thu Apr  1 17:07:42 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_builtin_functions.c,v 1.228 2004/03/30 19:08:43 iliaa Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.229 2004/04/01 22:07:42 iliaa Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -368,9 +368,6 @@
                return;
        }
        if (zend_hash_get_current_data(target_hash, (void **) &entry_ptr)==FAILURE) {
-               if (!target_hash->pInternalPointer) {
-                       zend_hash_internal_pointer_end(target_hash);
-               }
                RETURN_FALSE;
        }
        array_init(return_value);
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.259&r2=1.260&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.259 php-src/ext/standard/array.c:1.260
--- php-src/ext/standard/array.c:1.259  Tue Mar 30 14:08:43 2004
+++ php-src/ext/standard/array.c        Thu Apr  1 17:07:42 2004
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.259 2004/03/30 19:08:43 iliaa Exp $ */
+/* $Id: array.c,v 1.260 2004/04/01 22:07:42 iliaa Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -740,10 +740,6 @@
                RETURN_FALSE;
        }
        zend_hash_move_backwards(target_hash);
-       if (!target_hash->pInternalPointer) {
-               zend_hash_internal_pointer_reset(target_hash);
-               RETURN_FALSE;
-       }
 
        if (return_value_used) {        
                if (zend_hash_get_current_data(target_hash, (void **) &entry) == 
FAILURE) {
@@ -772,10 +768,6 @@
                RETURN_FALSE;
        }
        zend_hash_move_forward(target_hash);
-       if (!target_hash->pInternalPointer) {
-               zend_hash_internal_pointer_end(target_hash);
-               RETURN_FALSE;
-       }
 
        if (return_value_used) {
                if (zend_hash_get_current_data(target_hash, (void **) &entry) == 
FAILURE) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php