Update $wgProxyScriptPath default path to point to valid file, as per http://mail...

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index b74751a..36255bd 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -87,10 +87,21 @@ $wgScriptPath           = '/wiki';
 
 /**
  * Whether to support URLs like index.php/Page_title
+ * These often break when PHP is set up in CGI mode, so
+ * ignore PATH_INFO for CGI unless cgi.fix_pathinfo is
+ * set.
+ *
+ * Override this to false if $_SERVER['PATH_INFO']
+ * contains unexpectedly incorrect garbage.
+ *
+ * Note that having this incorrectly set to true can
+ * cause redirect loops when "pretty URLs" are used.
+ *
  * @global bool $wgUsePathInfo
  */
-$wgUsePathInfo         = ( strpos( php_sapi_name(), 'cgi' ) === false );
-
+$wgUsePathInfo         =
+       ( strpos( php_sapi_name(), 'cgi' ) === false ) ||
+       isset( $_SERVER['ORIG_PATH_INFO'] );
 
 /**#@+
  * Script users will request to get articles
@@ -424,6 +435,12 @@ $wgEnableEmail = true;
  */
 $wgEnableUserEmail = true;
 
+/**
+ * Minimum time, in hours, which must elapse between password reminder
+ * emails for a given account. This is to prevent abuse by mail flooding.
+ */
+$wgPasswordReminderResendTime = 24;
+
 /**
  * SMTP Mode
  * For using a direct (authenticated) SMTP server connection.
@@ -913,6 +930,7 @@ $wgGroupPermissions['emailconfirmed']['emailconfirmed'] = true;
 // from various log pages by default
 $wgGroupPermissions['bot'  ]['bot']             = true;
 $wgGroupPermissions['bot'  ]['autoconfirmed']   = true;
+$wgGroupPermissions['bot'  ]['nominornewtalk']  = true;
 
 // Most extra permission abilities go to this group
 $wgGroupPermissions['sysop']['block']           = true;
@@ -997,7 +1015,7 @@ $wgBlockOpenProxies = false;
 /** Port we want to scan for a proxy */
 $wgProxyPorts = array( 80, 81, 1080, 3128, 6588, 8000, 8080, 8888, 65506 );
 /** Script used to scan */
-$wgProxyScriptPath = "$IP/proxy_check.php";
+$wgProxyScriptPath = "$IP/includes/proxy_check.php";
 /** */
 $wgProxyMemcExpiry = 86400;
 /** This should always be customised in LocalSettings.php */
@@ -1030,7 +1048,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '11';
+$wgStyleVersion = '31';
 
 # Server-side caching:
 
@@ -1132,6 +1150,7 @@ $wgMaxSquidPurgeTitles = 400;
 $wgHTCPPort = 4827;
 $wgHTCPMulticastTTL = 1;
 # $wgHTCPMulticastAddress = "224.0.0.85";
+$wgHTCPMulticastAddress = false;
 
 # Cookie settings:
 #
@@ -1163,6 +1182,8 @@ $wgAllowExternalImagesFrom = '';
 $wgMiserMode = false;
 /** Disable all query pages if miser mode is on, not just some */
 $wgDisableQueryPages = false;
+/** Number of rows to cache in 'querycache' table when miser mode is on */
+$wgQueryCacheLimit = 1000;
 /** Generate a watchlist once every hour or so */
 $wgUseWatchlistCache = false;
 /** The hour or so mentioned above */
@@ -1433,7 +1454,7 @@ if( !isset( $wgCommandLineMode ) ) {
 # Recent changes settings
 #
 
-/** Log IP addresses in the recentchanges table */
+/** Log IP addresses in the recentchanges table; can be accessed only by extensions (e.g. CheckUser) or a DB admin */
 $wgPutIPinRC = true;
 
 /**
@@ -2051,6 +2072,7 @@ $wgDisableHardRedirects = false;
  * Use http.dnsbl.sorbs.net to check for open proxies
  */
 $wgEnableSorbs = false;
+$wgSorbsUrl = 'http.dnsbl.sorbs.net';
 
 /**
  * Proxy whitelist, list of addresses that are assumed to be non-proxy despite what the other
@@ -2299,4 +2321,17 @@ $wgDjvuPostProcessor = 'ppmtojpeg';
 $wgEnableAPI = true;
 $wgEnableWriteAPI = false;
 
+/**
+ * Parser test suite files to be run by parserTests.php when no specific
+ * filename is passed to it.
+ *
+ * Extensions may add their own tests to this array, or site-local tests
+ * may be added via LocalSettings.php
+ *
+ * Use full paths.
+ */
+$wgParserTestFiles = array(
+       "$IP/maintenance/parserTests.txt",
+);
+
 ?>