diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-08-20 08:34:35 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-08-20 08:34:35 +0200 |
| commit | 45c0aa447e02c80bd21a23245574231a110cf5a1 (patch) | |
| tree | b801de455f164afbf40fbbc995ab9751163eee84 /main | |
| parent | 3365f28adf90110ca7475df889720fc244820f4b (diff) | |
| download | php-45c0aa447e02c80bd21a23245574231a110cf5a1.tar.gz | |
Imported Upstream version 5.4.6upstream/5.4.6
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_version.h | 4 | ||||
| -rw-r--r-- | main/snprintf.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/php_version.h b/main/php_version.h index 7db820ebd..8fd49ecf7 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 4 -#define PHP_RELEASE_VERSION 5 +#define PHP_RELEASE_VERSION 6 #define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.4.5" +#define PHP_VERSION "5.4.6" #define PHP_VERSION_ID 50405 diff --git a/main/snprintf.c b/main/snprintf.c index cd038d018..bda110d33 100644 --- a/main/snprintf.c +++ b/main/snprintf.c @@ -94,7 +94,7 @@ static char * __cvt(double value, int ndigit, int *decpt, int *sign, int fmode, *decpt = 0; c = *p; zend_freedtoa(p); - return(c == 'I' ? "INF" : "NAN"); + return strdup((c == 'I' ? "INF" : "NAN")); } /* Make a local copy and adjust rve to be in terms of s */ if (pad && fmode) { |