From: Julien Pauli <jpauli@php.net>
Date: Wed, 4 Feb 2015 15:37:49 +0000 (+0100)
Subject: 5.6.7 now
X-Git-Tag: PRE_PHP7_REMOVALS~13^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6ea244004d1e0a02d299f95fc3c77225c71ef7a;p=php

5.6.7 now
---

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