summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-02-05 00:22:22 -0800
committerStanislav Malyshev <stas@php.net>2014-02-05 00:22:22 -0800
commitfd6e334f4a6275f3434cb3cedfc250a45c534b36 (patch)
treecddf5f1278d22232989186aef44e2c003295cc38
parent08eb524bf25533bbc5373690046b2f874129ccbc (diff)
downloadphp-git-PHP-5.4.25.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 536ec7c5a3..e8c8f31697 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-23 Jan 2013, PHP 5.4.25 RC1
+06 Feb 2014, PHP 5.4.25
- Core:
. Fixed bug #66286 (Incorrect object comparison with inheritance). (Nikita)
diff --git a/configure.in b/configure.in
index 47a4a68baf..fbcc764b4b 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=25
-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 3e7e09042e..2bef4c3ed1 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 25
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.4.25RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.25"
#define PHP_VERSION_ID 50425