bugfix: socket leak would happen when the mysql connection pool was u…

…sed.
openresty · Aug 16, 2012 · 209826b · 209826b
1 parent b05c67f
commit 209826b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 39 deletions.
diff --git a/src/ngx_http_drizzle_keepalive.c b/src/ngx_http_drizzle_keepalive.c
@@ -395,6 +395,8 @@ ngx_http_drizzle_keepalive_close_handler(ngx_event_t *ev)
     item = c->data;
     dscf = item->srv_conf;
 
+    dd("closing fd %d", c->fd);
+
     ngx_http_upstream_drizzle_free_connection(ev->log, c, item->drizzle_con,
                                               dscf);
 

diff --git a/src/ngx_http_drizzle_upstream.c b/src/ngx_http_drizzle_upstream.c
@@ -931,8 +931,6 @@ ngx_http_upstream_drizzle_free_connection(ngx_log_t *log,
         ngx_connection_t *c, drizzle_con_st *dc,
         ngx_http_upstream_drizzle_srv_conf_t *dscf)
 {
-    ngx_event_t  *rev, *wev;
-
     dd("drizzle free peer connection");
 
     dscf->active_conns--;
@@ -945,43 +943,7 @@ ngx_http_upstream_drizzle_free_connection(ngx_log_t *log,
     }
 
     if (c) {
-        /* dd("c pool: %p", c->pool); */
-        rev = c->read;
-        wev = c->write;
-
-        if (rev->timer_set) {
-            ngx_del_timer(rev);
-        }
-
-        if (wev->timer_set) {
-            ngx_del_timer(wev);
-        }
-
-        if (ngx_del_conn) {
-           ngx_del_conn(c, NGX_CLOSE_EVENT);
-
-        } else {
-            if (rev->active || rev->disabled) {
-                ngx_del_event(rev, NGX_READ_EVENT, NGX_CLOSE_EVENT);
-            }
-
-            if (wev->active || wev->disabled) {
-                ngx_del_event(wev, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
-            }
-        }
-
-        if (rev->prev) {
-            ngx_delete_posted_event(rev);
-        }
-
-        if (wev->prev) {
-            ngx_delete_posted_event(wev);
-        }
-
-        rev->closed = 1;
-        wev->closed = 1;
-
-        ngx_free_connection(c);
+        ngx_close_connection(c);
     }
 }