]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorSara Golemon <sgolemon@fb.com>
Wed, 17 Jun 2015 20:34:33 +0000 (13:34 -0700)
committerSara Golemon <sgolemon@fb.com>
Wed, 17 Jun 2015 20:34:33 +0000 (13:34 -0700)
commitc4dd65c723a0b7dd5547142a1cf6309b86161969
tree70ba602ad7221eb898319e90b21265ff0ed20458
parenteb702637a9a591d2b9da3a2f06d6c5437e8c3a7c
parentd241711f44e85c9c59e73c17244c867820ba89e8
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix buffer growth in sockets/conversion.c