From d389b0e4a45ebd88705f3bb95bf2e19e10e6ca2a Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 20 Nov 2006 12:03:35 +0000
Subject: * Avoid locking the wiki at all when handling some basic cgi stuff  
 (searches, recentchanges).

---
 IkiWiki/CGI.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 53237bcdb..14861e398 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -67,8 +67,6 @@ sub decode_form_utf8 ($) { #{{{
 sub cgi_recentchanges ($) { #{{{
 	my $q=shift;
 	
-	unlockwiki();
-
 	# Optimisation: building recentchanges means calculating lots of
 	# links. Memoizing htmllink speeds it up a lot (can't be memoized
 	# during page builds as the return values may change, but they
@@ -715,6 +713,9 @@ sub cgi (;$$) { #{{{
 	elsif ($do eq 'hyperestraier') {
 		cgi_hyperestraier();
 	}
+
+	# Need to lock the wiki before getting a session.
+	lockwiki();
 	
 	if (! $session) {
 		CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
-- 
cgit v1.2.3