Merge branch 'PHP-5.6' into PHP-5.6.4

* PHP-5.6: the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody. 5.5.21 now
update NEWS
2026-11-15 05:00:49 +00:00 · 2014-11-27 00:15:16 +01:00 · 2014-11-26 23:20:45 +01:00 · 2014-11-26 23:19:41 +01:00 · 2014-11-26 19:24:07 +01:00
3 changed files with 6 additions and 8 deletions
@@ -1,7 +1,5 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2015, PHP 5.6.5
-
 11 Dec 2014, PHP 5.6.4

 - Core:
@@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...);

 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=6
-PHP_RELEASE_VERSION=5
-PHP_EXTRA_VERSION="-dev"
+PHP_RELEASE_VERSION=4
+PHP_EXTRA_VERSION="RC1"
 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`

@@ -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 5
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.5-dev"
-#define PHP_VERSION_ID 50605
+#define PHP_RELEASE_VERSION 4
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "5.6.4RC1"
+#define PHP_VERSION_ID 50604
Author	SHA1	Message	Date
Ferenc Kovacs	5b098036e8	Merge branch 'PHP-5.6' into PHP-5.6.4 * PHP-5.6: the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody. 5.5.21 now	2014-11-27 00:15:16 +01:00
Ferenc Kovacs	25b119ef62	update NEWS	2014-11-26 23:20:45 +01:00
Ferenc Kovacs	bddacad8a9	Merge branch 'PHP-5.6' into PHP-5.6.4 * PHP-5.6: #68446 is fixed	2014-11-26 23:19:41 +01:00
Ferenc Kovacs	74796926a2	5.6.4RC1	2014-11-26 19:24:07 +01:00