From: Stanislav Malyshev <stas@php.net>
Date: Mon, 7 May 2012 19:12:48 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=857fc1b473f5d27ed5ea6aa78420498dbb71c6b6;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  improve fix for CVE-2012-1823
  Fix for CVE-2012-1823
---

857fc1b473f5d27ed5ea6aa78420498dbb71c6b6