com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h
| From: | Dmitry Stogov | Date: | Tue, 30 Jul 2013 13:36:47 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5': ext/opcache/ZendAccelerator.c ext/opcache/ZendAccelerator.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72769@lists.php.net to get a copy of this message | ||
Commit: 0aa342e903bf012efe03db1e9f1fe4ed54225e76
Author: Dmitry Stogov <dmitry@zend.com> Tue, 30 Jul 2013 17:36:47 +0400
Parents: 5e1ac558c3354f98a9a5aecb5b518c46cd55357a 3550f3d0aad6e979e2a6fe3ee40d4fbff168c34b
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=0aa342e903bf012efe03db1e9f1fe4ed54225e76
Log:
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Conflicts:
NEWS
Bugs:
https://bugs.php.net/65338
Changed paths:
MM ext/opcache/ZendAccelerator.c
MM ext/opcache/ZendAccelerator.h
Diff: