From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 11 Sep 2006 16:24:05 +0000 (+0000)
Subject: * Patch from Recai to kill utf-8 on the wiki name when generating the
X-Git-Tag: 1.27~94
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1e7be2d3ddd28c9437b099d88575c8ec70f4041c;p=ikiwiki.git

* Patch from Recai to kill utf-8 on the wiki name when generating the
  session cookie.
---

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 074971be1..01c5812ef 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -614,7 +614,7 @@ sub cgi () { #{{{
 		cgi_hyperestraier();
 	}
 	
-	CGI::Session->name("ikiwiki_session_$config{wikiname}");
+	CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
 	
 	my $oldmask=umask(077);
 	my $session = CGI::Session->new("driver:DB_File", $q,
diff --git a/debian/changelog b/debian/changelog
index 7eb45e021..5b77574a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ ikiwiki (1.27) UNRELEASED; urgency=low
   * If an inlined page has a permalink, link the page title to that.
   * Patch from Recai to use utf8 when reading the setup file, so that
     utf8 wikinames from there will be used properly.
+  * Patch from Recai to kill utf-8 on the wiki name when generating the
+    session cookie.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 10 Sep 2006 14:06:01 -0400