summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-11-12 22:46:59 -0800
committerStanislav Malyshev <stas@php.net>2013-11-12 22:46:59 -0800
commitbd4301120f24e4920c19d3ff0613a67c561a1d3f (patch)
tree764114492f9c013816901c25c56b04217ec3d271
parent41f6096ab299f182bc9c3874a113910276373dcf (diff)
downloadphp-git-PHP-5.4.22.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 40d9efc4c3..a0a285b2c6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-31 Oct 2013, PHP 5.4.22 RC1
+14 Nov 2013, PHP 5.4.22
- Core:
. Fixed bug #65911 (scope resolution operator - strange behavior with $this).
diff --git a/configure.in b/configure.in
index 1bcf5fee4d..e4e94a27a2 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=22
-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 0229c632a7..a3f17886a8 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 22
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.4.22RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.22"
#define PHP_VERSION_ID 50422