com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/ZendAccelerator.c
| From: | Dmitry Stogov | Date: | Fri, 08 Nov 2013 12:36:31 +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-73899@lists.php.net to get a copy of this message | ||
Commit: 0e5c5072e698438ee9857979cf8418805865518a
Author: Dmitry Stogov <dmitry@zend.com> Fri, 8 Nov 2013 16:36:31 +0400
Parents: 4e6a0bd5a996fc36282eb4666488a9ef1d0d7d5a 915c428ba1006a144c4fca45e44631ec058a5074
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=0e5c5072e698438ee9857979cf8418805865518a
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working
with OPcache enabled).
Conflicts:
NEWS
Bugs:
https://bugs.php.net/115
https://bugs.php.net/149
Changed paths:
MM ext/opcache/ZendAccelerator.c
Diff: