Merge commit '156f70912213b6520e9056050a8827de66e80176' into sipb

[ikiwiki.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index f9630a982c3de2d87671d044425c758860f97b07..fa378a9abc544cdf05a59f762950050d28ada2e5 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -95,7 +95,7 @@ EOF
                # IKIWIKI_CGILOCK_FD so unlockwiki can close it.
                $pre_exec=<<"EOF";
        lockfd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
-       if (lockfd != -1 && flock(lockfd, LOCK_EX) == 0) {
+       if (lockfd != -1 && lockf(lockfd, F_LOCK, 0) == 0) {
                char *fd_s=malloc(8);
                sprintf(fd_s, "%i", lockfd);
                setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);