dmitry Mon Dec 17 10:02:13 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/ZendEngine2 zend_operators.c
/php-src/ext/standard/tests/array array_fill_variation1.phpt
/php-src/ext/standard/tests/general_functions
gettype_settype_variation2.phpt
/php-src/ext/standard/tests/strings chunk_split_variation2.phpt
htmlspecialchars_decode_variation2.phpt
pack.phpt
sprintf_variation35.phpt
sprintf_variation4.phpt
sprintf_variation41.phpt
str_split_variation2.phpt
vsprintf_variation15.phpt
vsprintf_variation15_64bit.phpt
vsprintf_variation16.phpt
vsprintf_variation4.phpt
Log:
Fixed bug #42868 (Floats cast to integer produce unpredicatable results).
(Zoe Slattery)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.58&r2=1.2027.2.547.2.965.2.59&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.58
php-src/NEWS:1.2027.2.547.2.965.2.59
--- php-src/NEWS:1.2027.2.547.2.965.2.58 Fri Dec 14 14:49:15 2007
+++ php-src/NEWS Mon Dec 17 10:02:12 2007
@@ -68,6 +68,8 @@
- Fixed bug #43128 (Very long class name causes segfault). (Dmitry)
- Fixed bug #42952 (soap cache file is created with insecure permissions).
(Dmitry)
+- Fixed bug #42868 (Floats cast to integer produce unpredicatable results).
+ (Zoe Slattery)
- Fixed bug #42848 (Status: header incorrect under FastCGI). (Dmitry)
- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry)
- Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines).
(Nuno)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.208.2.4.2.23.2.3&r2=1.208.2.4.2.23.2.4&diff_format=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.3
ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.4
--- ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.3 Tue Nov 20 13:26:36 2007
+++ ZendEngine2/zend_operators.c Mon Dec 17 10:02:13 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.3 2007/11/20 13:26:36 dmitry Exp $
*/
+/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.4 2007/12/17 10:02:13 dmitry Exp $
*/
#include <ctype.h>
@@ -183,20 +183,37 @@
}
\
}
+#define MAX_UNSIGNED_INT ((double) LONG_MAX * 2) + 1
#ifdef _WIN64
# define DVAL_TO_LVAL(d, l) \
- if ((d) > LONG_MAX) { \
- (l) = (long)(unsigned long)(__int64) (d); \
- } else { \
- (l) = (long) (d); \
- }
+ if ((d) > LONG_MAX) { \
+ if ((d) > MAX_UNSIGNED_INT) { \
+ (l) = LONG_MAX; \
+ } else { \
+ (l) = (long)(unsigned long)(__int64) (d); \
+ } \
+ } else { \
+ if((d) < LONG_MIN) { \
+ (l) = LONG_MIN; \
+ } else { \
+ (l) = (long) (d); \
+ } \
+ }
#else
# define DVAL_TO_LVAL(d, l) \
- if ((d) > LONG_MAX) { \
- (l) = (unsigned long) (d); \
- } else { \
- (l) = (long) (d); \
- }
+ if ((d) > LONG_MAX) { \
+ if ((d) > MAX_UNSIGNED_INT) { \
+ (l) = LONG_MAX; \
+ } else { \
+ (l) = (unsigned long) (d); \
+ } \
+ } else { \
+ if((d) < LONG_MIN) { \
+ (l) = LONG_MIN; \
+ } else { \
+ (l) = (long) (d); \
+ } \
+ }
#endif
#define zendi_convert_to_long(op, holder, result)
\
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_fill_variation1.phpt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/standard/tests/array/array_fill_variation1.phpt
diff -u php-src/ext/standard/tests/array/array_fill_variation1.phpt:1.1.2.4
php-src/ext/standard/tests/array/array_fill_variation1.phpt:1.1.2.5
--- php-src/ext/standard/tests/array/array_fill_variation1.phpt:1.1.2.4 Thu Nov
8 10:13:33 2007
+++ php-src/ext/standard/tests/array/array_fill_variation1.phpt Mon Dec 17
10:02:13 2007
@@ -125,9 +125,9 @@
}
-- Iteration 3 --
array(2) {
- [-1097262584]=>
+ [2147483647]=>
int(100)
- [0]=>
+ [-2147483648]=>
int(100)
}
-- Iteration 4 --
@@ -146,23 +146,23 @@
}
-- Iteration 6 --
-Warning: array_fill() expects parameter 1 to be long, array given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, array given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 7 --
-Warning: array_fill() expects parameter 1 to be long, array given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, array given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 8 --
-Warning: array_fill() expects parameter 1 to be long, array given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, array given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 9 --
-Warning: array_fill() expects parameter 1 to be long, array given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, array given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 10 --
-Warning: array_fill() expects parameter 1 to be long, array given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, array given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 11 --
array(2) {
@@ -208,23 +208,23 @@
}
-- Iteration 17 --
-Warning: array_fill() expects parameter 1 to be long, string given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, string given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 18 --
-Warning: array_fill() expects parameter 1 to be long, string given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, string given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 19 --
-Warning: array_fill() expects parameter 1 to be long, string given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, string given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 20 --
-Warning: array_fill() expects parameter 1 to be long, string given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, string given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 21 --
-Warning: array_fill() expects parameter 1 to be long, object given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, object given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 22 --
array(2) {
@@ -242,6 +242,6 @@
}
-- Iteration 24 --
-Warning: array_fill() expects parameter 1 to be long, resource given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, resource given in
%sarray_fill_variation1.php on line %d
NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u
Index:
php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt
diff -u
php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt:1.1.2.3
php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt:1.1.2.3.2.1
---
php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt:1.1.2.3
Wed Aug 29 04:38:09 2007
+++
php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt
Mon Dec 17 10:02:13 2007
@@ -187,7 +187,7 @@
echo "Done\n";
?>
---EXPECTF--
+--EXPECTF--
8: Undefined variable: unset_var
8: Undefined variable: undef_var
@@ -447,7 +447,7 @@
-- Iteration 51 --
string(6) "double"
bool(true)
-int(-508130303)
+int(2147483647)
string(7) "integer"
-- Iteration 52 --
string(7) "integer"
@@ -457,7 +457,7 @@
-- Iteration 53 --
string(6) "double"
bool(true)
-int(1952002105)
+int(2147483647)
string(7) "integer"
-- Iteration 54 --
string(7) "integer"
@@ -477,7 +477,7 @@
-- Iteration 57 --
string(6) "double"
bool(true)
-int(343000682)
+int(2147483647)
string(7) "integer"
-- Iteration 58 --
string(6) "double"
@@ -852,7 +852,7 @@
-- Iteration 51 --
string(6) "double"
bool(true)
-int(-508130303)
+int(2147483647)
string(7) "integer"
-- Iteration 52 --
string(7) "integer"
@@ -862,7 +862,7 @@
-- Iteration 53 --
string(6) "double"
bool(true)
-int(1952002105)
+int(2147483647)
string(7) "integer"
-- Iteration 54 --
string(7) "integer"
@@ -882,7 +882,7 @@
-- Iteration 57 --
string(6) "double"
bool(true)
-int(343000682)
+int(2147483647)
string(7) "integer"
-- Iteration 58 --
string(6) "double"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chunk_split_variation2.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/standard/tests/strings/chunk_split_variation2.phpt
diff -u php-src/ext/standard/tests/strings/chunk_split_variation2.phpt:1.2.2.3
php-src/ext/standard/tests/strings/chunk_split_variation2.phpt:1.2.2.4
--- php-src/ext/standard/tests/strings/chunk_split_variation2.phpt:1.2.2.3
Fri Nov 9 07:19:00 2007
+++ php-src/ext/standard/tests/strings/chunk_split_variation2.phpt Mon Dec
17 10:02:13 2007
@@ -90,85 +90,83 @@
?>
--EXPECTF--
-*** Testing chunk_split() : with unexpected values for 'chunklen' argument ***
--- Iteration 1 --
-string(28) "This is ch*uklen vari*ation*"
--- Iteration 2 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 3 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 4 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 5 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 6 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 7 --
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
--- Iteration 8 --
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
--- Iteration 9 --
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
--- Iteration 10 --
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
--- Iteration 11 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 12 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 13 --
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
--- Iteration 14 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 15 --
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
--- Iteration 16 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 17 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 18 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 19 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 20 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 21 --
-
-Notice: Object of class MyClass could not be converted to int in %s on line %d
-string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
--- Iteration 22 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 23 --
-
-Warning: chunk_split(): Chunk length should be greater than zero in %s on line
%d
-bool(false)
--- Iteration 24 --
-string(%d) "%s"
-Done
\ No newline at end of file
+*** Testing chunk_split() : with unexpected values for 'chunklen' argument ***
+-- Iteration 1 --
+string(28) "This is ch*uklen vari*ation*"
+-- Iteration 2 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 3 --
+string(26) "This is chuklen variation*"
+-- Iteration 4 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 5 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 6 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 7 --
+string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+-- Iteration 8 --
+string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+-- Iteration 9 --
+string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+-- Iteration 10 --
+string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+-- Iteration 11 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 12 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 13 --
+string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+-- Iteration 14 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 15 --
+string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+-- Iteration 16 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 17 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 18 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 19 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 20 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 21 --
+
+Notice: Object of class MyClass could not be converted to int in
%schunk_split_variation2.php on line %d
+string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*"
+-- Iteration 22 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 23 --
+
+Warning: chunk_split(): Chunk length should be greater than zero in
%schunk_split_variation2.php on line %d
+bool(false)
+-- Iteration 24 --
+string(30) "This *is ch*uklen* vari*ation*"
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index:
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt
diff -u
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt:1.2.2.2
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt:1.2.2.3
---
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt:1.2.2.2
Sat Sep 29 16:51:42 2007
+++ php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation2.phpt
Mon Dec 17 10:02:13 2007
@@ -102,7 +102,7 @@
string(104) "<html>Roy's height > Sam's height. 13 < 15. 1111 & 0000
= 0000. " double quote string "</html>"
-- Iteration 3 --
-string(114) "<html>Roy's height > Sam's height. 13 < 15. 1111 & 0000
= 0000. " double quote string "</html>"
+string(94) "<html>Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. "
double quote string "</html>"
-- Iteration 4 --
string(114) "<html>Roy's height > Sam's height. 13 < 15. 1111 & 0000
= 0000. " double quote string "</html>"
@@ -112,27 +112,27 @@
-- Iteration 6 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be long, array given
in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be long, array given
in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 7 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be long, array given
in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be long, array given
in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 8 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be long, array given
in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be long, array given
in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 9 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be long, array given
in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be long, array given
in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 10 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be long, array given
in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be long, array given
in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 11 --
@@ -155,27 +155,27 @@
-- Iteration 17 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be long, string
given in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be long, string
given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 18 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be long, string
given in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be long, string
given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 19 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be long, string
given in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be long, string
given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 20 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be long, string
given in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be long, string
given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 21 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be long, object
given in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be long, object
given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
-- Iteration 22 --
@@ -186,6 +186,6 @@
-- Iteration 24 --
-Warning: htmlspecialchars_decode() expects parameter 2 to be long, resource
given in %s on line %d
+Warning: htmlspecialchars_decode() expects parameter 2 to be long, resource
given in %shtmlspecialchars_decode_variation2.php on line %d
NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/pack.phpt?r1=1.1.2.6&r2=1.1.2.6.2.1&diff_format=u
Index: php-src/ext/standard/tests/strings/pack.phpt
diff -u php-src/ext/standard/tests/strings/pack.phpt:1.1.2.6
php-src/ext/standard/tests/strings/pack.phpt:1.1.2.6.2.1
--- php-src/ext/standard/tests/strings/pack.phpt:1.1.2.6 Wed Jun 6
22:25:08 2007
+++ php-src/ext/standard/tests/strings/pack.phpt Mon Dec 17 10:02:13 2007
@@ -145,7 +145,7 @@
)
Array
(
- [1] => 0
+ [1] => 2147483647
)
Array
(
@@ -185,7 +185,7 @@
)
Array
(
- [1] => 0
+ [1] => 2147483647
)
Array
(
@@ -233,7 +233,7 @@
)
Array
(
- [1] => 0
+ [1] => 2147483647
)
Array
(
@@ -305,7 +305,7 @@
)
Array
(
- [1] => 0
+ [1] => 2147483647
)
Array
(
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation35.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation35.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation35.phpt:1.2.2.3
php-src/ext/standard/tests/strings/sprintf_variation35.phpt:1.2.2.4
--- php-src/ext/standard/tests/strings/sprintf_variation35.phpt:1.2.2.3 Sun Sep
30 14:37:33 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation35.phpt Mon Dec 17
10:02:13 2007
@@ -71,17 +71,17 @@
string(1) "x"
-- Iteration 2 --
-string(1) "1"
-string(2) "1x"
-string(1) "1"
-string(1) "x"
-string(2) " 1"
-string(2) "1 "
-string(2) " 1"
-string(2) "
-1"
-string(4) " 1"
-string(30) " 1"
+string(8) "7fffffff"
+string(9) "7fffffffx"
+string(8) "7fffffff"
+string(1) "x"
+string(9) " 7fffffff"
+string(9) "7fffffff "
+string(9) " 7fffffff"
+string(9) "
+7fffffff"
+string(8) "7fffffff"
+string(30) " 7fffffff"
string(10) "0-9A-Fa-f]"
string(1) "x"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation4.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation4.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation4.phpt:1.2.2.3
php-src/ext/standard/tests/strings/sprintf_variation4.phpt:1.2.2.4
--- php-src/ext/standard/tests/strings/sprintf_variation4.phpt:1.2.2.3 Sun Sep
30 14:37:33 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation4.phpt Mon Dec 17
10:02:13 2007
@@ -71,17 +71,17 @@
string(1) "d"
-- Iteration 2 --
-string(1) "1"
+string(10) "2147483647"
string(1) "d"
-string(1) "1"
+string(10) "2147483647"
string(1) "d"
-string(2) " 1"
-string(2) "1 "
-string(2) " 1"
-string(2) "
-1"
-string(4) " 1"
-string(30) " 1"
+string(11) " 2147483647"
+string(11) "2147483647 "
+string(11) " 2147483647"
+string(11) "
+2147483647"
+string(10) "2147483647"
+string(30) " 2147483647"
string(4) "0-9]"
string(1) "d"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_variation41.phpt?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/standard/tests/strings/sprintf_variation41.phpt
diff -u php-src/ext/standard/tests/strings/sprintf_variation41.phpt:1.2.2.3
php-src/ext/standard/tests/strings/sprintf_variation41.phpt:1.2.2.4
--- php-src/ext/standard/tests/strings/sprintf_variation41.phpt:1.2.2.3 Sun Sep
30 14:37:33 2007
+++ php-src/ext/standard/tests/strings/sprintf_variation41.phpt Mon Dec 17
10:02:13 2007
@@ -75,17 +75,17 @@
string(1) "u"
-- Iteration 2 --
-string(1) "1"
+string(10) "2147483647"
string(1) "u"
-string(1) "1"
+string(10) "2147483647"
string(1) "u"
-string(2) " 1"
-string(2) "1 "
-string(2) " 1"
-string(2) "
-1"
-string(4) " 1"
-string(30) " 1"
+string(11) " 2147483647"
+string(11) "2147483647 "
+string(11) " 2147483647"
+string(11) "
+2147483647"
+string(10) "2147483647"
+string(30) " 2147483647"
string(4) "0-9]"
string(1) "u"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_split_variation2.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/strings/str_split_variation2.phpt
diff -u php-src/ext/standard/tests/strings/str_split_variation2.phpt:1.1.4.3
php-src/ext/standard/tests/strings/str_split_variation2.phpt:1.1.4.4
--- php-src/ext/standard/tests/strings/str_split_variation2.phpt:1.1.4.3
Thu Nov 8 10:29:52 2007
+++ php-src/ext/standard/tests/strings/str_split_variation2.phpt Mon Dec
17 10:02:13 2007
@@ -107,47 +107,48 @@
}
--Iteration 2 --
-Warning: str_split(): The length of each segment must be greater than zero in
%s on line %d
+Warning: str_split(): The length of each segment must be greater than zero in
%sstr_split_variation2.php on line %d
bool(false)
--Iteration 3 --
-
-Warning: str_split(): The length of each segment must be greater than zero in
%s on line %d
-bool(false)
+array(1) {
+ [0]=>
+ string(23) "variation2:split_length"
+}
--Iteration 4 --
-Warning: str_split(): The length of each segment must be greater than zero in
%s on line %d
+Warning: str_split(): The length of each segment must be greater than zero in
%sstr_split_variation2.php on line %d
bool(false)
--Iteration 5 --
-Warning: str_split(): The length of each segment must be greater than zero in
%s on line %d
+Warning: str_split(): The length of each segment must be greater than zero in
%sstr_split_variation2.php on line %d
bool(false)
--Iteration 6 --
-Warning: str_split() expects parameter 2 to be long, array given in %s on line
%d
+Warning: str_split() expects parameter 2 to be long, array given in
%sstr_split_variation2.php on line %d
NULL
--Iteration 7 --
-Warning: str_split() expects parameter 2 to be long, array given in %s on line
%d
+Warning: str_split() expects parameter 2 to be long, array given in
%sstr_split_variation2.php on line %d
NULL
--Iteration 8 --
-Warning: str_split() expects parameter 2 to be long, array given in %s on line
%d
+Warning: str_split() expects parameter 2 to be long, array given in
%sstr_split_variation2.php on line %d
NULL
--Iteration 9 --
-Warning: str_split() expects parameter 2 to be long, array given in %s on line
%d
+Warning: str_split() expects parameter 2 to be long, array given in
%sstr_split_variation2.php on line %d
NULL
--Iteration 10 --
-Warning: str_split() expects parameter 2 to be long, array given in %s on line
%d
+Warning: str_split() expects parameter 2 to be long, array given in
%sstr_split_variation2.php on line %d
NULL
--Iteration 11 --
-Warning: str_split(): The length of each segment must be greater than zero in
%s on line %d
+Warning: str_split(): The length of each segment must be greater than zero in
%sstr_split_variation2.php on line %d
bool(false)
--Iteration 12 --
-Warning: str_split(): The length of each segment must be greater than zero in
%s on line %d
+Warning: str_split(): The length of each segment must be greater than zero in
%sstr_split_variation2.php on line %d
bool(false)
--Iteration 13 --
array(23) {
@@ -200,7 +201,7 @@
}
--Iteration 14 --
-Warning: str_split(): The length of each segment must be greater than zero in
%s on line %d
+Warning: str_split(): The length of each segment must be greater than zero in
%sstr_split_variation2.php on line %d
bool(false)
--Iteration 15 --
array(23) {
@@ -253,38 +254,38 @@
}
--Iteration 16 --
-Warning: str_split(): The length of each segment must be greater than zero in
%s on line %d
+Warning: str_split(): The length of each segment must be greater than zero in
%sstr_split_variation2.php on line %d
bool(false)
--Iteration 17 --
-Warning: str_split() expects parameter 2 to be long, string given in %s on
line %d
+Warning: str_split() expects parameter 2 to be long, string given in
%sstr_split_variation2.php on line %d
NULL
--Iteration 18 --
-Warning: str_split() expects parameter 2 to be long, string given in %s on
line %d
+Warning: str_split() expects parameter 2 to be long, string given in
%sstr_split_variation2.php on line %d
NULL
--Iteration 19 --
-Warning: str_split() expects parameter 2 to be long, string given in %s on
line %d
+Warning: str_split() expects parameter 2 to be long, string given in
%sstr_split_variation2.php on line %d
NULL
--Iteration 20 --
-Warning: str_split() expects parameter 2 to be long, string given in %s on
line %d
+Warning: str_split() expects parameter 2 to be long, string given in
%sstr_split_variation2.php on line %d
NULL
--Iteration 21 --
-Warning: str_split() expects parameter 2 to be long, object given in %s on
line %d
+Warning: str_split() expects parameter 2 to be long, object given in
%sstr_split_variation2.php on line %d
NULL
--Iteration 22 --
-Warning: str_split(): The length of each segment must be greater than zero in
%s on line %d
+Warning: str_split(): The length of each segment must be greater than zero in
%sstr_split_variation2.php on line %d
bool(false)
--Iteration 23 --
-Warning: str_split(): The length of each segment must be greater than zero in
%s on line %d
+Warning: str_split(): The length of each segment must be greater than zero in
%sstr_split_variation2.php on line %d
bool(false)
--Iteration 24 --
-Warning: str_split() expects parameter 2 to be long, resource given in %s on
line %d
+Warning: str_split() expects parameter 2 to be long, resource given in
%sstr_split_variation2.php on line %d
NULL
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation15.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/strings/vsprintf_variation15.phpt
diff -u php-src/ext/standard/tests/strings/vsprintf_variation15.phpt:1.1.4.3
php-src/ext/standard/tests/strings/vsprintf_variation15.phpt:1.1.4.4
--- php-src/ext/standard/tests/strings/vsprintf_variation15.phpt:1.1.4.3
Tue Nov 6 12:54:27 2007
+++ php-src/ext/standard/tests/strings/vsprintf_variation15.phpt Mon Dec
17 10:02:13 2007
@@ -55,10 +55,10 @@
string(16) "1234567 342391 0"
-- Iteration 2 --
-string(23) "3755744308 u 1234 12345"
+string(23) "2147483647 u 1234 12345"
-- Iteration 3 --
-string(25) " 1234000 0 120"
+string(25) " 1234000 2147483647 120"
-- Iteration 4 --
string(10) "#1 0 $0 10"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt
diff -u
php-src/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt:1.1.2.2
php-src/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt:1.1.2.2
Tue Nov 6 12:54:28 2007
+++ php-src/ext/standard/tests/strings/vsprintf_variation15_64bit.phpt Mon Dec
17 10:02:13 2007
@@ -58,7 +58,7 @@
string(24) "12345678900 u 1234 12345"
-- Iteration 3 --
-string(25) " 1234000 0 120"
+string(34) " 1234000 9223372036854775807 120"
-- Iteration 4 --
string(10) "#1 0 $0 10"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation16.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/strings/vsprintf_variation16.phpt
diff -u php-src/ext/standard/tests/strings/vsprintf_variation16.phpt:1.1.4.3
php-src/ext/standard/tests/strings/vsprintf_variation16.phpt:1.1.4.4
--- php-src/ext/standard/tests/strings/vsprintf_variation16.phpt:1.1.4.3
Tue Nov 6 12:54:28 2007
+++ php-src/ext/standard/tests/strings/vsprintf_variation16.phpt Mon Dec
17 10:02:13 2007
@@ -76,8 +76,8 @@
-- Iteration 1 --
string(115) "2 0 10
- 123456 u 1234 2820130816
- 2840207360 1177509888 12345
+ 123456 u 1234 2147483647
+ 2147483647 2147483647 12345
12 4294967284 4294843840 _3
10 123456 2 0"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation4.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/standard/tests/strings/vsprintf_variation4.phpt
diff -u php-src/ext/standard/tests/strings/vsprintf_variation4.phpt:1.1.4.3
php-src/ext/standard/tests/strings/vsprintf_variation4.phpt:1.1.4.4
--- php-src/ext/standard/tests/strings/vsprintf_variation4.phpt:1.1.4.3 Tue Nov
6 12:54:28 2007
+++ php-src/ext/standard/tests/strings/vsprintf_variation4.phpt Mon Dec 17
10:02:13 2007
@@ -75,9 +75,9 @@
*** Testing vsprintf() : int formats and non-integer values ***
-- Iteration 1 --
-string(112) "2 +0 10
+string(111) "2 +0 10
123456 d -1234 1234
- -1474836480 200000 4000 22000000
+ 2147483647 200000 4000 22000000
12345 12 -12 -123456
10 123456 2 0"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
