From: Sara Golemon <sgolemon@fb.com>
Date: Wed, 17 Jun 2015 20:34:42 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha2~2^2~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51a259f378434f373a4c4a86c364a1b83f6ade7f;p=php

Merge branch 'PHP-5.6'

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

51a259f378434f373a4c4a86c364a1b83f6ade7f