#9896 Documentation for wgSquidServers. Patch by Loic Dachary.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d6f987f..e80ca37 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -52,6 +52,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7070) monobook/user.gif has antialias artifacts
 * (bug 9877) Fix Catalan translation of rev-deleted-text-view
 * (bug 9123) Safer way when applying $wgLocalTZoffset
+* (bug 9896) Documentation for $wgSquidServers and X-FORWARDED-FOR
 
 
 == Maintenance script changes since 1.10 ==

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index dce78a8..5f4bacf 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1245,7 +1245,11 @@ $wgSquidMaxage = 18000;
 
 /**
  * A list of proxy servers (ips if possible) to purge on changes don't specify
- * ports here (80 is default)
+ * ports here (80 is default). When mediawiki is running behind a proxy, its
+ * address should be listed in $wgSquidServers otherwise mediawiki won't rely
+ * on the X-FORWARDED-FOR header to determine the user IP address and
+ * all users will appear to come from the proxy IP address. Don't use domain
+ * names here, only IP adresses.
  */
 # $wgSquidServers = array('127.0.0.1');
 $wgSquidServers = array();