com php-src: Merge branch 'PHP-5.6': ext/opcache/ZendAccelerator.c
| From: | Dmitry Stogov | Date: | Tue, 10 Mar 2015 16:32:38 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/opcache/ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85443@lists.php.net to get a copy of this message | ||
Commit: 5d0bacfe679d53ee1fd712c473e7e2cd51f24f6d
Author: Dmitry Stogov <dmitry@zend.com> Tue, 10 Mar 2015 19:32:38 +0300
Parents: a53d82daa6d8de6e020a656b9b275a0b5dbcde4c b52a2940af7144486f0b2861bf737274aa00e87f
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=5d0bacfe679d53ee1fd712c473e7e2cd51f24f6d
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
We don't cache custom strems with callbacks anymore
Conflicts:
ext/opcache/ZendAccelerator.c
Changed paths:
MM ext/opcache/ZendAccelerator.c
Diff: