186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

added more fixes.

Browse Source
This commit is contained in:
Yichun Zhang (agentzh)
2017-08-05 16:19:45 -07:00
parent 1426d3283d
commit 967d1261cd
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/nginx-1.13.2-single_process_graceful_exit.patch
View File

@ -1,14 +1,13 @@
--- nginx-1.13.2/src/os/unix/ngx_process_cycle.c 2016-07-05 08:56:16.000000000 -0700
+++ nginx-1.13.2-patched/src/os/unix/ngx_process_cycle.c 2017-05-14 09:59:52.301108274 -0700
@@ -304,11 +304,29 @@ ngx_single_process_cycle(ngx_cycle_t *cy
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index 1710ea81..b379da9c 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -304,11 +304,26 @@ ngx_single_process_cycle(ngx_cycle_t *cycle)
}
for ( ;; ) {
+ if (ngx_exiting) {
+ ngx_event_cancel_timers();
+
+ if (ngx_event_timer_rbtree.root == ngx_event_timer_rbtree.sentinel)
+ {
+ if (ngx_event_no_timers_left() == NGX_OK) {
+ ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
+
+ for (i = 0; cycle->modules[i]; i++) {
@ -31,7 +30,7 @@
for (i = 0; cycle->modules[i]; i++) {
if (cycle->modules[i]->exit_process) {
@@ -319,6 +337,19 @@ ngx_single_process_cycle(ngx_cycle_t *cy
@@ -319,6 +334,20 @@ ngx_single_process_cycle(ngx_cycle_t *cycle)
ngx_master_process_exit(cycle);
}
@ -43,6 +42,7 @@
+
+ if (!ngx_exiting) {
+ ngx_exiting = 1;
+ ngx_set_shutdown_timer(cycle);
+ ngx_close_listening_sockets(cycle);
+ ngx_close_idle_connections(cycle);
+ }

17
patches/ngx_http_redis-0.3.7-default_port_fix.patch Normal file
View File

@ -0,0 +1,17 @@
--- redis-nginx-module-0.3.7/ngx_http_redis_module.c 2017-08-05 15:52:26.135688662 -0700
+++ redis-nginx-module-0.3.7-patched/ngx_http_redis_module.c 2017-08-05 15:53:21.338594155 -0700
@@ -1005,12 +1005,14 @@ ngx_http_redis_upstream_add(ngx_http_req
continue;
}
+#if (nginx_version < 1011006)
if (uscfp[i]->default_port
&& url->default_port
&& uscfp[i]->default_port != url->default_port)
{
continue;
}
+#endif
return uscfp[i];
}