Restore big exponent letter in var_export() ('1e300' -> '1E300')

diff --git a/main/snprintf.c b/main/snprintf.c
index d9aca450c3843da5a099038ce96aaa00f5b61988..861242d193b19cc0079561e40a9dfef59cb371c9 100644 (file)
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -1036,7 +1036,7 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) /
                                                lconv = localeconv();
                                        }
 #endif
-                                       s = php_gcvt(fp_num, precision, *fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G')?'E':'e', &num_buf[1]);
+                                       s = php_gcvt(fp_num, precision, *fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G' || *fmt == 'H')?'E':'e', &num_buf[1]);
                                        if (*s == '-') {
                                                prefix_char = *s++;
                                        } else if (print_sign) {

diff --git a/main/spprintf.c b/main/spprintf.c
index 8b576c0ed7f5a237211fd3342c1ada94f92c87d5..88e87f1dcd5d8fdf4e621486f4a12ee83c667fa7 100644 (file)
--- a/main/spprintf.c
+++ b/main/spprintf.c
@@ -619,7 +619,7 @@ static void xbuf_format_converter(smart_str *xbuf, const char *fmt, va_list ap)
                                                lconv = localeconv();
                                        }
 #endif
-                                       s = php_gcvt(fp_num, precision, *fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G')?'E':'e', &num_buf[1]);
+                                       s = php_gcvt(fp_num, precision, *fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G' || *fmt == 'H')?'E':'e', &num_buf[1]);
                                        if (*s == '-')
                                                prefix_char = *s++;
                                        else if (print_sign)