summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-07-02 23:10:53 -0700
committerStanislav Malyshev <stas@php.net>2013-07-02 23:10:53 -0700
commit0d135ccbf0e320e5d8b973581aac56664fe92a72 (patch)
treecfbe0db598a4e8c3ddc8d3f995e313051622f519
parentf432141cd9a9cad004373a8de9d8e8be52482afd (diff)
downloadphp-git-PHP-5.4.17.tar.gz
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index adfe837fa2..5f5aac5a52 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-20 Jun 2013, PHP 5.4.17 RC1
+04 Jul 2013, PHP 5.4.17
- Core:
. Fixed bug #64988 (Class loading order affects E_STRICT warning). (Laruence)
diff --git a/configure.in b/configure.in
index 9947b14a8e..508d83a78f 100644
--- a/configure.in
+++ b/configure.in
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=4
PHP_RELEASE_VERSION=17
-PHP_EXTRA_VERSION="RC1"
+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 a7f80bc34f..ebf463f298 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 4
#define PHP_RELEASE_VERSION 17
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.4.17RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.17"
#define PHP_VERSION_ID 50417