]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0fece5 d69b3d8)
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Wed, 31 Jul 2013 10:24:30 +0000 (14:24 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 31 Jul 2013 10:24:30 +0000 (14:24 +0400)
* PHP-5.5:
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

Conflicts:
NEWS

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

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