delta/php-git.git, branch php-5.6.4

Merge branch 'PHP-5.5' into PHP-5.6

2014-12-17T01:25:00+00:00

* PHP-5.5:
  update news
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()

Conflicts:
	ext/standard/var_unserializer.c

fix NEWS

2014-12-17T01:19:35+00:00

update the date of the release

2014-12-16T17:26:48+00:00

move the test to the right place

2014-12-10T13:14:22+00:00

5.6.4

2014-12-10T13:12:55+00:00

Fixed bug #68545 NULL pointer dereference in unserialize.c

2014-12-10T12:58:20+00:00

Conflicts:
	ext/standard/var_unserializer.c

Fixed possible read after end of buffer and use after free.

2014-12-10T12:33:13+00:00

Fixed day_of_week function as it could sometimes return negative values internally.

2014-12-10T12:32:58+00:00

Merge branch 'PHP-5.6' into PHP-5.6.4

2014-11-26T23:15:16+00:00

* 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

Merge branch 'PHP-5.5' into PHP-5.6

2014-11-26T23:13:11+00:00

* PHP-5.5:
  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

Conflicts:
	configure.in
	main/php_version.h