nginx-0.3.8-RELEASE import
*) Security: nginx now checks URI got from a backend in
"X-Accel-Redirect" header line or in SSI file for the "/../" paths
and zeroes.
*) Change: nginx now does not treat the empty user name in the
"Authorization" header line as valid one.
*) Feature: the "ssl_session_timeout" directives of the
ngx_http_ssl_module and ngx_imap_ssl_module.
*) Feature: the "auth_http_header" directive of the
ngx_imap_auth_http_module.
*) Feature: the "add_header" directive.
*) Feature: the ngx_http_realip_module.
*) Feature: the new variables to use in the "log_format" directive:
$bytes_sent, $apache_bytes_sent, $status, $time_gmt, $uri,
$request_time, $request_length, $upstream_status,
$upstream_response_time, $gzip_ratio, $uid_got, $uid_set,
$connection, $pipe, and $msec. The parameters in the "%name" form
will be canceled soon.
*) Change: now the false variable values in the "if" directive are the
empty string "" and string starting with "0".
*) Bugfix: while using proxied or FastCGI-server nginx may leave
connections and temporary files with client requests in open state.
*) Bugfix: the worker processes did not flush the buffered logs on
graceful exit.
*) Bugfix: if the request URI was changes by the "rewrite" directive
and the request was proxied in location given by regular expression,
then the incorrect request was transferred to backend; the bug had
appeared in 0.2.6.
*) Bugfix: the "expires" directive did not remove the previous
"Expires" header.
*) Bugfix: nginx may stop to accept requests if the "rtsig" method and
several worker processes were used.
*) Bugfix: the "\"" and "\'" escape symbols were incorrectly handled in
SSI commands.
*) Bugfix: if the response was ended just after the SSI command and
gzipping was used, then the response did not transferred complete or
did not transferred at all.
diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c
index e57a5dd..a3891e8 100644
--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -288,7 +288,7 @@
ngx_int_t instance;
ngx_err_t err;
siginfo_t si;
- ngx_event_t *rev, *wev;
+ ngx_event_t *rev, *wev, **queue;
struct timespec ts, *tp;
struct sigaction sa;
ngx_connection_t *c;
@@ -381,15 +381,32 @@
}
if ((si.si_band & (POLLIN|POLLHUP|POLLERR)) && rev->active) {
+
rev->ready = 1;
- rev->handler(rev);
+
+ if (flags & NGX_POST_EVENTS) {
+ queue = (ngx_event_t **) (rev->accept ?
+ &ngx_posted_accept_events : &ngx_posted_events);
+
+ ngx_locked_post_event(rev, queue);
+
+ } else {
+ rev->handler(rev);
+ }
}
wev = c->write;
if ((si.si_band & (POLLOUT|POLLHUP|POLLERR)) && wev->active) {
+
wev->ready = 1;
- wev->handler(wev);
+
+ if (flags & NGX_POST_EVENTS) {
+ ngx_locked_post_event(wev, &ngx_posted_events);
+
+ } else {
+ wev->handler(wev);
+ }
}
return NGX_OK;
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 4775e5d..5147199 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -48,6 +48,7 @@
ngx_atomic_t *ngx_accept_mutex_ptr;
+ngx_atomic_t *ngx_accept_mutex_last_owner;
ngx_atomic_t *ngx_accept_mutex;
ngx_uint_t ngx_accept_mutex_held;
ngx_msec_t ngx_accept_mutex_delay;
@@ -249,10 +250,6 @@
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"timer delta: %M", delta);
- if (delta) {
- ngx_event_expire_timers();
- }
-
if (ngx_posted_accept_events) {
ngx_event_process_posted(cycle, &ngx_posted_accept_events);
}
@@ -261,6 +258,10 @@
*ngx_accept_mutex = 0;
}
+ if (delta) {
+ ngx_event_expire_timers();
+ }
+
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"posted events %p", ngx_posted_events);
@@ -470,6 +471,7 @@
/* TODO: adjust cache line size, 128 is P4 cache line size */
size = 128 /* ngx_accept_mutex */
+ + 128 /* ngx_accept_mutex_last_owner */
+ 128; /* ngx_connection_counter */
#if (NGX_STAT_STUB)
@@ -489,16 +491,17 @@
}
ngx_accept_mutex_ptr = (ngx_atomic_t *) shared;
- ngx_connection_counter = (ngx_atomic_t *) (shared + 128);
+ ngx_accept_mutex_last_owner = (ngx_atomic_t *) (shared + 1 * 128);
+ ngx_connection_counter = (ngx_atomic_t *) (shared + 2 * 128);
#if (NGX_STAT_STUB)
- ngx_stat_accepted = (ngx_atomic_t *) (shared + 2 * 128);
- ngx_stat_handled = (ngx_atomic_t *) (shared + 3 * 128);
- ngx_stat_requests = (ngx_atomic_t *) (shared + 4 * 128);
- ngx_stat_active = (ngx_atomic_t *) (shared + 5 * 128);
- ngx_stat_reading = (ngx_atomic_t *) (shared + 6 * 128);
- ngx_stat_writing = (ngx_atomic_t *) (shared + 7 * 128);
+ ngx_stat_accepted = (ngx_atomic_t *) (shared + 3 * 128);
+ ngx_stat_handled = (ngx_atomic_t *) (shared + 4 * 128);
+ ngx_stat_requests = (ngx_atomic_t *) (shared + 5 * 128);
+ ngx_stat_active = (ngx_atomic_t *) (shared + 6 * 128);
+ ngx_stat_reading = (ngx_atomic_t *) (shared + 7 * 128);
+ ngx_stat_writing = (ngx_atomic_t *) (shared + 8 * 128);
#endif
@@ -1082,10 +1085,10 @@
#endif
#if (NGX_HAVE_RTSIG)
ngx_uint_t rtsig;
+ ngx_core_conf_t *ccf;
#endif
ngx_int_t i, connections;
ngx_module_t *module;
- ngx_core_conf_t *ccf;
ngx_event_module_t *event_module;
connections = NGX_CONF_UNSET_UINT;
@@ -1189,8 +1192,6 @@
return NGX_CONF_OK;
}
-#endif
-
if (ecf->accept_mutex) {
return NGX_CONF_OK;
}
@@ -1205,6 +1206,12 @@
"the \"rtsig\" method requires \"accept_mutex\" to be on");
return NGX_CONF_ERROR;
+
+#else
+
+ return NGX_CONF_OK;
+
+#endif
}
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index af3e4a4..2154635 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -438,6 +438,7 @@
extern ngx_atomic_t *ngx_connection_counter;
extern ngx_atomic_t *ngx_accept_mutex_ptr;
+extern ngx_atomic_t *ngx_accept_mutex_last_owner;
extern ngx_atomic_t *ngx_accept_mutex;
extern ngx_uint_t ngx_accept_mutex_held;
extern ngx_msec_t ngx_accept_mutex_delay;
@@ -474,8 +475,6 @@
void ngx_event_accept(ngx_event_t *ev);
ngx_int_t ngx_trylock_accept_mutex(ngx_cycle_t *cycle);
-ngx_int_t ngx_disable_accept_events(ngx_cycle_t *cycle);
-ngx_int_t ngx_enable_accept_events(ngx_cycle_t *cycle);
u_char *ngx_accept_log_error(ngx_log_t *log, u_char *buf, size_t len);
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 238a494..f1745c1 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -13,6 +13,8 @@
#define NGX_SOCKLEN 512
+static ngx_int_t ngx_enable_accept_events(ngx_cycle_t *cycle);
+static ngx_int_t ngx_disable_accept_events(ngx_cycle_t *cycle);
static void ngx_close_accepted_connection(ngx_connection_t *c);
@@ -262,15 +264,20 @@
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"accept mutex locked");
- if (!ngx_accept_mutex_held) {
- if (ngx_enable_accept_events(cycle) == NGX_ERROR) {
- *ngx_accept_mutex = 0;
- return NGX_ERROR;
- }
-
- ngx_accept_mutex_held = 1;
+ if (ngx_accept_mutex_held
+ && (!(ngx_event_flags & NGX_USE_RTSIG_EVENT)
+ || *ngx_accept_mutex_last_owner == (ngx_atomic_t) ngx_pid))
+ {
+ return NGX_OK;
}
+ if (ngx_enable_accept_events(cycle) == NGX_ERROR) {
+ *ngx_accept_mutex = 0;
+ return NGX_ERROR;
+ }
+
+ ngx_accept_mutex_held = 1;
+
return NGX_OK;
}
@@ -286,7 +293,7 @@
}
-ngx_int_t
+static ngx_int_t
ngx_enable_accept_events(ngx_cycle_t *cycle)
{
ngx_uint_t i;
@@ -299,10 +306,17 @@
c = ls[i].connection;
if (ngx_event_flags & NGX_USE_RTSIG_EVENT) {
+
+ if (ngx_accept_mutex_held) {
+ c->read->disabled = 1;
+ }
+
if (ngx_add_conn(c) == NGX_ERROR) {
return NGX_ERROR;
}
+ *ngx_accept_mutex_last_owner = ngx_pid;
+
} else {
if (ngx_add_event(c->read, NGX_READ_EVENT, 0) == NGX_ERROR) {
return NGX_ERROR;
@@ -314,7 +328,7 @@
}
-ngx_int_t
+static ngx_int_t
ngx_disable_accept_events(ngx_cycle_t *cycle)
{
ngx_uint_t i;
