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

Merge branch 'PHP-5.3' into PHP-5.4

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

36587ff335612e4dfe4723dab47954718f5a2878