]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88c48a4 eb23606)
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)
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


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