From: Stanislav Malyshev <stas@php.net>
Date: Tue, 19 Aug 2014 08:33:45 +0000 (-0700)
Subject: Merge tag 'PHP-5.4.32' into PHP-5.4
X-Git-Tag: php-5.4.33RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a7039035ce22a68130af2309ff002a611976c87;p=php

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
---

5a7039035ce22a68130af2309ff002a611976c87