--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -27,7 +27,10 @@ int sigtimedwait(const sigset_t *set, si
 
 
 typedef struct {
-    int  signo;
+    int        signo;
+    ngx_int_t  overflow_events;
+    ngx_int_t  overflow_test;
+    ngx_int_t  overflow_threshold;
 } ngx_rtsig_conf_t;
 
 
@@ -44,12 +47,18 @@ static void *ngx_rtsig_create_conf(ngx_c
 static char *ngx_rtsig_init_conf(ngx_cycle_t *cycle, void *conf);
 
 
-static sigset_t    set;
-static ngx_uint_t  overflow, current;
+static sigset_t        set;
+static ngx_uint_t      overflow, overflow_current;
+static struct pollfd  *overflow_list;
 
 
 static ngx_str_t      rtsig_name = ngx_string("rtsig");
 
+static ngx_conf_num_bounds_t  ngx_overflow_threshold_bounds = {
+    ngx_conf_check_num_bounds, 2, 10
+};
+
+
 static ngx_command_t  ngx_rtsig_commands[] = {
 
     {ngx_string("rtsig_signo"),
@@ -59,6 +68,27 @@ static ngx_command_t  ngx_rtsig_commands
      offsetof(ngx_rtsig_conf_t, signo),
      NULL},
 
+    {ngx_string("rtsig_overflow_events"),
+     NGX_EVENT_CONF|NGX_CONF_TAKE1,
+     ngx_conf_set_num_slot,
+     0,
+     offsetof(ngx_rtsig_conf_t, overflow_events),
+     NULL},
+
+    {ngx_string("rtsig_overflow_test"),
+     NGX_EVENT_CONF|NGX_CONF_TAKE1,
+     ngx_conf_set_num_slot,
+     0,
+     offsetof(ngx_rtsig_conf_t, overflow_test),
+     NULL},
+
+    {ngx_string("rtsig_overflow_threshold"),
+     NGX_EVENT_CONF|NGX_CONF_TAKE1,
+     ngx_conf_set_num_slot,
+     0,
+     offsetof(ngx_rtsig_conf_t, overflow_threshold),
+     &ngx_overflow_threshold_bounds},
+
     ngx_null_command
 };
 
@@ -113,6 +143,16 @@ static ngx_int_t ngx_rtsig_init(ngx_cycl
         return NGX_ERROR;
     }
 
+    if (overflow_list) {
+        ngx_free(overflow_list);
+    }
+
+    overflow_list = ngx_alloc(sizeof(struct pollfd) * rtscf->overflow_events,
+                              cycle->log);
+    if (overflow_list == NULL) {
+        return NGX_ERROR;
+    }
+
     ngx_io = ngx_os_io;
 
     ngx_event_actions = ngx_rtsig_module_ctx.actions;
@@ -339,7 +379,7 @@ ngx_int_t ngx_rtsig_process_events(ngx_c
 
     if (signo == rtscf->signo || signo == rtscf->signo + 1) {
 
-        if (overflow && (ngx_uint_t) si.si_fd > current) {
+        if (overflow && (ngx_uint_t) si.si_fd > overflow_current) {
             return NGX_OK;
         }
 
@@ -441,7 +481,7 @@ ngx_int_t ngx_rtsig_process_events(ngx_c
         }
 
         overflow = 1;
-        current = 0;
+        overflow_current = 0;
         ngx_event_actions.process = ngx_rtsig_process_overflow;
 
         return NGX_OK;
@@ -473,61 +513,123 @@ ngx_int_t ngx_rtsig_process_events(ngx_c
 }
 
 
+/* TODO: old cylces */
+
 static ngx_int_t ngx_rtsig_process_overflow(ngx_cycle_t *cycle)
 {
-    int                name[2], len, rtsig_max, rtsig_nr;
-    ngx_uint_t         i, n;
+    int                name[2], len, rtsig_max, rtsig_nr, events, ready;
+    ngx_int_t          tested, n, i;
+    ngx_err_t          err;
     ngx_connection_t  *c;
+    ngx_rtsig_conf_t  *rtscf;
 
-    /* TODO: old cylces */
+    rtscf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_rtsig_module);
+
+    tested = 0;
+
+    for ( ;; ) {
+
+        n = 0;
+        while (n < rtscf->overflow_events) {
+
+            if (overflow_current == cycle->connection_n) {
+                break;
+            }
+
+            c = &cycle->connections[overflow_current++];
+
+            if (c->fd == -1) {
+                continue;
+            }
+
+            events = 0;
+
+            if (c->read->active && c->read->event_handler) {
+                events |= POLLIN;
+            }
 
-    n = 0;
-    c = cycle->connections;
-    for (current = 0; current < cycle->connection_n; current++) {
+            if (c->write->active && c->write->event_handler) {
+                events |= POLLOUT;
+            }
+
+            if (events == 0) {
+                continue;
+            }
+
+            overflow_list[n].fd = c->fd;
+            overflow_list[n].events = events;
+            overflow_list[n].revents = 0;
+            n++;
+        }
+
+        if (n == 0) {
+            break;
+        }
 
-        i = current;
+        for ( ;; ) {
+            ready = poll(overflow_list, n, 0);
+
+            if (ready == -1) {
+                err = ngx_errno;
+                ngx_log_error((err == NGX_EINTR) ? NGX_LOG_INFO : NGX_LOG_ALERT,
+                              cycle->log, 0,
+                              "poll() failed while the overflow recover");
 
-        if (c[i].fd == -1) {
+                if (err == NGX_EINTR) {
+                    continue;
+                }
+            }
+
+            break;
+        }
+
+        if (ready <= 0) {
             continue;
         }
 
-        if (c[i].read->active && c[i].read->event_handler) {
-            n++;
-            c[i].read->ready = 1;
+        for (i = 0; i < n; i++) {
+            c = &cycle->connections[overflow_list[i].fd];
+
+            if (overflow_list[i].revents & (POLLIN|POLLERR|POLLHUP|POLLNVAL)) {
+                tested++;
+                c->read->ready = 1;
 
-            if (!ngx_threaded) {
-                c[i].read->event_handler(c[i].read); 
+                if (!ngx_threaded) {
+                    c->read->event_handler(c->read); 
+
+                } else {
+                    if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
+                        return NGX_ERROR;
+                    }
+
+                    ngx_post_event(c->read);
+                    c->read->returned_instance = c->read->instance;
 
-            } else {
-                if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
-                    return NGX_ERROR;
+                    ngx_mutex_unlock(ngx_posted_events_mutex);
                 }
+            }
 
-                ngx_post_event(c[i].read);
+            if (overflow_list[i].revents & (POLLOUT|POLLERR|POLLHUP|POLLNVAL)) {
+                tested++;
+                c->write->ready = 1;
+    
+                if (!ngx_threaded) {
+                    c->write->event_handler(c->write);
 
-                ngx_mutex_unlock(ngx_posted_events_mutex);
+                } else {
+                    if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
+                        return NGX_ERROR;
+                    } 
+
+                    ngx_post_event(c->write);
+                    c->write->returned_instance = c->write->instance;
+
+                    ngx_mutex_unlock(ngx_posted_events_mutex);
+                }
             }
         }
 
-        if (c[i].write->active && c[i].write->event_handler) {
-            n++;
-            c[i].write->ready = 1;
-    
-            if (!ngx_threaded) {
-                c[i].write->event_handler(c[i].write);
-
-            } else {
-                if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
-                    return NGX_ERROR;
-                } 
-
-                ngx_post_event(c[i].write);
-
-                ngx_mutex_unlock(ngx_posted_events_mutex);
-            }
-        }
-
-        if (n && (n % 100 == 0)) {
+        if (tested >= rtscf->overflow_test) {
 
             /*
              * Check the current rt queue length to prevent the new overflow.
@@ -555,15 +657,17 @@ static ngx_int_t ngx_rtsig_process_overf
             }
 
             /*
-             * drain rt signal queue if the /proc/sys/kernel/rtsig-nr
-             * is bigger than "/proc/sys/kernel/rtsig-max / 4"
+             * drain rt signal queue if the /proc/sys/kernel/rtsig-nr is bigger
+             * than "/proc/sys/kernel/rtsig-max / rtsig_overflow_threshold"
              */
 
-            if (rtsig_max / 4 < rtsig_nr) {
+            if (rtsig_max / rtscf->overflow_threshold < rtsig_nr) {
                 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                                "rtsig queue state: %d/%d", rtsig_nr, rtsig_max);
                 while (ngx_rtsig_process_events(cycle) == NGX_OK) { /* void */ }
             }
+
+            tested = 0;
         }
     }
 
@@ -589,6 +693,9 @@ static void *ngx_rtsig_create_conf(ngx_c
                   NGX_CONF_ERROR);
 
     rtscf->signo = NGX_CONF_UNSET;
+    rtscf->overflow_events = NGX_CONF_UNSET;
+    rtscf->overflow_test = NGX_CONF_UNSET;
+    rtscf->overflow_threshold = NGX_CONF_UNSET;
 
     return rtscf;
 }
@@ -601,5 +708,9 @@ static char *ngx_rtsig_init_conf(ngx_cyc
     /* LinuxThreads use the first 3 RT signals */
     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);
+
     return NGX_CONF_OK;
 }