summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2013-05-31 14:59:26 +0400
committerMaxim Dounin <mdounin@mdounin.ru>2013-05-31 14:59:26 +0400
commit7dc6290ef6e2cd7a3ec787dbb236979e31d3b2c3 (patch)
tree27640c33d31b8408a07716abd417ab87660e88bf /src
parent93b61fad8059f106423ad5d2b6372d16de2e01dd (diff)
downloadnginx-7dc6290ef6e2cd7a3ec787dbb236979e31d3b2c3.tar.gz
nginx-7dc6290ef6e2cd7a3ec787dbb236979e31d3b2c3.tar.bz2
Win32: accept_mutex now always disabled (ticket #362).
Use of accept mutex on win32 may result in a deadlock if there are multiple worker_processes configured and the mutex is grabbed by a process which can't accept connections.
Diffstat (limited to 'src')
-rw-r--r--src/event/ngx_event.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index b7205f45b..c4c61204b 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -607,6 +607,17 @@ ngx_event_process_init(ngx_cycle_t *cycle)
ngx_use_accept_mutex = 0;
}
+#if (NGX_WIN32)
+
+ /*
+ * disable accept mutex on win32 as it may cause deadlock if
+ * grabbed by a process which can't accept connections
+ */
+
+ ngx_use_accept_mutex = 0;
+
+#endif
+
#if (NGX_THREADS)
ngx_posted_events_mutex = ngx_mutex_init(cycle->log, 0);
if (ngx_posted_events_mutex == NULL) {