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.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c
index fdbbb2fe4..f88dd5d6f 100644
--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -307,7 +307,6 @@ ngx_rtsig_process_events(ngx_cycle_t *cycle)
 
         if (timer == NGX_TIMER_INFINITE || timer > 500) {
             timer = 500;
-            break;
         }
 
 #endif
@@ -578,7 +577,7 @@ ngx_rtsig_process_overflow(ngx_cycle_t *cycle)
 
             c = cycle->files[overflow_current++];
 
-            if (c->fd == -1) {
+            if (c == NULL || c->fd == -1) {
                 continue;
             }
 
@@ -634,6 +633,10 @@ ngx_rtsig_process_overflow(ngx_cycle_t *cycle)
         for (i = 0; i < n; i++) {
             c = cycle->files[overflow_list[i].fd];
 
+            if (c == NULL) {
+                continue;
+            }
+
             rev = c->read;
 
             if (rev->active