]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Wed, 18 Dec 2013 15:21:21 +0000 (19:21 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 18 Dec 2013 15:21:21 +0000 (19:21 +0400)
* PHP-5.5:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.

Conflicts:
NEWS

1  2 
ext/opcache/ZendAccelerator.c

Simple merge