From: Stanislav Malyshev Date: Tue, 4 Aug 2015 23:33:07 +0000 (-0700) Subject: Merge branch 'PHP-5.6' X-Git-Tag: php-7.0.0beta3~1^2~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b6dd533ba285740671642cfbb7872e6ec46b6cb;p=php Merge branch 'PHP-5.6' * PHP-5.6: virtual_file_ex uses emalloc in 5.6+ --- 7b6dd533ba285740671642cfbb7872e6ec46b6cb