From: Arpad Ray <arraypad@gmail.com>
Date: Wed, 17 Jul 2013 10:05:23 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d3d739bf784d215dc3b8c45ab2a4fafd2a590b3;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #62129 - rfc1867 crashes php even though turned off
---

0d3d739bf784d215dc3b8c45ab2a4fafd2a590b3