nginx-0.0.7-2004-06-15-11:55:11 import
diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c
index 4ab2388..feaf271 100644
--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -177,6 +177,10 @@
ngx_rtsig_conf_t *rtscf;
if (c->read->accept && c->read->disabled) {
+
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+ "rtsig enable connection: fd:%d", c->fd);
+
if (fcntl(c->fd, F_SETOWN, ngx_pid) == -1) {
ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
"fcntl(F_SETOWN) failed");
@@ -233,14 +237,20 @@
"rtsig del connection: fd:%d", c->fd);
if ((flags & NGX_DISABLE_EVENT) && c->read->accept) {
+
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+ "rtsig disable connection: fd:%d", c->fd);
+
c->read->active = 0;
- c->read->disabled = 0;
+ c->read->disabled = 1;
return NGX_OK;
}
if (flags & NGX_CLOSE_EVENT) {
c->read->active = 0;
c->write->active = 0;
+ c->read->posted = 0;
+ c->write->posted = 0;
return NGX_OK;
}
@@ -252,6 +262,8 @@
c->read->active = 0;
c->write->active = 0;
+ c->read->posted = 0;
+ c->write->posted = 0;
return NGX_OK;
}
@@ -299,6 +311,8 @@
ngx_accept_disabled--;
} else {
+ ngx_accept_mutex_held = 0;
+
if (ngx_trylock_accept_mutex(cycle) == NGX_ERROR) {
return NGX_ERROR;
}
@@ -517,7 +531,8 @@
static ngx_int_t ngx_rtsig_process_overflow(ngx_cycle_t *cycle)
{
- int name[2], len, rtsig_max, rtsig_nr, events, ready;
+ int name[2], rtsig_max, rtsig_nr, events, ready;
+ size_t len;
ngx_int_t tested, n, i;
ngx_err_t err;
ngx_connection_t *c;
@@ -709,8 +724,8 @@
ngx_conf_init_value(rtscf->signo, SIGRTMIN + 10);
ngx_conf_init_value(rtscf->overflow_events, 16);
- ngx_conf_init_value(rtscf->overflow_test, 100);
- ngx_conf_init_value(rtscf->overflow_threshold, 4);
+ ngx_conf_init_value(rtscf->overflow_test, 32);
+ ngx_conf_init_value(rtscf->overflow_threshold, 10);
return NGX_CONF_OK;
}