summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-08-04 23:59:55 -0700
committerStanislav Malyshev <stas@php.net>2015-08-04 23:59:55 -0700
commit15e9f4baf48f1a02091d1dbf505d9c6d561bc1d4 (patch)
treef610211d374b6c19bd014a63dc5b645b89de68a6
parent2425f88afd487181e4b2a86e9008b98a03dfb663 (diff)
downloadphp-git-15e9f4baf48f1a02091d1dbf505d9c6d561bc1d4.tar.gz
5.5.29 next
-rw-r--r--NEWS4
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 7 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 1202167dae..a519512f29 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,11 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2015, PHP 5.5.28
+?? ??? 2015, PHP 5.5.29
** PHP 5.5 is in security-only mode , please do not commit to this branch **
+06 Aug 2015, PHP 5.5.28
+
- Core:
. Fixed bug #69793 (Remotely triggerable stack exhaustion via recursive
method calls). (Stas)
diff --git a/configure.in b/configure.in
index efcf90ef12..a171d11430 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=28
+PHP_RELEASE_VERSION=29
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 74616e161a..8da8c05dd9 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 28
+#define PHP_RELEASE_VERSION 29
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.28-dev"
-#define PHP_VERSION_ID 50528
+#define PHP_VERSION "5.5.29-dev"
+#define PHP_VERSION_ID 50529