summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--Zend/zend_strtod.c1
-rw-r--r--configure.in4
-rw-r--r--main/php_version.h8
4 files changed, 7 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 7ff6c4cfac..abe0da727b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,5 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 5.2.18
-
06 Jan 2010, PHP 5.2.17
- Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott,
Rasmus)
diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c
index 04d92d6c38..6ffefba553 100644
--- a/Zend/zend_strtod.c
+++ b/Zend/zend_strtod.c
@@ -164,6 +164,7 @@ typedef unsigned long int uint32_t;
#ifdef __vax__
#define VAX
+#undef IEEE_LITTLE_ENDIAN
#endif
#if defined(_MSC_VER)
diff --git a/configure.in b/configure.in
index 5af0c1141c..8ebe91cfd4 100644
--- a/configure.in
+++ b/configure.in
@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=2
-PHP_RELEASE_VERSION=18
-PHP_EXTRA_VERSION="-dev"
+PHP_RELEASE_VERSION=17
+PHP_EXTRA_VERSION=""
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
diff --git a/main/php_version.h b/main/php_version.h
index 851d0e13f8..b07fdf4260 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 2
-#define PHP_RELEASE_VERSION 18
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.2.18-dev"
-#define PHP_VERSION_ID 50218
+#define PHP_RELEASE_VERSION 17
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.2.17"
+#define PHP_VERSION_ID 50217