summaryrefslogtreecommitdiff
path: root/conf/dokuwiki.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2010-06-26 20:42:48 +0200
committerAndreas Gohr <andi@splitbrain.org>2010-06-26 20:42:48 +0200
commit7aeda574860428d96fa1660613646b5684c1a6ea (patch)
tree86dba527aab2586e75eb1f9b20a9b663ba6eb6c6 /conf/dokuwiki.php
parent57e71d49bbc194d78296c7447eb1bc46290c2744 (diff)
downloadrpg-7aeda574860428d96fa1660613646b5684c1a6ea.tar.gz
rpg-7aeda574860428d96fa1660613646b5684c1a6ea.tar.bz2
added proxy exception regexp FS#1247
Diffstat (limited to 'conf/dokuwiki.php')
-rw-r--r--conf/dokuwiki.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index f2a843f96..2405494e0 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -142,11 +142,12 @@ $conf['target']['media'] = '';
$conf['target']['windows'] = '';
//Proxy setup - if your Server needs a proxy to access the web set these
-$conf['proxy']['host'] = '';
-$conf['proxy']['port'] = '';
-$conf['proxy']['user'] = '';
-$conf['proxy']['pass'] = '';
-$conf['proxy']['ssl'] = 0;
+$conf['proxy']['host'] = '';
+$conf['proxy']['port'] = '';
+$conf['proxy']['user'] = '';
+$conf['proxy']['pass'] = '';
+$conf['proxy']['ssl'] = 0;
+$conf['proxy']['except'] = '';
/* Safemode Hack */