]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Tue, 29 Dec 2015 07:49:52 +0000 (15:49 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 29 Dec 2015 07:49:52 +0000 (15:49 +0800)
* PHP-7.0:
  Fixed info while setting opcache.file_cache_only
  Drop extra line
  Add CVE for #71105 (PHP 7.0.1)

1  2 
ext/opcache/zend_accelerator_module.c

Simple merge