iliaa Sun Jun 29 21:03:21 2003 EDT
Added files:
/php-src/ext/standard/tests/serialize bug24063.phpt
Modified files:
/php-src/main snprintf.c
/php-src/ext/standard/tests/serialize 003.phpt
Log:
Fixed bug #24063 (*printf() did not handle scientific notation correctly)
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.23 php-src/main/snprintf.c:1.24
--- php-src/main/snprintf.c:1.23 Tue Jun 10 16:03:42 2003
+++ php-src/main/snprintf.c Sun Jun 29 21:03:21 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snprintf.c,v 1.23 2003/06/10 20:03:42 imajes Exp $ */
+/* $Id: snprintf.c,v 1.24 2003/06/30 01:03:21 iliaa Exp $ */
/* ====================================================================
* Copyright (c) 1995-1998 The Apache Group. All rights reserved.
@@ -404,6 +404,9 @@
*p2++ = '.';
for (i = 1; i < ndigit; i++)
*p2++ = *p1++;
+ if (*(p2 - 1) == '.') {
+ *p2++ = '0';
+ }
*p2++ = 'e';
if (decpt < 0) {
decpt = -decpt;
Index: php-src/ext/standard/tests/serialize/003.phpt
diff -u php-src/ext/standard/tests/serialize/003.phpt:1.6
php-src/ext/standard/tests/serialize/003.phpt:1.7
--- php-src/ext/standard/tests/serialize/003.phpt:1.6 Wed May 21 03:23:45 2003
+++ php-src/ext/standard/tests/serialize/003.phpt Sun Jun 29 21:03:21 2003
@@ -22,4 +22,4 @@
float\(8\.529E-22\)
d:9\.[0-9]*E-9;
-float\(9\.E-9\)
+float\(9\.0E-9\)
Index: php-src/ext/standard/tests/serialize/bug24063.phpt
+++ php-src/ext/standard/tests/serialize/bug24063.phpt
--TEST--
Bug #24063 (serialize() missing 0 after the . on scientific notation)
--INI--
serialize_precision=100
precision=12
--FILE--
<?php
$f = 1.0e-6;
$s = serialize($f);
var_dump($s, unserialize($s));
?>
--EXPECT--
string(9) "d:1.0E-6;"
float(1.0E-6)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
