]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.3:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)

1  2 
main/streams/streams.c

Simple merge