Mercurial > hg > nginx-vendor-current
comparison src/core/ngx_shmtx.h @ 460:bb941a2996a6 NGINX_0_7_42
nginx 0.7.42
*) Change: now the "Invalid argument" error returned by
setsockopt(TCP_NODELAY) on Solaris, is ignored.
*) Change: now if a file specified in a "auth_basic_user_file"
directive is absent, then the 405 error is returned instead of the
500 one.
*) Feature: the "auth_basic_user_file" directive supports variables.
Thanks to Kirill A. Korinskiy.
*) Feature: the "listen" directive supports the "ipv6only" parameter.
Thanks to Zhang Hua.
*) Bugfix: in an "alias" directive with references to captures of
regular expressions; the bug had appeared in 0.7.40.
*) Bugfix: compatibility with Tru64 UNIX.
Thanks to Dustin Marquess.
*) Bugfix: nginx could not be built without PCRE library; the bug had
appeared in 0.7.41.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 16 Mar 2009 00:00:00 +0300 |
parents | 5bef04fc3fd5 |
children | d4da38525468 |
comparison
equal
deleted
inserted
replaced
459:6ef558ffc0eb | 460:bb941a2996a6 |
---|---|
55 | 55 |
56 if (err == NGX_EAGAIN) { | 56 if (err == NGX_EAGAIN) { |
57 return 0; | 57 return 0; |
58 } | 58 } |
59 | 59 |
60 ngx_log_abort(err, ngx_trylock_fd_n " failed"); | 60 #if __osf__ /* Tru64 UNIX */ |
61 | |
62 if (err == NGX_EACCESS) { | |
63 return 0; | |
64 } | |
65 | |
66 #endif | |
67 | |
68 ngx_log_abort(err, ngx_trylock_fd_n " %s failed", mtx->name); | |
61 | 69 |
62 return 0; | 70 return 0; |
63 } | 71 } |
64 | 72 |
65 | 73 |
72 | 80 |
73 if (err == 0) { | 81 if (err == 0) { |
74 return; | 82 return; |
75 } | 83 } |
76 | 84 |
77 ngx_log_abort(err, ngx_lock_fd_n " failed"); | 85 ngx_log_abort(err, ngx_lock_fd_n " %s failed", mtx->name); |
78 } | 86 } |
79 | 87 |
80 | 88 |
81 static ngx_inline void | 89 static ngx_inline void |
82 ngx_shmtx_unlock(ngx_shmtx_t *mtx) | 90 ngx_shmtx_unlock(ngx_shmtx_t *mtx) |
87 | 95 |
88 if (err == 0) { | 96 if (err == 0) { |
89 return; | 97 return; |
90 } | 98 } |
91 | 99 |
92 ngx_log_abort(err, ngx_unlock_fd_n " failed"); | 100 ngx_log_abort(err, ngx_unlock_fd_n " %s failed", mtx->name); |
93 } | 101 } |
94 | 102 |
95 | 103 |
96 void ngx_shmtx_destory(ngx_shmtx_t *mtx); | 104 void ngx_shmtx_destory(ngx_shmtx_t *mtx); |
97 | 105 |