]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 19 Aug 2014 08:34:25 +0000 (01:34 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 19 Aug 2014 08:34:25 +0000 (01:34 -0700)
* PHP-5.5:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1


Trivial merge