diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-10-19 12:33:58 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-10-19 12:33:58 +0000 |
commit | c2068d08f097383b8eac508117e6d405627e6cef (patch) | |
tree | 06ca21df58481e97289a566f42703102c0b6583c /src/os/unix/ngx_freebsd_rfork_thread.h | |
parent | 8743f92a1acd46c0a4b0df2bf6a80fc1b110affb (diff) | |
download | nginx-c2068d08f097383b8eac508117e6d405627e6cef.tar.gz nginx-c2068d08f097383b8eac508117e6d405627e6cef.zip |
nginx-0.3.3-RELEASE importrelease-0.3.3
*) Change: the "bl" and "af" parameters of the "listen" directive was
renamed to the "backlog" and "accept_filter".
*) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen"
directive.
*) Change: the "$msec" log parameter does not require now the
additional the gettimeofday() system call.
*) Feature: the -t switch now tests the "listen" directives.
*) Bugfix: if the invalid address was specified in the "listen"
directive, then after the -HUP signal nginx left an open socket in
the CLOSED state.
*) Bugfix: the mime type may be incorrectly set to default value for
index file with variable in the name; the bug had appeared in 0.3.0.
*) Feature: the "timer_resolution" directive.
*) Feature: the millisecond "$upstream_response_time" log parameter.
*) Bugfix: a temporary file with client request body now is removed
just after the response header was transferred to a client.
*) Bugfix: OpenSSL 0.9.6 compatibility.
*) Bugfix: the SSL certificate and key file paths could not be relative.
*) Bugfix: the "ssl_prefer_server_ciphers" directive did not work in
the ngx_imap_ssl_module.
*) Bugfix: the "ssl_protocols" directive allowed to specify the single
protocol only.
Diffstat (limited to 'src/os/unix/ngx_freebsd_rfork_thread.h')
-rw-r--r-- | src/os/unix/ngx_freebsd_rfork_thread.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/os/unix/ngx_freebsd_rfork_thread.h b/src/os/unix/ngx_freebsd_rfork_thread.h index 79e748a00..20957a5ff 100644 --- a/src/os/unix/ngx_freebsd_rfork_thread.h +++ b/src/os/unix/ngx_freebsd_rfork_thread.h @@ -55,7 +55,8 @@ extern char *ngx_freebsd_kern_usrstack; extern size_t ngx_thread_stack_size; -static ngx_inline ngx_int_t ngx_gettid() +static ngx_inline ngx_int_t +ngx_gettid() { char *sp; @@ -97,7 +98,8 @@ ngx_err_t ngx_thread_set_tls(ngx_tls_key_t key, void *value); #define ngx_thread_set_tls_n "the tls key setting" -static void *ngx_thread_get_tls(ngx_tls_key_t key) +static void * +ngx_thread_get_tls(ngx_tls_key_t key) { if (key >= NGX_THREAD_KEYS_MAX) { return NULL; @@ -108,9 +110,9 @@ static void *ngx_thread_get_tls(ngx_tls_key_t key) #define ngx_mutex_trylock(m) ngx_mutex_dolock(m, 1) -#define ngx_mutex_lock(m) ngx_mutex_dolock(m, 0) +#define ngx_mutex_lock(m) (void) ngx_mutex_dolock(m, 0) ngx_int_t ngx_mutex_dolock(ngx_mutex_t *m, ngx_int_t try); -ngx_int_t ngx_mutex_unlock(ngx_mutex_t *m); +void ngx_mutex_unlock(ngx_mutex_t *m); typedef int (*ngx_rfork_thread_func_pt)(void *arg); |