]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorSara Golemon <sgolemon@fb.com>
Wed, 17 Jun 2015 20:34:42 +0000 (13:34 -0700)
committerSara Golemon <sgolemon@fb.com>
Wed, 17 Jun 2015 20:34:42 +0000 (13:34 -0700)
commit51a259f378434f373a4c4a86c364a1b83f6ade7f
tree4f30571a573f2ae7db61569747c4fd28965434a9
parent653c869348b7626d43a30f67be9362fbcce10d2b
parentc4dd65c723a0b7dd5547142a1cf6309b86161969
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix buffer growth in sockets/conversion.c
  Implements extended error messages
ext/sockets/conversions.c