]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Wed, 2 Jul 2014 07:55:15 +0000 (09:55 +0200)
committerMichael Wallner <mike@php.net>
Wed, 2 Jul 2014 07:55:15 +0000 (09:55 +0200)
commit1e06c73192c64ecc601ad265ed5666e90048c4b4
tree51586a60e3acef4959fb8825ca1dc1db23077a2b
parent2e02f18b154bb00279e5d121cc36beea7b9b8f37
parent34e686c5562bfd289d330f5dae2dafec4e58a20c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix integer overflow in {stream,file}_{get,put}_contents()
ext/standard/file.c
ext/standard/streamsfuncs.c