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/win32/ngx_process_cycle.c | |
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/win32/ngx_process_cycle.c')
-rw-r--r-- | src/os/win32/ngx_process_cycle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index 7eabefe5c..be363e258 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -10,7 +10,7 @@ #include <nginx.h> -static void *ngx_worker_thread_cycle(void *data); +static ngx_thread_value_t __stdcall ngx_worker_thread_cycle(void *data); static long __stdcall ngx_window_procedure(HWND window, u_int message, u_int wparam, long lparam); @@ -202,7 +202,7 @@ ngx_single_process_cycle(ngx_cycle_t *cycle) } -static void * +static ngx_thread_value_t __stdcall ngx_worker_thread_cycle(void *data) { ngx_cycle_t *cycle; @@ -212,10 +212,10 @@ ngx_worker_thread_cycle(void *data) while (!ngx_quit) { ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "worker cycle"); - ngx_process_events(cycle); + ngx_process_events_and_timers(cycle); } - return NULL; + return 0; } |