iliaa Thu Apr 1 14:07:02 2004 EDT
Removed files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/array bug27782.phpt
Modified files:
/php-src NEWS
/php-src/ext/standard array.c
Log:
Revert patch for bug #27782.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.623&r2=1.1247.2.624&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.623 php-src/NEWS:1.1247.2.624
--- php-src/NEWS:1.1247.2.623 Thu Apr 1 12:49:20 2004
+++ php-src/NEWS Thu Apr 1 14:07:01 2004
@@ -8,7 +8,6 @@
- Fixed bug #27809 (ftp_systype returns null on some ftp servers). (Ilia)
- Fixed bug #27802 (default number of children to 8 when PHP_FCGI_CHILDREN is
not defined). (Ilia)
-- Fixed bug #27782 (Wrong behaviour of next(), prev() and each()). (Ilia)
- Fixed bug #27764 (Get return value from a stored procedure not returning any
result sets). (Frank)
- Fixed bug #27762 (SCO Openserver doesn't have S_ISSOCK). (Wez)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.199.2.31&r2=1.199.2.32&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.199.2.31 php-src/ext/standard/array.c:1.199.2.32
--- php-src/ext/standard/array.c:1.199.2.31 Tue Mar 30 14:09:10 2004
+++ php-src/ext/standard/array.c Thu Apr 1 14:07:01 2004
@@ -22,7 +22,7 @@
*/
-/* $Id: array.c,v 1.199.2.31 2004/03/30 19:09:10 iliaa Exp $ */
+/* $Id: array.c,v 1.199.2.32 2004/04/01 19:07:01 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -718,10 +718,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) {
@@ -750,10 +746,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
