summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-12-10 01:28:51 +0100
committerFerenc Kovacs <tyrael@php.net>2015-12-10 01:30:27 +0100
commit7d5dbaed765c8b8f2bbf3f6159a4658686245a9b (patch)
tree7816bb8575336f99a4ebc4a77b4304499e59a589
parente4238f4bf5d54e7f6aa68778e8c2f5e42ae10403 (diff)
downloadphp-git-7d5dbaed765c8b8f2bbf3f6159a4658686245a9b.tar.gz
5.6.18 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 07586c63ac..3a2289546a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2015, PHP 5.6.17
+?? ??? 2016, PHP 5.6.18
+
+17 Dec 2015, PHP 5.6.17
- Core:
. Fixed bug #66909 (configure fails utf8_to_mutf7 test). (Michael Orlitzky)
diff --git a/configure.in b/configure.in
index 371d64154d..9cfe902c3c 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=17
+PHP_RELEASE_VERSION=18
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 c0e24addc2..8391fdb35e 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 17
+#define PHP_RELEASE_VERSION 18
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.17-dev"
-#define PHP_VERSION_ID 50617
+#define PHP_VERSION "5.6.18-dev"
+#define PHP_VERSION_ID 50618