]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 25050e3 c814b32)
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Tue, 10 Mar 2015 16:30:32 +0000 (19:30 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 10 Mar 2015 16:30:32 +0000 (19:30 +0300)
commitb52a2940af7144486f0b2861bf737274aa00e87f
tree148f0e12d95db199821fef8d6bc4bc0efe1dae80tree | snapshot
parent25050e3b00b448056ac780510923e076e7dcd270commit | diff
parentc814b3294ad72baad8d9da52dbef81dcafded451commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  We don't cache custom strems with callbacks anymore
ext/opcache/ZendAccelerator.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.