nginx-0.3.8-RELEASE importrelease-0.3.8

    *) 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.

1 files changed, 22 insertions, 8 deletions

diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 238a49415..f1745c15a 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_trylock_accept_mutex(ngx_cycle_t *cycle)
         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;
-            }
+        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;
+        }
 
-            ngx_accept_mutex_held = 1;
+        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_trylock_accept_mutex(ngx_cycle_t *cycle)
 }
 
 
-ngx_int_t
+static ngx_int_t
 ngx_enable_accept_events(ngx_cycle_t *cycle)
 {
     ngx_uint_t         i;
@@ -299,10 +306,17 @@ ngx_enable_accept_events(ngx_cycle_t *cycle)
         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_enable_accept_events(ngx_cycle_t *cycle)
 }
 
 
-ngx_int_t
+static ngx_int_t
 ngx_disable_accept_events(ngx_cycle_t *cycle)
 {
     ngx_uint_t         i;