From: Dayllan Maza <dmaza@wikimedia.org>
Date: Thu, 5 Sep 2019 21:41:55 +0000 (-0400)
Subject: Enable $wgCookieSetOnAutoblock and $wgCookieSetOnIpBlock by default
X-Git-Tag: 1.34.0-rc.0~365^2
X-Git-Url: http://git.cyclocoop.org/wiki/%7B%7Bpath%7D%7Dmw-config/index.php?a=commitdiff_plain;h=264b81875f256fdb1b21cad5e111bfaf48f7ce4a;p=lhc%2Fweb%2Fwiklou.git

Enable $wgCookieSetOnAutoblock and $wgCookieSetOnIpBlock by default

Bug: T191922
Change-Id: I339f9a23c7f19be97d0b0a1abf0242fdbb6ac891
---

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 275f4c2fb5..179f252332 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -66,6 +66,7 @@ For notes on 1.33.x and older releases, see HISTORY.
   which was deprecated in 1.30, no longer works. Instead, $wgProxyList should be
   an array with IP addresses as the values, or a string path to a file
   containing one IP address per line.
+* $wgCookieSetOnAutoblock and $wgCookieSetOnIpBlock are now enabled by default.
 * …
 
 ==== Removed configuration ====
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5a874d5bcb..413c7a27e7 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -6074,7 +6074,7 @@ $wgSessionName = false;
  * which case there is a possibility of an attacker discovering the names of revdeleted users, so
  * it is best to use this in conjunction with $wgSecretKey being set).
  */
-$wgCookieSetOnAutoblock = false;
+$wgCookieSetOnAutoblock = true;
 
 /**
  * Whether to set a cookie when a logged-out user is blocked. Doing so means that a blocked user,
@@ -6083,7 +6083,7 @@ $wgCookieSetOnAutoblock = false;
  * case there is a possibility of an attacker discovering the names of revdeleted users, so it
  * is best to use this in conjunction with $wgSecretKey being set).
  */
-$wgCookieSetOnIpBlock = false;
+$wgCookieSetOnIpBlock = true;
 
 /** @} */ # end of cookie settings }