com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/ZendAccelerator.c
| From: | Dmitry Stogov | Date: | Tue, 26 Nov 2013 17:59:02 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74065@lists.php.net to get a copy of this message | ||
Commit: 834eaae52d4aba7c7e92c87f424e73bff8bd711e
Author: Dmitry Stogov <dmitry@zend.com> Tue, 26 Nov 2013 21:59:02 +0400
Parents: 19f0e188f21ccb4706e68a81463599a9e611e7a8 de658171360cc480105eaf932f94c15b24687a83
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=834eaae52d4aba7c7e92c87f424e73bff8bd711e
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed opcahce_reset() crash when opcache.protect_memory is set
Changed paths:
MM ext/opcache/ZendAccelerator.c
Diff: