]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Tue, 26 Nov 2013 07:36:23 +0000 (11:36 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 26 Nov 2013 07:36:23 +0000 (11:36 +0400)
* PHP-5.5:
  Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
  bring the news

Conflicts:
NEWS

1  2 
ext/opcache/ZendAccelerator.c
ext/opcache/ZendAccelerator.h
ext/opcache/zend_accelerator_module.c
run-tests.php

Simple merge
Simple merge
Simple merge
diff --cc run-tests.php
Simple merge