summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-11 16:24:05 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-11 16:24:05 +0000
commit1e7be2d3ddd28c9437b099d88575c8ec70f4041c (patch)
tree63bfd1efe0bc7f9c4cfb8f42dcfb447b5053febf
parentc439d5a8abcbdac5e00e32362413cbe29c2d8f0e (diff)
* Patch from Recai to kill utf-8 on the wiki name when generating the
session cookie.
-rw-r--r--IkiWiki/CGI.pm2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
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