]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e1ac55 3550f3d)
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Tue, 30 Jul 2013 13:36:47 +0000 (17:36 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 30 Jul 2013 13:36:47 +0000 (17:36 +0400)
* PHP-5.5:
  Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).

Conflicts:
NEWS

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

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