Compare commits

...
21 Commits
Author SHA1 Message Date
Ferenc Kovacs 2d4b95e0e2 bump the version to RC2 2014-07-02 02:23:22 +02:00
Ferenc Kovacs a0be642ecf Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (70 commits)
  add some missing NEWS entries
  NEWS block for 5.6.0RC3
  Fix ext/pgsql builds with libpq < 7.3.
  updated libs_version.txt
  updated libs_version.txt
  updated libmagic.patch in 5.6+
  updated libmagic.patch
  Fixed possible crash because of race conditions on modifying constants in shared memory
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
  --enable-fpm for the travis build
  fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
  NEWS
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
  adding NEWS entry for the fix for bug #65641
  Updated NEWS file for recent phpdbg fixes
  Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent
  ...

Conflicts:
	NEWS
2014-07-02 02:21:53 +02:00
Ferenc Kovacs 6c80e90e23 5.6.0RC1 2014-06-19 02:42:55 +02:00
Ferenc Kovacs a4e23ef8a3 Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (117 commits)
  add missing entry to NEWS
  add missing entry to NEWS
  add NEWS block for 5.6.0RC2
  Add support for gb18030/MySQL 5.7
  Fix another problem with MySQL 5.7
  new test, missing in ea466a3
  Suppress test failure with MySQL 5.7
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  NEWS
  Fix Request #67453 Allow to unserialize empty data.
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
  Fix patch for bug #67436
  ...

Conflicts:
	NEWS
2014-06-19 02:42:32 +02:00
Ferenc Kovacs 69797e81ed PHP-5.6.0beta4 2014-06-04 03:22:06 +02:00
Ferenc Kovacs 4ed1713789 Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (51 commits)
  Fix tests
  Fix possible segfault depending on memory location...
  fix gcov data with some locales (again)
  Update NEWS
  Fixed startup segfault in non-debug builds Fixes issue #87
  Fixed regression introduced by patch for bug #67072
  Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files
  (re)add cve number in NEWS, from 5.4.29
  NEWS
  NEWS
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
  add NEWS block for 5.6.0RC1
  Update NEWs
  Update NEWs
  Fixed bug #67359 (Segfault in recursiveDirectoryIterator)
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
  updated libmagic.patch for 5.6+
  updated libmagic.patch for 5.4+
  ...

Conflicts:
	NEWS
2014-06-04 03:22:00 +02:00
Ferenc Kovacs 57e698d582 5.6.0beta3 2014-05-14 09:58:22 +02:00
Ferenc Kovacs 7e35e8b9ef 5.6.0beta3 2014-05-14 09:57:23 +02:00
Ferenc Kovacs a2edb3e7e4 Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (56 commits)
  adding NEWS block for beta4
  5.4.30 next
  enable email notifications
  update NEWS
  update NEWS
  update NEWS
  - Updated to version 2014.3 (2014c)
  fix test - output can be chunked
  fix test
  Fixed test for commit 997be125eb
  Add bug fix to NEWS
  Update UPGRADING according to bug fix
  improve CURL tests to allow testing without separate server
  Fixed bug #67199	mb_regex_encoding mishmash
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  ...

Conflicts:
	NEWS
2014-05-14 09:56:02 +02:00
Ferenc Kovacs a964242f19 5.6.0beta2 2014-05-01 16:42:03 +02:00
Ferenc Kovacs ce20287810 Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (271 commits)
  one heading is enough
  add new NEWS block for alpha3
  XFAIL the leaking multibyte tests, we should really get to the bottom of this
  Fixed numbering in UPGRADING file
  Updated NEWS for fixed phpdbg issue #85
  Added stdion/stdout/stderr constsnts and their php:// wrappers Fixes issue #85
  add missing NEWS entry to the correct release where it was added
  5.5.12 was released yesterday
  add missing NEWS entry to the correct release where it was added
  Updated NEWS entry for phpdbg
  add missing NEWS entry to the correct release where it was added
  add some missing NEWS entries
  fix test locality inconsitency
  BFN
  fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
  Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
  Fix bug #67060: use default mode of 660
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory
  ...

Conflicts:
	NEWS
2014-05-01 16:40:20 +02:00
Ferenc Kovacs 11d102ebbc Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6:
  fix typo
  fix typo
  fix typo
