summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-11-26 11:31:58 +0100
committerJulien Pauli <jpauli@php.net>2014-11-26 11:31:58 +0100
commit3656349990cf67b32df8155901e76a88ea2cea44 (patch)
treec7689e557f503944e7b272fb788562c554d0a2c7
parent68126a76b459c89a04449791849f6564ff13f696 (diff)
downloadphp-git-3656349990cf67b32df8155901e76a88ea2cea44.tar.gz
5.5.21 now
-rw-r--r--NEWS7
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 10 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index fd082766a5..2694863caa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2014, PHP 5.5.20
+?? ??? 2014, PHP 5.5.21
+
+
+
+
+11 Dec 2014, PHP 5.5.20
- Core:
. Fixed bug #68091 (Some Zend headers lack appropriate extern "C" blocks).
diff --git a/configure.in b/configure.in
index b16a97e72c..358b94d37b 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=20
+PHP_RELEASE_VERSION=21
PHP_EXTRA_VERSION="-dev"
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 3e5d9d8b3e..dc81b9188d 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 5
-#define PHP_RELEASE_VERSION 20
+#define PHP_RELEASE_VERSION 21
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.20-dev"
-#define PHP_VERSION_ID 50520
+#define PHP_VERSION "5.5.21-dev"
+#define PHP_VERSION_ID 50521