Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix integer overflow in {stream,file}_{get,put}_contents()

diff --cc ext/standard/file.c
Simple merge

diff --cc ext/standard/streamsfuncs.c
Simple merge