]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: beed288 16e95d9)
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)
commit436ca2d019ed3ec3183129f9a3a7e329446077e9
tree7a366ae101da58942c8793fcc45fc5f5daeade5dtree | snapshot
parentbeed28844bd4e0806ebc29aa71900fbbc40e1c1acommit | diff
parent16e95d91378591042c1bf4bd40dead3ef9ae975acommit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.

Conflicts:
NEWS
ext/opcache/ZendAccelerator.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.