]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb70263 d241711)
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)
* PHP-5.5:
  Fix buffer growth in sockets/conversion.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.