From: Stanislav Malyshev <stas@php.net>
Date: Tue, 19 Aug 2014 08:34:25 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~25^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fae17a00f556b7c1a2221289c46403bfb4367034;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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
---

fae17a00f556b7c1a2221289c46403bfb4367034