summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2011-01-05 14:48:13 +0000
committerIlia Alshanetsky <iliaa@php.net>2011-01-05 14:48:13 +0000
commit17f4cf457e217c2b46f57538fbd0af68838afe43 (patch)
treea5441e2a236a33dfae35422cde68a78220e463ce
parente41b42a6f6ff5dc535185d9d5b38ad61fe1f897c (diff)
downloadphp-git-17f4cf457e217c2b46f57538fbd0af68838afe43.tar.gz
5.2.17
-rw-r--r--NEWS3
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 5 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 73cb0663c6..27059eb9d0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 5.2.17
+06 Jan 2010, PHP 5.2.17
+- Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus)
16 Dec 2010, PHP 5.2.16
- Fixed bug #53517 (segfault in pgsql_stmt_execute() when postgres is down).
diff --git a/configure.in b/configure.in
index bb6624d782..8ebe91cfd4 100644
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=2
PHP_RELEASE_VERSION=17
-PHP_EXTRA_VERSION="-dev"
+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 7d71d61903..b07fdf4260 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 2
#define PHP_RELEASE_VERSION 17
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.2.16-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.2.17"
#define PHP_VERSION_ID 50217