]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Wed, 2 Jul 2014 07:56:05 +0000 (09:56 +0200)
committerMichael Wallner <mike@php.net>
Wed, 2 Jul 2014 07:56:05 +0000 (09:56 +0200)
commit122ee0a1cf2b31ae2497fada3900848382fbfb70
tree2acf976c47e1920512abc269a75a7919b0df5eb1
parentd5d95f89351a72db7108d05fc9a86c949d4d5084
parent1e06c73192c64ecc601ad265ed5666e90048c4b4
Merge branch 'PHP-5.5' into PHP-5.6

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