summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyra3l@gmail.com>2018-03-28 23:14:30 +0200
committerFerenc Kovacs <tyra3l@gmail.com>2018-03-28 23:14:30 +0200
commitcb981e39c29bda59897cfaf30cebbf534c27f47c (patch)
treed559113dc39a8655955698d93f8a2e70d6ffda3f
parent2885f628165f10b661bf54d12408b8ca0fe90672 (diff)
downloadphp-git-cb981e39c29bda59897cfaf30cebbf534c27f47c.tar.gz
[ci skip] 5.6.36 will be 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 7cf8f32dac..db5523c98d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2018, PHP 5.6.35
+?? ??? 2018, PHP 5.6.36
+
+29 Mar 2018, PHP 5.6.35
- FPM:
. Fixed bug #75605 (Dumpable FPM child processes allow bypassing opcache
diff --git a/configure.in b/configure.in
index 78d2d4defa..23dc5e79a5 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=6
-PHP_RELEASE_VERSION=35
+PHP_RELEASE_VERSION=36
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 f650f8b587..cec53e0cc9 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 6
-#define PHP_RELEASE_VERSION 35
+#define PHP_RELEASE_VERSION 36
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.35-dev"
-#define PHP_VERSION_ID 50635
+#define PHP_VERSION "5.6.36-dev"
+#define PHP_VERSION_ID 50636