Mercurial > hg > nginx-vendor-current
annotate src/core/ngx_shmtx.h @ 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 | 4d05413aebad |
children | d0f7a625f27c |
rev | line source |
---|---|
160 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #ifndef _NGX_SHMTX_H_INCLUDED_ | |
8 #define _NGX_SHMTX_H_INCLUDED_ | |
9 | |
10 | |
11 #include <ngx_config.h> | |
12 #include <ngx_core.h> | |
13 | |
14 | |
15 typedef struct { | |
650 | 16 ngx_atomic_t lock; |
17 #if (NGX_HAVE_POSIX_SEM) | |
18 ngx_atomic_t wait; | |
19 #endif | |
20 } ngx_shmtx_sh_t; | |
21 | |
22 | |
23 typedef struct { | |
160 | 24 #if (NGX_HAVE_ATOMIC_OPS) |
25 ngx_atomic_t *lock; | |
624 | 26 #if (NGX_HAVE_POSIX_SEM) |
650 | 27 ngx_atomic_t *wait; |
624 | 28 ngx_uint_t semaphore; |
29 sem_t sem; | |
30 #endif | |
160 | 31 #else |
32 ngx_fd_t fd; | |
33 u_char *name; | |
34 #endif | |
624 | 35 ngx_uint_t spin; |
160 | 36 } ngx_shmtx_t; |
37 | |
38 | |
650 | 39 ngx_int_t ngx_shmtx_create(ngx_shmtx_t *mtx, ngx_shmtx_sh_t *addr, |
40 u_char *name); | |
160 | 41 void ngx_shmtx_destory(ngx_shmtx_t *mtx); |
624 | 42 ngx_uint_t ngx_shmtx_trylock(ngx_shmtx_t *mtx); |
43 void ngx_shmtx_lock(ngx_shmtx_t *mtx); | |
44 void ngx_shmtx_unlock(ngx_shmtx_t *mtx); | |
650 | 45 ngx_uint_t ngx_shmtx_force_unlock(ngx_shmtx_t *mtx, ngx_pid_t pid); |
160 | 46 |
47 | |
48 #endif /* _NGX_SHMTX_H_INCLUDED_ */ |