com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/z end_accelerator_module.c
| From: | Dmitry Stogov | Date: | Fri, 21 Feb 2014 08:00:33 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/z end_accelerator_module.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76157@lists.php.net to get a copy of this message | ||
Commit: b9a87a5079e742b62b641f8521735325c69b762d
Author: Dmitry Stogov <dmitry@zend.com> Fri, 21 Feb 2014 12:00:33 +0400
Parents: dcf27a1f6f205a22ecff1e537de6b13b0f1187ad 884bbcd537aad1fcd0265515f69570a20abaf953
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b9a87a5079e742b62b641f8521735325c69b762d
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Added function opcache_is_script_cached(). (Danack)
Conflicts:
NEWS
Changed paths:
MM ext/opcache/zend_accelerator_module.c
Diff: