]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorNikita Popov <nikic@php.net>
Sun, 6 May 2012 11:33:47 +0000 (13:33 +0200)
committerNikita Popov <nikic@php.net>
Sun, 6 May 2012 11:33:47 +0000 (13:33 +0200)
commitbef6111609bc05ae99f9392e507a47ae09ef72f9
tree67aa9398c54a3f6e69c476fb9a742a30d4ed9f4f
parent0747b29bdf43be0682d10bdfc788f12f19ccf443
parent304ac568c56799e60d90fadad3a936b61cab281b
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
main/streams/streams.c