From: Pierre Joye <pierre.php@gmail.com>
Date: Tue, 9 Apr 2013 08:04:32 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta3~3^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d6c367177e58b238de67133edff6f14c0a2343b;p=php

Merge branch 'PHP-5.4' into PHP-5.5

# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
---

4d6c367177e58b238de67133edff6f14c0a2343b