diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-02-01 18:22:15 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-02-01 18:22:15 +0000 |
| commit | 9e58019dc287493e02543d614c975cc14295a71e (patch) | |
| tree | 328bccfba6e86794eafc546a7cb7ec8aff007b7f /src/event/ngx_event_busy_lock.c | |
| parent | e8038c0d1a044f2046d5f7adeb1586d17a5bd81a (diff) | |
| download | nginx-release-0.3.24.tar.gz nginx-release-0.3.24.zip | |
nginx-0.3.24-RELEASE importrelease-0.3.24
*) Workaround: for bug in FreeBSD kqueue.
*) Bugfix: now a response generated by the "post_action" directive is
not transferred to a client.
*) Bugfix: the memory leaks were occurring if many log files were used.
*) Bugfix: the first "proxy_redirect" directive was working inside one
location.
*) Bugfix: on 64-bit platforms segmentation fault may occurred on start
if the many names were used in the "server_name" directives; the bug
had appeared in 0.3.18.
Diffstat (limited to 'src/event/ngx_event_busy_lock.c')
| -rw-r--r-- | src/event/ngx_event_busy_lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event/ngx_event_busy_lock.c b/src/event/ngx_event_busy_lock.c index 1b09ad96c..2d0bad571 100644 --- a/src/event/ngx_event_busy_lock.c +++ b/src/event/ngx_event_busy_lock.c @@ -20,7 +20,6 @@ static void ngx_event_busy_lock_posted_handler(ngx_event_t *ev); * NGX_AGAIN: the all busy locks are held but we will wait the specified time * NGX_BUSY: ctx->timer == 0: there are many the busy locks * ctx->timer != 0: there are many the waiting locks - * NGX_ERROR: an error occured while the mutex locking */ ngx_int_t @@ -36,6 +35,7 @@ ngx_event_busy_lock(ngx_event_busy_lock_t *bl, ngx_event_busy_lock_ctx_t *ctx) if (bl->busy < bl->max_busy) { bl->busy++; + rc = NGX_OK; } else if (ctx->timer && bl->waiting < bl->max_waiting) { |