Fix bug #62129 - rfc1867 crashes php even though turned off

Patch by gxd305 at gmail dot com
Merge branch 'PHP-5.4' into PHP-5.5

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

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