aboutsummaryrefslogtreecommitdiff
path: root/src/os/unix
diff options
context:
space:
mode:
Diffstat (limited to 'src/os/unix')
-rw-r--r--src/os/unix/ngx_aio_read_chain.c4
-rw-r--r--src/os/unix/ngx_freebsd_rfork_thread.c8
-rw-r--r--src/os/unix/ngx_freebsd_sendfile_chain.c2
-rw-r--r--src/os/unix/ngx_process_cycle.c8
-rw-r--r--src/os/unix/ngx_readv_chain.c6
-rw-r--r--src/os/unix/ngx_recv.c6
-rw-r--r--src/os/unix/ngx_writev_chain.c2
7 files changed, 18 insertions, 18 deletions
diff --git a/src/os/unix/ngx_aio_read_chain.c b/src/os/unix/ngx_aio_read_chain.c
index e850d3462..a2a12d23e 100644
--- a/src/os/unix/ngx_aio_read_chain.c
+++ b/src/os/unix/ngx_aio_read_chain.c
@@ -13,7 +13,7 @@ ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl)
ssize_t total;
ngx_err_t err;
- if (c->read->aio_eof) {
+ if (c->read->pending_eof) {
c->read->ready = 0;
return 0;
}
@@ -53,7 +53,7 @@ ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl)
}
if (n == 0) {
- c->read->aio_eof = 1;
+ c->read->pending_eof = 1;
if (total) {
c->read->eof = 0;
c->read->ready = 1;
diff --git a/src/os/unix/ngx_freebsd_rfork_thread.c b/src/os/unix/ngx_freebsd_rfork_thread.c
index 2c8dc69d0..aa3e78ba6 100644
--- a/src/os/unix/ngx_freebsd_rfork_thread.c
+++ b/src/os/unix/ngx_freebsd_rfork_thread.c
@@ -390,7 +390,7 @@ ngx_int_t ngx_mutex_dolock(ngx_mutex_t *m, ngx_int_t try)
op.sem_num = 0;
op.sem_op = -1;
- op.sem_flg = SEM_UNDO;
+ op.sem_flg = 0;
if (semop(m->semid, &op, 1) == -1) {
ngx_log_error(NGX_LOG_ALERT, m->log, ngx_errno,
@@ -514,7 +514,7 @@ ngx_int_t ngx_mutex_unlock(ngx_mutex_t *m)
op.sem_num = 0;
op.sem_op = 1;
- op.sem_flg = SEM_UNDO;
+ op.sem_flg = 0;
if (semop(m->semid, &op, 1) == -1) {
ngx_log_error(NGX_LOG_ALERT, m->log, ngx_errno,
@@ -590,7 +590,7 @@ ngx_int_t ngx_cond_wait(ngx_cond_t *cv, ngx_mutex_t *m)
op.sem_num = 0;
op.sem_op = -1;
- op.sem_flg = SEM_UNDO;
+ op.sem_flg = 0;
if (semop(cv->semid, &op, 1) == -1) {
ngx_log_error(NGX_LOG_ALERT, cv->log, ngx_errno,
@@ -618,7 +618,7 @@ ngx_int_t ngx_cond_signal(ngx_cond_t *cv)
op.sem_num = 0;
op.sem_op = 1;
- op.sem_flg = SEM_UNDO;
+ op.sem_flg = 0;
if (semop(cv->semid, &op, 1) == -1) {
ngx_log_error(NGX_LOG_ALERT, cv->log, ngx_errno,
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c
index affa02a7a..f79b79bc2 100644
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -53,7 +53,7 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
#if (HAVE_KQUEUE)
- if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) && wev->kq_eof) {
+ if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) && wev->pending_eof) {
ngx_log_error(NGX_LOG_INFO, c->log, wev->kq_errno,
"kevent() reported about an closed connection");
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index dd50bba25..8a0bd6f14 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -760,10 +760,10 @@ int ngx_worker_thread_cycle(void *data)
sigset_t set;
struct timeval tv;
- sigfillset(&set);
- sigdelset(&set, SIGALRM);
- sigdelset(&set, ngx_signal_value(NGX_TERMINATE_SIGNAL));
- sigdelset(&set, ngx_signal_value(NGX_SHUTDOWN_SIGNAL));
+ sigemptyset(&set);
+ sigaddset(&set, ngx_signal_value(NGX_RECONFIGURE_SIGNAL));
+ sigaddset(&set, ngx_signal_value(NGX_REOPEN_SIGNAL));
+ sigaddset(&set, ngx_signal_value(NGX_CHANGEBIN_SIGNAL));
err = ngx_thread_sigmask(SIG_BLOCK, &set, NULL);
if (err) {
diff --git a/src/os/unix/ngx_readv_chain.c b/src/os/unix/ngx_readv_chain.c
index ed66ca027..9458872b7 100644
--- a/src/os/unix/ngx_readv_chain.c
+++ b/src/os/unix/ngx_readv_chain.c
@@ -20,10 +20,10 @@ ssize_t ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) {
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"readv: eof:%d, avail:%d, err:%d",
- rev->kq_eof, rev->available, rev->kq_errno);
+ rev->pending_eof, rev->available, rev->kq_errno);
if (rev->available == 0) {
- if (rev->kq_eof) {
+ if (rev->pending_eof) {
rev->ready = 0;
rev->eof = 1;
@@ -85,7 +85,7 @@ ssize_t ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
*/
if (rev->available <= 0) {
- if (!rev->kq_eof) {
+ if (!rev->pending_eof) {
rev->ready = 0;
}
diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c
index 04b594f6e..d4d28d77d 100644
--- a/src/os/unix/ngx_recv.c
+++ b/src/os/unix/ngx_recv.c
@@ -17,10 +17,10 @@ ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) {
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"recv: eof:%d, avail:%d, err:%d",
- rev->kq_eof, rev->available, rev->kq_errno);
+ rev->pending_eof, rev->available, rev->kq_errno);
if (rev->available == 0) {
- if (rev->kq_eof) {
+ if (rev->pending_eof) {
rev->ready = 0;
rev->eof = 1;
@@ -64,7 +64,7 @@ ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
*/
if (rev->available <= 0) {
- if (!rev->kq_eof) {
+ if (!rev->pending_eof) {
rev->ready = 0;
}
diff --git a/src/os/unix/ngx_writev_chain.c b/src/os/unix/ngx_writev_chain.c
index fc2ee766e..aba218d72 100644
--- a/src/os/unix/ngx_writev_chain.c
+++ b/src/os/unix/ngx_writev_chain.c
@@ -24,7 +24,7 @@ ngx_chain_t *ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
#if (HAVE_KQUEUE)
- if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) && wev->kq_eof) {
+ if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) && wev->pending_eof) {
ngx_log_error(NGX_LOG_INFO, c->log, wev->kq_errno,
"kevent() reported about an closed connection");
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 12:36:54 +0000