Mercurial > hg > nginx-quic
diff src/os/win32/ngx_thread.c @ 563:9c2f3ed7a247 release-0.3.3
nginx-0.3.3-RELEASE import
*) 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.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 19 Oct 2005 12:33:58 +0000 |
parents | d4ea69372b94 |
children | d43d73277c5c |
line wrap: on
line diff
--- a/src/os/win32/ngx_thread.c +++ b/src/os/win32/ngx_thread.c @@ -14,13 +14,13 @@ ngx_int_t ngx_threads_n; static size_t stack_size; -ngx_err_t ngx_create_thread(ngx_tid_t *tid, void* (*func)(void *arg), void *arg, - ngx_log_t *log) +ngx_err_t +ngx_create_thread(ngx_tid_t *tid, + ngx_thread_value_t (__stdcall *func)(void *arg), void *arg, ngx_log_t *log) { ngx_err_t err; - *tid = CreateThread(NULL, stack_size, - (LPTHREAD_START_ROUTINE) func, arg, 0, NULL); + *tid = CreateThread(NULL, stack_size, func, arg, 0, NULL); if (*tid != NULL) { return 0; @@ -32,7 +32,8 @@ ngx_err_t ngx_create_thread(ngx_tid_t *t } -ngx_int_t ngx_init_threads(int n, size_t size, ngx_cycle_t *cycle) +ngx_int_t +ngx_init_threads(int n, size_t size, ngx_cycle_t *cycle) { stack_size = size; @@ -40,7 +41,8 @@ ngx_int_t ngx_init_threads(int n, size_t } -ngx_err_t ngx_thread_key_create(ngx_tls_key_t *key) +ngx_err_t +ngx_thread_key_create(ngx_tls_key_t *key) { *key = TlsAlloc(); @@ -52,7 +54,8 @@ ngx_err_t ngx_thread_key_create(ngx_tls_ } -ngx_err_t ngx_thread_set_tls(ngx_tls_key_t *key, void *data) +ngx_err_t +ngx_thread_set_tls(ngx_tls_key_t *key, void *data) { if (TlsSetValue(*key, data) == 0) { return ngx_errno; @@ -62,7 +65,8 @@ ngx_err_t ngx_thread_set_tls(ngx_tls_key } -ngx_mutex_t *ngx_mutex_init(ngx_log_t *log, ngx_uint_t flags) +ngx_mutex_t * +ngx_mutex_init(ngx_log_t *log, ngx_uint_t flags) { return (ngx_mutex_t *) 1; } @@ -70,15 +74,22 @@ ngx_mutex_t *ngx_mutex_init(ngx_log_t *l /* STUB */ -ngx_int_t +void ngx_mutex_lock(ngx_mutex_t *m) { - return NGX_OK; + return; } + ngx_int_t ngx_mutex_trylock(ngx_mutex_t *m) { return NGX_OK; } + +void +ngx_mutex_unlock(ngx_mutex_t *m) { + return; +} + /**/