2014-04-10 07:11:48 +02:00
Ferenc Kovacs eb44463e35 5.6.0beta1 2014-04-10 06:49:31 +02:00
Ferenc Kovacs b3b1c0b63d remove the beta2 news block as we don't need that in the release tag 2014-04-10 06:47:25 +02:00
Ferenc Kovacs 8871aa912f Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (240 commits)
  add a NEWS block for beta2
  add missing entries to NEWS
  abstract namespace for unix sockets is a linux only feature
  Don't test for specific non-zero substr_compare() return value
  Add only_integer_keys option to zend_hash_reindex
  Don't always separate splice replacement array
  Add zend_hash_splice
  Add zend_hash_reindex
  Remove some usages of hashtable internals
  Updated NEWS
  fixed bug66702 : regexiterator's invert flag doesn't work as expected
  Updated NEWS for #67043
  Fixed bug 67043
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
  updated libs versions
  fixed the test for ICI >= 52.1
  Fix Linux specific fail in error traces Linux apparently does not like memcpy in overlapping regions...
  add missing skip to the output, so we actually skip this test
  fix the test according to how new date code does it
  ...
2014-04-10 06:45:31 +02:00
Ferenc Kovacs dae8ff251c 5.6.0alpha3 2014-02-27 02:36:56 +01:00
Ferenc Kovacs 79bfef5ba3 Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (136 commits)
  fix tests broken by 633f898f15
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  Deprecate CN_match in favor of peer_name in SSL contexts
  Remove cURL close policy related constants
  Update stack size in tests/func/010.phpt
  Don't add num_additional_args in SEND opcodes
  Disallow use of positional args after unpacking
  Store arg_num in fcall entry
  Introduce zend_function_call_entry structure
  move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged
  rearrange the NEWS blocks a bit
  add NEWS block for 5.6.0 beta1
  restored that test part in ext/openssl to enable notify/wait
  remove echo
  fix stdin reading in new openssl tests
  ...
2014-02-27 02:35:58 +01:00
Ferenc Kovacs 326ab8b147 5.6.0alpha2 2014-02-12 09:45:18 +01:00
Ferenc Kovacs 99bd2fd9c4 Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (97 commits)
  update the alpha2 release date
  Fixed ZTS and added fix to NEWS.
  Implemented feature #45528: Allow the DateTimeZone constructor to accept timezones per offset too.
  Rename timelib_get_zone to timelib_parse_zone and export.
  fix regex to detect valgrind version New PCRE version got stricter
  fix regex to detect valgrind version New PCRE version got stricter
  Fixed memory leak in pow operator
  5.5.9 now released
  Added information in NEWS and UPGRADING
  add T_POW (**) operator
  add NEWS block for 5.6.0alpha3
  updated libs_version.txt
  updated libs_version.txt
  update libs_version.txt
  more tests for ICU >= 52.1 compat
  fix tests for ICU >= 52.1
  Fix year
  adapt test to curl 7.35.0 upgrade
  move the NEWS entry into the right section
  Fixed SNI failure from missing Z_STRVAL_PP
  ...
2014-02-12 06:43:05 +01:00
Ferenc Kovacs 1f148f7ad9 Revert "5.6.0alpha1"
This reverts commit 8648f76bac.
2014-02-06 03:55:53 +01:00
Ferenc Kovacs 8648f76bac 5.6.0alpha1 2014-01-21 02:30:07 +01:00
3 changed files with 3 additions and 5 deletions

No files matched your search

-2
View File
@@ -1,7 +1,5 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2014, PHP 5.6.0 Release Candidate 3
03 Jul 2014, PHP 5.6.0 Release Candidate 2
- Core:
+1 -1
View File
@@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=6
PHP_RELEASE_VERSION=0
PHP_EXTRA_VERSION="-dev"
PHP_EXTRA_VERSION="RC2"
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 -2
View File
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 6
#define PHP_RELEASE_VERSION 0
#define PHP_EXTRA_VERSION "-dev"
#define PHP_VERSION "5.6.0-dev"
#define PHP_EXTRA_VERSION "RC2"
#define PHP_VERSION "5.6.0RC2"
#define PHP_VERSION_ID 50600