Merge pull request #826 from chobits/master

merged nginx-1.8.1: restore default value 500ms for accept_mutex_delay
alibaba · Nov 30, 2016 · 40230b2 · 40230b2
2 parents 1eafb11 + c81d77a
commit 40230b2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
@@ -826,7 +826,7 @@ ngx_event_process_init(ngx_cycle_t *cycle)
 #if (NGX_HAVE_REUSEPORT)
                 && !ls[i].reuseport
 #endif
-               ) 
+               )
             {
                 continue;
             }
@@ -1312,7 +1312,7 @@ ngx_event_core_init_conf(ngx_cycle_t *cycle, void *conf)
 
     ngx_conf_init_value(ecf->multi_accept, 0);
     ngx_conf_init_value(ecf->accept_mutex, 1);
-    ngx_conf_init_msec_value(ecf->accept_mutex_delay, 100);
+    ngx_conf_init_msec_value(ecf->accept_mutex_delay, 500);
 
 #if (NGX_HAVE_REUSEPORT)
     ngx_conf_init_value(ecf->reuse_port, 0);