From: Stanislav Malyshev <stas@php.net>
Date: Tue, 19 Aug 2014 08:34:09 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.17RC1~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b278be894fcd0f2cbaee93e3f657f7f9beeb532f;p=php

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

b278be894fcd0f2cbaee93e3f657f7f9beeb532f