urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* In the cgi edit path, reload the index file before rendering. A bug 

showed up where a web edit that added a page caused a near-concurrent
  web edit to fail in will_render. While it would be hard to reproduce this,
  my analysis is that the failing cgi started first, loaded the index file
  (prior to locking) then the other cgi created the new page and rendered
  it, and then the failing cgi choked on the new file when _it_ tried to
  render it. Ensuring that the index file is loaded after taking the lock
  will avoid this bug.
master
joey 2007-10-10 18:40:54 +00:00
parent 66a137848f
commit 278b16c79a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/CGI.pm
View File

@ -596,6 +596,10 @@ sub cgi_editpage ($$) { #{{{
# may have been committed while the post-commit hook was
# disabled.
require IkiWiki::Render;
# Reload index, since the first time it's loaded is before
# the wiki is locked, and things may have changed in the
# meantime.
loadindex();
refresh();
saveindex();

10
debian/changelog vendored
View File

@ -3,8 +3,16 @@ ikiwiki (2.10) UNRELEASED; urgency=low
* Tidy ctime debug output for git.
* French translation update. Closes: #445923
* Fix --get-ctime with git, needed to remove srcdir from filename.
* In the cgi edit path, reload the index file before rendering. A bug
showed up where a web edit that added a page caused a near-concurrent
web edit to fail in will_render. While it would be hard to reproduce this,
my analysis is that the failing cgi started first, loaded the index file
(prior to locking) then the other cgi created the new page and rendered
it, and then the failing cgi choked on the new file when _it_ tried to
render it. Ensuring that the index file is loaded after taking the lock
will avoid this bug.
-- Joey Hess <joeyh@debian.org> Wed, 10 Oct 2007 14:14:18 -0400
-- Joey Hess <joeyh@debian.org> Wed, 10 Oct 2007 14:36:38 -0400
ikiwiki (2.9) unstable; urgency=low