From: Dmitry Stogov Date: Tue, 10 Mar 2015 16:32:38 +0000 (+0300) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~716 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d0bacfe679d53ee1fd712c473e7e2cd51f24f6d;p=php Merge branch 'PHP-5.6' * PHP-5.6: We don't cache custom strems with callbacks anymore Conflicts: ext/opcache/ZendAccelerator.c --- 5d0bacfe679d53ee1fd712c473e7e2cd51f24f6d