From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 30 Jun 2003 01:05:02 +0000 (+0000)
Subject: MFH: fix for bug #24063
X-Git-Tag: php-4.3.3RC2~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53b384c01da2dba4777d8a1457d95c86c9ecf974;p=php

MFH: fix for bug #24063
---

diff --git a/NEWS b/NEWS
index 8b82068c5d..d9b243107c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,11 +5,13 @@ PHP 4                                                                      NEWS
 - Fixed FastCGI IIS document root problem. (Shane)
 - Fixed corruption of multibyte character including 0x5c as second
   byte in multipart/form-data. (Rui)
-- Fixed bug #24312 (base64_decode() does not skip 0xF0-0xFF characters).
-  (gereon.steffens[at]onvista.de, Ilia)
 - Fixed bug #24313 (file_exist() warning on non-existent files
   when open_basedir is used). (Ilia)
+- Fixed bug #24312 (base64_decode() does not skip 0xF0-0xFF characters).
+  (gereon.steffens[at]onvista.de, Ilia)
 - Fixed bug #24284 (Fixed memory leak inside pg_ping()). (Ilia)
+- Fixed bug #24063 (*printf() did not handle scientific notation correctly).
+  (Ilia)
 - Fixed bug #24028 (Reading raw post message by php://input failed). (Jani)
 - Fixed bug #24009 FastCGI handling of file not found. (Shane)
 - Fixed bug #23664 FastCGI socket listenting. (Shane)
diff --git a/ext/standard/tests/serialize/003.phpt b/ext/standard/tests/serialize/003.phpt
index 9d5a049540..173f57b72c 100644
--- a/ext/standard/tests/serialize/003.phpt
+++ b/ext/standard/tests/serialize/003.phpt
@@ -22,4 +22,4 @@ d:8\.52[89][0-9]+E-22;
 float\(8\.529E-22\)
 
 d:9\.[0-9]*E-9;
-float\(9\.E-9\)
+float\(9\.0E-9\)
diff --git a/main/snprintf.c b/main/snprintf.c
index 9593f5909c..cb52a83a94 100644
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -384,6 +384,9 @@ ap_php_gcvt(double number, int ndigit, char *buf, boolean_e altform)
 		*p2++ = '.';
 		for (i = 1; i < ndigit; i++)
 			*p2++ = *p1++;
+		if (*(p2 - 1) == '.') {
+			*p2++ = '0';
+		}	
 		*p2++ = 'e';
 		if (decpt < 0) {
 			decpt = -decpt;