delta/php-git.git, branch php-7.0.0beta3 git.php.net: repository/php-src.git sync NEWS 2015-08-05T04:56:40+00:00 Anatol Belski ab@php.net 2015-08-05T04:56:40+00:00 1674bd9b151ff389fb8c9fc223bc6aafdd49ff2c 






Merge branch 'master' into PHP-7.0.0
2015-08-05T04:15:16+00:00

Anatol Belski
ab@php.net

2015-08-05T04:15:16+00:00

69168b4d0c775db0721e23f2ae75d242e4accc3c

* master: (24 commits)
  5.5.29 next
  fix merge
  fix test
  fix merge
  fix test
  virtual_file_ex uses emalloc in 5.6+
  __wakeup doesn't have to be final
  update NEWS
  fix test
  update NEWS
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fixed bug #70098 (Real memory usage doesn't decrease)
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  ...





* master: (24 commits)
  5.5.29 next
  fix merge
  fix test
  fix merge
  fix test
  virtual_file_ex uses emalloc in 5.6+
  __wakeup doesn't have to be final
  update NEWS
  fix test
  update NEWS
  Fix bug #70019 - limit extracted files to given directory
  Do not do convert_to_* on unserialize, it messes up references
  Fixed bug #70098 (Real memory usage doesn't decrease)
  Fix #69793 - limit what we accept when unserializing exception
  Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList)
  Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject
  ignore signatures for packages too
  Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage
  Fixed bug #69892
  Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes
  ...







Merge branch 'PHP-5.6'
2015-08-05T07:01:10+00:00

Stanislav Malyshev
stas@php.net

2015-08-05T07:01:10+00:00

03b765173b5776c2eaa585b809efad2a46fe5708

* PHP-5.6:
  5.5.29 next





* PHP-5.6:
  5.5.29 next







Merge branch 'PHP-5.5' into PHP-5.6
2015-08-05T07:00:54+00:00

Stanislav Malyshev
stas@php.net

2015-08-05T07:00:54+00:00

362bbaa2dc3ed32de6095bad2f77a7650845260b

* PHP-5.5:
  5.5.29 next

Conflicts:
	configure.in
	main/php_version.h





* PHP-5.5:
  5.5.29 next

Conflicts:
	configure.in
	main/php_version.h







5.5.29 next
2015-08-05T06:59:55+00:00

Stanislav Malyshev
stas@php.net

2015-08-05T06:59:55+00:00

15e9f4baf48f1a02091d1dbf505d9c6d561bc1d4












fix merge
2015-08-05T06:51:55+00:00

Stanislav Malyshev
stas@php.net

2015-08-05T06:41:00+00:00

feeb2fba93a451c467ec70963995ca6371b3a568












fix test
2015-08-04T23:47:44+00:00

Stanislav Malyshev
stas@php.net

2015-08-04T23:47:44+00:00

6981bc32be1d31b4efe54696b6da24940566ee04












fix merge
2015-08-04T23:46:53+00:00

Stanislav Malyshev
stas@php.net

2015-08-04T23:46:53+00:00

3e416bba90860a7037cfa66d6725dc33a3436bea












Merge branch 'PHP-5.6'
2015-08-04T23:46:38+00:00

Stanislav Malyshev
stas@php.net

2015-08-04T23:46:38+00:00

21602ec21986375ed90242ad43015d99ae3251ab

* PHP-5.6:
  fix test

Conflicts:
	sapi/cli/tests/005.phpt





* PHP-5.6:
  fix test

Conflicts:
	sapi/cli/tests/005.phpt







Merge branch 'PHP-5.5' into PHP-5.6
2015-08-04T23:45:55+00:00

Stanislav Malyshev
stas@php.net

2015-08-04T23:45:55+00:00

54187fa4b953d9d908a844d802cfe20472776ff5

* PHP-5.5:
  fix test





* PHP-5.5:
  fix test