details: http://hg.nginx.org/nginx/rev/193bbc006d5e
branches:
changeset: 6155:193bbc006d5e
user: Maxim Dounin <mdounin@mdounin.ru>
date: Thu May 21 19:39:11 2015 +0300
description:
Fixed reuseport with accept_mutex.

diffstat:

src/event/ngx_event.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)

diffs (17 lines):

diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -811,7 +811,12 @@ ngx_event_process_init(ngx_cycle_t *cycl

rev->handler = ngx_event_accept;

- if (ngx_use_accept_mutex) {
+ if (ngx_use_accept_mutex
+#if (NGX_HAVE_REUSEPORT)
+ && !ls[i].reuseport
+#endif
+ )
+ {
continue;
}


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel