]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Wed, 25 Sep 2013 08:15:01 +0000 (12:15 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 25 Sep 2013 08:15:01 +0000 (12:15 +0400)
* PHP-5.5:
  Added function opcache_compile_file() to load PHP scripts into cache without execution.

Conflicts:
NEWS

1  2 
ext/opcache/ZendAccelerator.c
ext/opcache/ZendAccelerator.h

Simple merge
Simple merge