summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2015-02-04 16:37:49 +0100
committerJulien Pauli <jpauli@php.net>2015-02-04 16:37:49 +0100
commite6ea244004d1e0a02d299f95fc3c77225c71ef7a (patch)
treeeb395d55c9e6dfdd8f44cb19987d516dfe8f06fe
parent93315c4e1d514c2824bbadc23337603314db8f63 (diff)
downloadphp-git-e6ea244004d1e0a02d299f95fc3c77225c71ef7a.tar.gz
5.6.7 now
-rw-r--r--NEWS8
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 8 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 14aa511da8..5c94e12519 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? Feb 2015, PHP 5.6.7
+
+
+
?? Feb 2015, PHP 5.6.6
- Core:
@@ -29,10 +33,6 @@
. Fixed bug #68571 (core dump when webserver close the socket).
(redfoxli069 at gmail dot com, Laruence)
-- JSON:
- . Fixed bug #68938 (json_decode() decodes empty string without error).
- (jeremy at bat-country dot us)
-
- LIBXML:
. Fixed bug #64938 (libxml_disable_entity_loader setting is shared
between threads). (Martin Jansen)
diff --git a/configure.in b/configure.in
index ae07fc38f9..aaa7e44959 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=6
+PHP_RELEASE_VERSION=7
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 ed1e351fda..777e56f3b6 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 6
+#define PHP_RELEASE_VERSION 7
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.6-dev"
-#define PHP_VERSION_ID 50606
+#define PHP_VERSION "5.6.7-dev"
+#define PHP_VERSION_ID 50607