Mercurial > hg > nginx

diff src/core/ngx_connection.c @ 5820:3377f9459e99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Events: removed broken thread support from posted events. It's mostly dead code. And the idea of thread support for this task has been deprecated.
author Valentin Bartenev <vbart@nginx.com>
date Mon, 01 Sep 2014 18:20:03 +0400
parents 4440438eb086
children 3f5f0ab59b35
line wrap: on
line diff
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -951,7 +951,9 @@ ngx_close_connection(ngx_connection_t *c
      * before we clean the connection
      */
 
-    ngx_mutex_lock(ngx_posted_events_mutex);
+    ngx_unlock(&c->lock);
+
+#endif
 
     if (c->read->prev) {
         ngx_delete_posted_event(c->read);
@@ -964,27 +966,6 @@ ngx_close_connection(ngx_connection_t *c
     c->read->closed = 1;
     c->write->closed = 1;
 
-    ngx_unlock(&c->lock);
-    c->read->locked = 0;
-    c->write->locked = 0;
-
-    ngx_mutex_unlock(ngx_posted_events_mutex);
-
-#else
-
-    if (c->read->prev) {
-        ngx_delete_posted_event(c->read);
-    }
-
-    if (c->write->prev) {
-        ngx_delete_posted_event(c->write);
-    }
-
-    c->read->closed = 1;
-    c->write->closed = 1;
-
-#endif
-
     ngx_reusable_connection(c, 0);
 
     log_error = c->log_error;