summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-10-10 08:26:04 +0200
committerAnatol Belski <ab@php.net>2017-10-10 08:26:04 +0200
commit51658bac3550761253144b316f8d9bf5e6b06487 (patch)
tree8a9946fe28742782c51cd458ad5d23a7e7320b09
parentf48abfa9022c026c2447b14bc03c978d2b831b27 (diff)
downloadphp-git-51658bac3550761253144b316f8d9bf5e6b06487.tar.gz
Move dev to 7.0.26
-rw-r--r--NEWS6
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 9 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 7079d817c0..eae1fa76e1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2017 PHP 7.0.25
+?? ??? 2017 PHP 7.0.26
+
+
+
+26 Oct 2017 PHP 7.0.25
- Core:
. Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
diff --git a/configure.in b/configure.in
index ab33d8f76e..eb1fa2733b 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=7
PHP_MINOR_VERSION=0
-PHP_RELEASE_VERSION=25
+PHP_RELEASE_VERSION=26
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 ed203cc662..9e39cf4bd8 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 7
#define PHP_MINOR_VERSION 0
-#define PHP_RELEASE_VERSION 25
+#define PHP_RELEASE_VERSION 26
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "7.0.25-dev"
-#define PHP_VERSION_ID 70025
+#define PHP_VERSION "7.0.26-dev"
+#define PHP_VERSION_ID 70026