diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-10-10 16:59:41 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-10-10 16:59:41 +0400 |
commit | 1bfa7bc78a23c0150e0bbf854e778dba4df30031 (patch) | |
tree | 25779bc18366a22cabccd56a89e0af11025d7c8a /src/os/unix | |
parent | b29779caaf628afc28baffb71763f0725da2e0e4 (diff) |
nginx-0.3.1-RELEASE importrelease-0.3.1
*) Bugfix: the segmentation fault occurred when the signal queue
overflowed if the "rtsig" method was used; the bug had appeared in
0.2.0.
*) Change: correct handling of the "\\", "\"", "\'", and "\$" pairs in
SSI.
Diffstat (limited to 'src/os/unix')
-rw-r--r-- | src/os/unix/ngx_freebsd_rfork_thread.h | 1 | ||||
-rw-r--r-- | src/os/unix/ngx_process.h | 4 | ||||
-rw-r--r-- | src/os/unix/ngx_process_cycle.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/os/unix/ngx_freebsd_rfork_thread.h b/src/os/unix/ngx_freebsd_rfork_thread.h index 215d2dc86..79e748a00 100644 --- a/src/os/unix/ngx_freebsd_rfork_thread.h +++ b/src/os/unix/ngx_freebsd_rfork_thread.h @@ -14,7 +14,6 @@ typedef pid_t ngx_tid_t; -#undef ngx_log_pid #define ngx_log_pid ngx_thread_self() #define ngx_log_tid 0 diff --git a/src/os/unix/ngx_process.h b/src/os/unix/ngx_process.h index 06ff21cfe..a34ca6142 100644 --- a/src/os/unix/ngx_process.h +++ b/src/os/unix/ngx_process.h @@ -51,7 +51,11 @@ typedef struct { #define ngx_getpid getpid + +#ifndef ngx_log_pid #define ngx_log_pid ngx_pid +#endif + ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle, ngx_spawn_proc_pt proc, void *data, char *name, ngx_int_t respawn); diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 97475e60d..029de436f 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -703,7 +703,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data) for ( ;; ) { if (ngx_exiting - && ngx_event_timer_rbtree == &ngx_event_timer_sentinel) + && ngx_event_timer_rbtree.root == ngx_event_timer_rbtree.sentinel) { ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting"); |