]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Fri, 7 Nov 2014 07:24:25 +0000 (10:24 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 7 Nov 2014 07:24:25 +0000 (10:24 +0300)
commit2afb5df4da4b27c42444a2ac9523b57c26e31459
treed96d5ecb9a62c7c1c14b0a993692ebbadab5547b
parent6b4b972565e38c41f1ce43c3a475e41e186b0f0c
parente6581d52cc12664c2c9d470a32848c9b0bae8217
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix opcache.revalidate_freq per-request behavior

Conflicts:
ext/opcache/ZendAccelerator.h
ext/opcache/ZendAccelerator.c
ext/opcache/ZendAccelerator.h