summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-12-16 10:41:23 -0800
committerStanislav Malyshev <stas@php.net>2014-12-16 10:41:23 -0800
commit94ce084be00dd3b477b46402beefe4343cd2c59c (patch)
tree901ec9e3e65c95b8a0b753a62f429aa1a134d188
parent53f129a44d3c4ec0fae57993b9ae2f6cb48973cc (diff)
downloadphp-git-PHP-5.4.36.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 546fe19fe6..0bd17f0798 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 20?? PHP 5.4.36
+18 Dec 2014 PHP 5.4.36
- Core:
. Upgraded crypt_blowfish to version 1.3. (Leigh)
diff --git a/configure.in b/configure.in
index 8a14b49805..e4b7a7d8e7 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=36
-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 a36ea89436..a99769b8a5 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -4,6 +4,6 @@
#define PHP_MINOR_VERSION 4
#define PHP_RELEASE_VERSION 36
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.36-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.4.36"
#define PHP_VERSION_ID 50436