]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 19 Aug 2014 08:34:09 +0000 (01:34 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 19 Aug 2014 08:34:09 +0000 (01:34 -0700)
commitb278be894fcd0f2cbaee93e3f657f7f9beeb532f
tree64a396b4b4c1b3abab6f991673e24e320cad54cc
parent335d89ec4d35d68d6443c7d51f99451a58c35b46
parent5a7039035ce22a68130af2309ff002a611976c87
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  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
ext/gd/gd_ctx.c
main/network.c