Mercurial > hg > nginx-vendor-current
view src/event/ngx_event_mutex.c @ 656:9d21dad0b5a1 NGINX_1_1_12
nginx 1.1.12
*) Change: a "proxy_pass" directive without URI part now uses changed
URI after redirection with the "error_page" directive;
Thanks to Lanshun Zhou.
*) Feature: the "proxy/fastcgi/scgi/uwsgi_cache_lock",
"proxy/fastcgi/scgi/uwsgi_cache_lock_timeout" directives.
*) Feature: the "pcre_jit" directive.
*) Feature: the "if" SSI command supports captures in regular
expressions.
*) Bugfix: the "if" SSI command did not work inside the "block" command.
*) Bugfix: the "limit_conn_log_level" and "limit_req_log_level"
directives might not work.
*) Bugfix: the "limit_rate" directive did not allow to use full
throughput, even if limit value was very high.
*) Bugfix: the "sendfile_max_chunk" directive did not work, if the
"limit_rate" directive was used.
*) Bugfix: a "proxy_pass" directive without URI part always used
original request URI if variables were used.
*) Bugfix: a "proxy_pass" directive without URI part might use original
request after redirection with the "try_files" directive;
Thanks to Lanshun Zhou.
*) Bugfix: in the ngx_http_scgi_module.
*) Bugfix: in the ngx_http_mp4_module.
*) Bugfix: nginx could not be built on Solaris; the bug had appeared in
1.1.9.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 26 Dec 2011 00:00:00 +0400 |
parents | 46833bd150cb |
children | d0f7a625f27c |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev */ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_event.h> ngx_int_t ngx_event_mutex_timedlock(ngx_event_mutex_t *m, ngx_msec_t timer, ngx_event_t *ev) { ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, "lock event mutex %p lock:%XD", m, m->lock); if (m->lock) { if (m->events == NULL) { m->events = ev; } else { m->last->next = ev; } m->last = ev; ev->next = NULL; #if (NGX_THREADS0) ev->light = 1; #endif ngx_add_timer(ev, timer); return NGX_AGAIN; } m->lock = 1; return NGX_OK; } ngx_int_t ngx_event_mutex_unlock(ngx_event_mutex_t *m, ngx_log_t *log) { ngx_event_t *ev; if (m->lock == 0) { ngx_log_error(NGX_LOG_ALERT, log, 0, "tring to unlock the free event mutex %p", m); return NGX_ERROR; } ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0, "unlock event mutex %p, next event: %p", m, m->events); m->lock = 0; if (m->events) { ev = m->events; m->events = ev->next; ev->next = (ngx_event_t *) ngx_posted_events; ngx_posted_events = ev; } return NGX_OK; }