]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 653c869 c4dd65c)
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)
* PHP-5.6:
  Fix buffer growth in sockets/conversion.c
  Implements extended error messages

1  2 
ext/sockets/conversions.c patch | diff1 | diff2 | blob | history

diff --cc ext/sockets/conversions.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.