MFH: fix for bug #24063

diff --git a/NEWS b/NEWS
index 8b82068c5d9df46a396c4f703947365dd4d16e5e..d9b243107cf0bec3c99d08b4b8242db3a9c99864 100644 (file)
--- 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 9d5a049540015a42620ed18a4365155bacf5ea85..173f57b72c1c5ebec02d765abdc5cd19adc67dc7 100644 (file)
--- 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 9593f5909cc5316268449fc9cdad46778b294e98..cb52a83a94623f29cede2d9ed03e58f0cc1b2151 100644 (file)
--- 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;