* (bug 3826) Normalize some invalid cookie name characters when setting

  up $wgCookiePrefix. Completes application of patch by Anders Kaseorg.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ac4b6cd..f77ad24 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -347,6 +347,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Disable MySQL's strict mode at session start for MySQL 4.1+, to avoid the 
   various problems that occur when it is on.
 * (bug 9585) Fix regression in tidy usage in Special:Undelete previews
+* (bug 3826) Normalize some invalid cookie name characters when setting
+  up $wgCookiePrefix. Completes application of patch by Anders Kaseorg.
+
 
 == Maintenance ==
 

diff --git a/includes/Setup.php b/includes/Setup.php
index eaffbe1..47ba494 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -133,6 +133,7 @@ if ( $wgDBprefix ) {
 } else {
        $wgCookiePrefix = $wgDBname;
 }
+$wgCookiePrefix = strtr($wgCookiePrefix, "=,; +.\"'\\[", "__________");
 
 # If session.auto_start is there, we can't touch session name
 #