Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index d7d7f65b823e7ca06c90dc457bfb49490d59fe92..31e30ad2ebb3cd2e8da33996a2e3b8cbcf890da9 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -59,7 +59,7 @@ EOF
                # the benefit of this optimisation.
                $check_commit_hook=<<"EOF";
        {
-               int fd=open("$config{wikistatedir}/commitlock", O_CREAT | O_RDWR);
+               int fd=open("$config{wikistatedir}/commitlock", O_CREAT | O_RDWR, 0666);
                if (fd != -1) {
                        if (flock(fd, LOCK_SH | LOCK_NB) != 0)
                                exit(0);
@@ -72,12 +72,16 @@ EOF
                # Avoid more than one ikiwiki cgi running at a time by
                # taking a cgi lock. Since ikiwiki uses several MB of
                # memory, a pile up of processes could cause thrashing
-               # otherwise.
+               # otherwise. The fd of the lock is stored in
+               # IKIWIKI_CGILOCK_FD so unlockwiki can close it.
                $pre_exec=<<"EOF";
        {
-               int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR);
-               if (fd != -1)
-                       flock(fd, LOCK_EX);
+               int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
+               if (fd != -1 && flock(fd, LOCK_EX) == 0) {
+                       char *fd_s;
+                       asprintf(&fd_s, "%i", fd);
+                       setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
+               }
        }
 EOF
        }