]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Fri, 8 Jun 2012 08:22:46 +0000 (01:22 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 8 Jun 2012 08:22:46 +0000 (01:22 -0700)
commit59eaa7c877e6bacb4783f929b924e2582c4a82f1
treee584e89208fd3b70df1b1bd27240db691e89eecc
parent0e3a650e748b2bf79147d76a4739e17f3817c10c
parentfc74503792b1ee92e4b813690890f3ed38fa3ad5
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  improve overflow checks
  fix potential overflow in _php_stream_scandir
main/streams/streams.c