]> granicus.if.org Git - php/commit
Merge tag 'PHP-5.4.32' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Tue, 19 Aug 2014 08:33:45 +0000 (01:33 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 19 Aug 2014 08:33:45 +0000 (01:33 -0700)
commit5a7039035ce22a68130af2309ff002a611976c87
tree87530c1ed34ffa32c50a444d93c2b17d3f6f130e
parent88c48a4b95376a22a571b82a946431826b0dd61b
parenteb2360602e256c608ea0c5f6be0ec5ec085999f3
Merge tag 'PHP-5.4.32' into PHP-5.4

5.4.32

* tag 'PHP-5.4.32':
  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

Conflicts:
configure.in
main/php_version.h