From 8ce6855061b2a071d1ae7a3266a300835b492c05 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Thu, 13 May 2010 18:07:48 +0000 Subject: [PATCH] Followup r66364, add WinCache support to installer --- includes/installer/Installer.i18n.php | 5 +++-- includes/installer/Installer.php | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php index 35126317a9..745be2ae9c 100644 --- a/includes/installer/Installer.i18n.php +++ b/includes/installer/Installer.i18n.php @@ -115,7 +115,8 @@ The installation may fail!", 'config-xcache' => '[http://trac.lighttpd.net/xcache/ XCache] installed', 'config-apc' => '[http://www.php.net/apc APC] installed', 'config-eaccel' => '[http://eaccelerator.sourceforge.net/ eAccelerator] installed', - 'config-no-cache' => "'''Warning:''' Could not find [http://eaccelerator.sourceforge.net eAccelerator], [http://www.php.net/apc APC] or [http://trac.lighttpd.net/xcache/ XCache]. + 'config-wincache' => '[http://www.iis.net/download/WinCacheForPhp WinCache] installed', + 'config-no-cache' => "'''Warning:''' Could not find [http://eaccelerator.sourceforge.net eAccelerator], [http://www.php.net/apc APC], [http://trac.lighttpd.net/xcache/ XCache] or [http://www.iis.net/download/WinCacheForPhp WinCache]. Object caching is not enabled.", 'config-diff3-good' => 'Found GNU diff3: $1.', 'config-diff3-bad' => 'GNU diff3 not found.', @@ -399,7 +400,7 @@ Enter the license name manually.', Medium to large sites are highly encouraged to enable this, and small sites will see benefits as well.', 'config-cache-none' => 'No caching. No functionality is removed, but speed may be impacted.', - 'config-cache-accel' => 'PHP object caching (APC, eAccelerator or XCache)', + 'config-cache-accel' => 'PHP object caching (APC, eAccelerator, XCache or WinCache)', 'config-cache-memcached' => 'Use Memcached (requires additional setup and configuration)', 'config-cache-db' => 'Cache data into the database', 'config-cache-anything' => 'MediaWiki will attempt to cache data anywhere possible, except in Memcached, unless indicated explicitely', diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index ac683361eb..b0e7f576ac 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -142,7 +142,8 @@ abstract class Installer { var $objectCaches = array( 'xcache' => 'xcache_get', 'apc' => 'apc_fetch', - 'eaccel' => 'eaccelerator_get' + 'eaccel' => 'eaccelerator_get', + 'wincache' => 'wincache_ucache_get' ); /** -- 2.20.1