]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a53d82d b52a294)
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Tue, 10 Mar 2015 16:32:38 +0000 (19:32 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 10 Mar 2015 16:32:38 +0000 (19:32 +0300)
* PHP-5.6:
  We don't cache custom strems with callbacks anymore

Conflicts:
ext/opcache/ZendAccelerator.c

1  2 
ext/opcache/ZendAccelerator.c patch | diff1 | diff2 | blob | history

diff --cc ext/opcache/ZendAccelerator.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.