From: David Soria Parra <dsp@php.net>
Date: Sat, 5 May 2012 15:37:35 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~232^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3a13c2a108fd9edbab93dc4656979c6ccaff1fb;p=php

Merge branch 'PHP-5.4'

By Rasmus Lerdorf
* PHP-5.4:
  Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9dab068d477b241d8fd872e3a7c829b3)
  Fix for CVE-2012-1823
---

d3a13c2a108fd9edbab93dc4656979c6ccaff1fb