]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Mon, 23 Dec 2013 08:52:27 +0000 (12:52 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 23 Dec 2013 08:52:27 +0000 (12:52 +0400)
* PHP-5.6:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  fix news
  opcodes
  opcodes

Conflicts:
NEWS

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

Simple merge
Simple merge
Simple merge