delta/php-git.git/Zend/zend_alloc.c, branch php-5.5.30 git.php.net: repository/php-src.git Merge the fix for #69703 to 5.5 per request from Julien 2015-05-28T14:54:02+00:00 Kalle Sommer Nielsen kalle@php.net 2015-05-28T14:54:02+00:00 c4e9651b587e1ebcf3e2de7a2d3d586c0cc3e0c4 






Merge branch 'PHP-5.4' into PHP-5.5
2015-05-12T21:24:15+00:00

Stanislav Malyshev
stas@php.net

2015-05-12T21:24:15+00:00

c08f9c2c786b0f7cbb401c18f6634cb5773f5baf

* PHP-5.4:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
	ext/pcntl/pcntl.c
	ext/standard/basic_functions.c
	ext/standard/pack.c
	ext/standard/tests/dir/opendir_variation1-win32.phpt





* PHP-5.4:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
	ext/pcntl/pcntl.c
	ext/standard/basic_functions.c
	ext/standard/pack.c
	ext/standard/tests/dir/opendir_variation1-win32.phpt







Fix bug #69403 and other int overflows
2015-05-10T09:20:08+00:00

Stanislav Malyshev
stas@php.net

2015-05-10T09:20:08+00:00

c591f022f8abb4c0c2e60a037a0c0c5c5a125957












Bump year
2015-01-15T15:26:03+00:00

Xinchen Hui
laruence@php.net

2015-01-15T15:09:28+00:00

73c1be26531f730d64d61962b56eaf28ce3fc6aa












Bump year
2014-01-03T03:06:16+00:00

Xinchen Hui
laruence@php.net

2014-01-03T03:06:16+00:00

47c902777297ce895aa915c13efdb00881af3669












Bump year
2014-01-03T03:04:26+00:00

Xinchen Hui
laruence@php.net

2014-01-03T03:04:26+00:00

c0d060f5c02db168f1de895b41afffbc6e3cacfb












Fixed ZEND_MM_MEM_TYPE=mmap_zero
2013-12-26T07:51:32+00:00

Dmitry Stogov
dmitry@zend.com

2013-12-26T07:51:32+00:00

6414fe283e3931d87416a155f4cfbaaf5ffca1ad












Fix assembly of safe_address() for aarch64
2013-07-04T08:25:38+00:00

Ard Biesheuvel
ard.biesheuvel@linaro.org

2013-07-04T08:25:38+00:00

47e21a2c407e7b11b3ffc76b308d7f5c58ceca7e












fix assembly of safe_address() for x86 and x86_64
2013-07-03T21:56:02+00:00

Nuno Lopes
nlopess@php.net

2013-07-03T21:53:46+00:00

c652cc93ec5ce8f1833d023159804ebd56e1a94e












fix assembly of safe_address() for x86 and x86_64
2013-07-03T21:55:18+00:00

Nuno Lopes
nlopess@php.net

2013-07-03T21:53:46+00:00

40cbceaf71f3431b43c245704d82f06c8bb4c2de