felipe Sun May 18 15:42:09 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c
/php-src/ext/standard/tests/array array_slice_variation6.phpt
Log:
- Making compatible with 64bit plataform
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.29&r2=1.308.2.21.2.37.2.30&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.29
php-src/ext/standard/array.c:1.308.2.21.2.37.2.30
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.29 Sun May 4 11:26:50 2008
+++ php-src/ext/standard/array.c Sun May 18 15:42:08 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.29 2008/05/04 11:26:50 tony2001 Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.30 2008/05/18 15:42:08 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2163,7 +2163,7 @@
/* ..and the length */
if (length < 0) {
length = num_in - offset + length;
- } else if (((unsigned) offset + (unsigned) length) > (unsigned) num_in)
{
+ } else if (((unsigned long) offset + (unsigned long) length) >
(unsigned) num_in) {
length = num_in - offset;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_slice_variation6.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/array/array_slice_variation6.phpt
diff -u php-src/ext/standard/tests/array/array_slice_variation6.phpt:1.1.4.3
php-src/ext/standard/tests/array/array_slice_variation6.phpt:1.1.4.4
--- php-src/ext/standard/tests/array/array_slice_variation6.phpt:1.1.4.3
Mon Apr 14 23:17:30 2008
+++ php-src/ext/standard/tests/array/array_slice_variation6.phpt Sun May
18 15:42:09 2008
@@ -133,10 +133,18 @@
}
-- $length is maximum integer value --
-array(0) {
+array(4) {
+ [0]=>
+ string(3) "two"
+ [1]=>
+ string(5) "three"
+ [2]=>
+ string(4) "nine"
+ ["ten"]=>
+ int(10)
}
-- $length is minimum integer value --
array(0) {
}
-Done
\ No newline at end of file
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
