fix: for ssl test cases

Author: rainingmaster

src/event/ngx_http_lua_epoll.c

@@ -47,29 +47,43 @@ ngx_http_lua_epoll_init_event(ngx_cycle_t *cycle)
 static ngx_int_t
 ngx_http_lua_epoll_set_event(ngx_event_t *ev, ngx_int_t event)
 {
-    uint32_t             events;
+    int                  op;
+    uint32_t             events, prev;
     ngx_connection_t    *c;
+    ngx_event_t         *e;
     struct epoll_event   ee;
 
     c = ev->data;
 
     events = (uint32_t) event;
 
     if (event == NGX_READ_EVENT) {
+        e = c->write;
+        prev = EPOLLOUT;
 #if (NGX_READ_EVENT != EPOLLIN|EPOLLRDHUP)
         events = EPOLLIN|EPOLLRDHUP;
 #endif
 
     } else {
+        e = c->read;
+        prev = EPOLLIN|EPOLLRDHUP;
 #if (NGX_WRITE_EVENT != EPOLLOUT)
         events = EPOLLOUT;
 #endif
     }
 
+    if (e->active) {
+        op = EPOLL_CTL_MOD;
+        events |= prev;
+
+    } else {
+        op = EPOLL_CTL_ADD;
+    }
+
     ee.events = events;
     ee.data.ptr = c;
 
-    if (epoll_ctl(ep, EPOLL_CTL_ADD, c->fd, &ee) == -1) {
+    if (epoll_ctl(ep, op, c->fd, &ee) == -1) {
         ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
                       "lua epoll_ctl(EPOLL_CTL_ADD, %d) failed, add event: %d",
                       c->fd, events);
@@ -86,15 +100,35 @@ ngx_http_lua_epoll_set_event(ngx_event_t *ev, ngx_int_t event)
 static ngx_int_t
 ngx_http_lua_epoll_clear_event(ngx_event_t *ev, ngx_int_t event)
 {
+    ngx_event_t         *e;
     ngx_connection_t    *c;
+    int                  op;
+    uint32_t             prev;
     struct epoll_event   ee;
 
     c = ev->data;
 
-    ee.events = 0;
-    ee.data.ptr = NULL;
+    if (event == NGX_READ_EVENT) {
+        e = c->write;
+        prev = EPOLLOUT;
+
+    } else {
+        e = c->read;
+        prev = EPOLLIN|EPOLLRDHUP;
+    }
+
+    if (e->active) {
+        op = EPOLL_CTL_MOD;
+        ee.events = prev;
+        ee.data.ptr = c;
+
+    } else {
+        op = EPOLL_CTL_DEL;
+        ee.events = 0;
+        ee.data.ptr = NULL;
+    }
 
-    if (epoll_ctl(ep, EPOLL_CTL_DEL, c->fd, &ee) == -1) {
+    if (epoll_ctl(ep, op, c->fd, &ee) == -1) {
         ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
                       "lua epoll_ctl(EPOLL_CTL_DEL, %d) failed", c->fd);
 

src/event/ngx_http_lua_kqueue.c

@@ -19,8 +19,9 @@ static ngx_int_t ngx_http_lua_kqueue_process_event(ngx_http_request_t *r,
     ngx_msec_t timer);
 
 int                    kq = -1;
-static struct kevent   kch;
+static struct kevent   kch[2];
 static struct kevent   kev;
+static ngx_uint_t      nchanges;
 
 ngx_http_lua_event_actions_t  ngx_http_lua_kqueue = {
     ngx_http_lua_kqueue_init_event,
@@ -33,6 +34,7 @@ ngx_http_lua_event_actions_t  ngx_http_lua_kqueue = {
 static ngx_int_t
 ngx_http_lua_kqueue_init_event(ngx_cycle_t *cycle)
 {
+    nchanges = 0;
     kq = kqueue();
 
     if (kq == -1) {
@@ -55,10 +57,12 @@ ngx_http_lua_kqueue_set_event(ngx_event_t *ev, ngx_int_t event)
 
     ev->active = 1;
 
-    kch.ident = c->fd;
-    kch.filter = (short) event;
-    kch.flags = EV_ADD|EV_ENABLE;
-    kch.udata = NGX_KQUEUE_UDATA_T (ev);
+    kch[nchanges].ident = c->fd;
+    kch[nchanges].filter = (short) event;
+    kch[nchanges].flags = EV_ADD|EV_ENABLE;
+    kch[nchanges].udata = NGX_KQUEUE_UDATA_T (ev);
+
+    nchanges++;
 
     return NGX_OK;
 }
@@ -73,13 +77,13 @@ ngx_http_lua_kqueue_clear_event(ngx_event_t *ev, ngx_int_t event)
 
     ev->active = 0;
 
-    kch.ident = c->fd;
-    kch.filter = (short) event;
-    kch.flags = EV_DELETE;
-    kch.udata = NGX_KQUEUE_UDATA_T (ev);
+    kch[0].ident = c->fd;
+    kch[0].filter = (short) event;
+    kch[0].flags = EV_DELETE;
+    kch[0].udata = NGX_KQUEUE_UDATA_T (ev);
 
-    if (kevent(kq, &kch, 1, NULL, 0, NULL) == -1) {
-        ngx_log_error(NGX_LOG_ALERT, r->connection->log, err,
+    if (kevent(kq, kch, 1, NULL, 0, NULL) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
                       "lua kevent() failed");
 
         return NGX_ERROR;
@@ -100,8 +104,9 @@ ngx_http_lua_kqueue_process_event(ngx_http_request_t *r, ngx_msec_t timer)
     ts.tv_sec = timer / 1000;
     ts.tv_nsec = (timer % 1000) * 1000000;
 
-    events = kevent(kq, &kch, 1, &kev, 1, &ts);
+    events = kevent(kq, kch, nchanges, &kev, 1, &ts);
 
+    nchanges = 0;
     err = (events == -1) ? ngx_errno : 0;
 
     if (err) {
@@ -125,6 +130,9 @@ ngx_http_lua_kqueue_process_event(ngx_http_request_t *r, ngx_msec_t timer)
 
     if (kev.flags & EV_EOF) {
         ev->pending_eof = 1;
+
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, kev.fflags,
+                      "lua kevent() reported that connect() failed");
     }
 
     return NGX_OK;

src/event/ngx_http_lua_poll.c

@@ -54,9 +54,14 @@ ngx_http_lua_poll_set_event(ngx_event_t *ev, ngx_int_t event)
 #endif
     }
 
-    pev.fd = c->fd;
-    pev.events = (short) event;
-    pev.revents = 0;
+    if (pev.fd != c->fd) {
+        pev.fd = c->fd;
+        pev.events = (short) event;
+        pev.revents = 0;
+
+    } else {
+        pev.events |= (short) event;
+    }
 
     return NGX_OK;
 }
@@ -65,6 +70,8 @@ ngx_http_lua_poll_set_event(ngx_event_t *ev, ngx_int_t event)
 static ngx_int_t
 ngx_http_lua_poll_clear_event(ngx_event_t *ev, ngx_int_t event)
 {
+    ev->active = 0;
+
     return NGX_OK;
 }