summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-08-20 09:56:47 +0200
committerFerenc Kovacs <tyrael@php.net>2015-08-20 09:56:47 +0200
commitc7c9858ba16eb71c9ffc6cabfa00f8ece8600b47 (patch)
tree887337c64a365f925528cc382b45b7c3fd3008a3
parent6c99cb2929c59d4440d3f3ca4dbd54e4ca287723 (diff)
downloadphp-git-c7c9858ba16eb71c9ffc6cabfa00f8ece8600b47.tar.gz
5.6.14 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 d652feca55..2d6e367883 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2015, PHP 5.6.13
+?? ??? 2015, PHP 5.6.14
+
+03 Sep 2015, PHP 5.6.13
- Core:
. Fixed bug #69900 (Too long timeout on pipes). (Anatol)
diff --git a/configure.in b/configure.in
index 43380b7e45..01277b8c19 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=13
+PHP_RELEASE_VERSION=14
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 5df1dc859d..8f59951501 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 13
+#define PHP_RELEASE_VERSION 14
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.13-dev"
-#define PHP_VERSION_ID 50613
+#define PHP_VERSION "5.6.14-dev"
+#define PHP_VERSION_ID 50614