summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2012-04-23 12:34:17 +0200
committerAndreas Gohr <andi@splitbrain.org>2012-04-23 12:34:17 +0200
commit3891d3ec0d32f09040f0c0a13889c01db23783ae (patch)
treee42d344cd92950e3d5ce0e63d8e1949fff93ff55 /conf
parentf77b4d4f96b5465f08cb42f7b536842e371d629e (diff)
parent22ef1e32c51ac82df8d6a03e1e95876100e8f6c1 (diff)
downloadrpg-3891d3ec0d32f09040f0c0a13889c01db23783ae.tar.gz
rpg-3891d3ec0d32f09040f0c0a13889c01db23783ae.tar.bz2
Merge branch 'master' into phpunit
* master: added option to disable reverse DNS lookups
Diffstat (limited to 'conf')
-rw-r--r--conf/dokuwiki.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 35f946b10..cbd42115d 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -158,6 +158,7 @@ $conf['renderer_xhtml'] = 'xhtml'; //renderer to use for main page generat
$conf['readdircache'] = 0; //time cache in second for the readdir operation, 0 to deactivate.
/* Network Settings */
+$conf['dnslookups'] = 1; //disable to disallow IP to hostname lookups
// Proxy setup - if your Server needs a proxy to access the web set these
$conf['proxy']['host'] = '';
$conf['proxy']['port'] = '';