From: Daniel Lowrey Date: Tue, 9 Sep 2014 16:25:36 +0000 (-0600) Subject: Merge branch 'PHP-5.6' X-Git-Tag: POST_PHP7_EREG_MYSQL_REMOVALS~4^2~16 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13695a5ead2e65990d702139088101789c57e929;p=php Merge branch 'PHP-5.6' * PHP-5.6: Bug #41631: Fix regression from first attempt (6569db8) Bug #67965: Fix blocking behavior in non-blocking crypto streams --- 13695a5ead2e65990d702139088101789c57e929