com php-src: Merge branch 'PHP-5.6': EXTENSIONS

Commit: 320b9ef44b84aa8e7df6204ebf1c37c21dbfe5cb Author: Dmitry Stogov <dmitry@zend.com> Wed, 8 Oct 2014 21:54:05 +0400 Parents: 7fd3375fb5c74274fb7186c332681f420f1aed23 aec519199be5a10e5dc7c4c361e49128325a3b86 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=320b9ef44b84aa8e7df6204ebf1c37c21dbfe5cb Log: Merge branch 'PHP-5.6' * PHP-5.6: Added info about ext/opcache Conflicts: EXTENSIONS Changed paths: MM EXTENSIONS Diff: diff --cc EXTENSIONS index 757a1a8,fd454df..00a78ec --- a/EXTENSIONS +++ b/EXTENSIONS @@@ -421,6 -428,28 +421,12 @@@ PRIMARY MAINTAINER: Derick Rethans <de MAINTENANCE: Maintained STATUS: Working ------------------------------------------------------------------------------- -EXTENSION: mhash -PRIMARY MAINTAINER: Sascha Schumann <sascha@schumann.cx>, Scott MacVicar <scottmac@php.net> -MAINTENANCE: Unknown -STATUS: Working -------------------------------------------------------------------------------- -EXTENSION: mime_magic -PRIMARY MAINTAINER: Unknown -MAINTENANCE: Deprecated -STATUS: Experimental -COMMENT: Use the fileinfo extension instead -------------------------------------------------------------------------------- -EXTENSION: ming -PRIMARY MAINTAINER: Frank M. Kromann -MAINTENANCE: Unknown -STATUS: Experimental -------------------------------------------------------------------------------- + EXTENSION: opcache + PRIMARY MAINTAINER: Dmitry Stogov <dmitry@zend.com>, Xinchen Hui <laruence@php.net> + MAINTENANCE: Maintained + STATUS: Working + SINCE: 5.5.0 + ------------------------------------------------------------------------------- EXTENSION: openssl PRIMARY MAINTAINER: Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net> MAINTENANCE: Maintained