From: Joe Watkins Date: Tue, 10 Jan 2017 11:51:39 +0000 (+0000) Subject: Merge branch 'PHP-7.0' into PHP-7.1 X-Git-Tag: php-7.1.2RC1~96 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cddc85c1ffa696decbcd2bd6c783893fc2bf82e;p=php Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Prevent fd leak in readdir_r that causes false negative on readdir_r implementation when compiled with AddressSanitizer --- 4cddc85c1ffa696decbcd2bd6c783893fc2bf82e