# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1238603969 0
# Node ID 2a06634cd7bfa990fddca90a5a3aea68ba876bcb
# Parent  e3baaf7a9bde793861cb3c07bd9c2d90dfbcf1de
r2564 merge:

compatibility with Tru64 UNIX: fcntl(F_SETLK, F_WRLCK) returns EINVAL if busy

diff -r e3baaf7a9bde -r 2a06634cd7bf src/core/ngx_shmtx.h
--- a/src/core/ngx_shmtx.h	Wed Apr 01 16:36:47 2009 +0000
+++ b/src/core/ngx_shmtx.h	Wed Apr 01 16:39:29 2009 +0000
@@ -57,7 +57,15 @@
         return 0;
     }
 
-    ngx_log_abort(err, ngx_trylock_fd_n " failed");
+#if __osf__ /* Tru64 UNIX */
+
+    if (err == NGX_EACCESS) {
+        return 0;
+    }
+
+#endif
+
+    ngx_log_abort(err, ngx_trylock_fd_n " %s failed", mtx->name);
 
     return 0;
 }
@@ -74,7 +82,7 @@
         return;
     }
 
-    ngx_log_abort(err, ngx_lock_fd_n " failed");
+    ngx_log_abort(err, ngx_lock_fd_n " %s failed", mtx->name);
 }
 
 
@@ -89,7 +97,7 @@
         return;
     }
 
-    ngx_log_abort(err, ngx_unlock_fd_n " failed");
+    ngx_log_abort(err, ngx_unlock_fd_n " %s failed", mtx->name);
 }