From c9282508299944f15c62819224b8cad675d308f7 Mon Sep 17 00:00:00 2001
From: Victor Vasiliev <vasilievvv@users.mediawiki.org>
Date: Wed, 16 Jan 2008 18:03:52 +0000
Subject: [PATCH] * Add DBA-caching to installer

---
 RELEASE-NOTES        |  3 ++-
 config/index.php     | 14 +++++++++++++-
 images/tmp/.htaccess |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 images/tmp/.htaccess

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index af03bfab87..1aa8f28f2d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -129,7 +129,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12536) User should be able to get MediaWiki version from any page
 * (bug 12622) A JavaScript constant to declare whether api.php is available
 * Add caching to the AJAX search
-* Added APCOND_INGROUPS
+* Add APCOND_INGROUPS
+* Add DBA caching to installer 
 * (bug 18585) Added a bunch of parameters to the revertpage message
 
 
diff --git a/config/index.php b/config/index.php
index c4cf210cb1..781a356da1 100644
--- a/config/index.php
+++ b/config/index.php
@@ -478,6 +478,8 @@ if ( $conf->eaccel ) {
 	print "<li><a href=\"http://eaccelerator.sourceforge.net/\">eAccelerator</a> installed</li>\n";
 }
 
+$conf->dba = function_exists( 'dba_open' );
+
 if( !( $conf->turck || $conf->eaccel || $conf->apc || $conf->xcache ) ) {
 	echo( '<li>Couldn\'t find <a href="http://turck-mmcache.sourceforge.net">Turck MMCache</a>,
 		<a href="http://eaccelerator.sourceforge.net">eAccelerator</a>,
@@ -1204,7 +1206,7 @@ if( count( $errs ) ) {
 	</p>
 
 	<div class="config-input">
-		<label class='column'>Shared memory caching:</label>
+		<label class='column'>Object caching:</label>
 
 		<ul class="plain">
 		<li><?php aField( $conf, "Shm", "No caching", "radio", "none" ); ?></li>
@@ -1229,6 +1231,11 @@ if( count( $errs ) ) {
 				aField( $conf, "Shm", "eAccelerator", "radio", "eaccel" );
 				echo "</li>";
 			}
+			if ( $conf->dba ) {
+				echo "<li>";
+				aField( $conf, "Shm", "DBA", "radio", "dba" );
+				echo "</li>";
+			}
 		?>
 		<li><?php aField( $conf, "Shm", "Memcached", "radio", "memcached" ); ?></li>
 		</ul>
@@ -1240,6 +1247,7 @@ if( count( $errs ) ) {
 		<br /><br />
 		MediaWiki can also detect and support eAccelerator, Turck MMCache, APC, and XCache, but
 		these should not be used if the wiki will be running on multiple application servers.
+		You can also use DBA for storing object cache in the file.
 	</p>
 </div>
 
@@ -1500,6 +1508,10 @@ function writeLocalSettings( $conf ) {
 			$cacheType = 'CACHE_ACCEL';
 			$mcservers = 'array()';
 			break;
+		case 'dba':
+			$cacheType = 'CACHE_DBA';
+			$mcservers = 'array()';
+			break;
 		default:
 			$cacheType = 'CACHE_NONE';
 			$mcservers = 'array()';
diff --git a/images/tmp/.htaccess b/images/tmp/.htaccess
new file mode 100644
index 0000000000..c485a1a666
--- /dev/null
+++ b/images/tmp/.htaccess
@@ -0,0 +1 @@
+Order Allow,Deny
-- 
2.20.1