Skip to content

Commit 09ca92f

Browse files
committed
upgraded the nginx core to 1.11.2.
1 parent bf0e5bd commit 09ca92f

19 files changed

+2495
-2
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- nginx-1.11.2/auto/cc/conf 2015-10-30 22:47:50.000000000 +0800
2+
+++ nginx-1.11.2-patched/auto/cc/conf 2015-11-02 12:23:05.385156987 +0800
3+
@@ -136,7 +136,7 @@ fi
4+
CFLAGS="$CFLAGS $NGX_CC_OPT"
5+
NGX_TEST_LD_OPT="$NGX_LD_OPT"
6+
7+
-if [ "$NGX_PLATFORM" != win32 ]; then
8+
+if [ 1 ]; then
9+
10+
if test -n "$NGX_LD_OPT"; then
11+
ngx_feature=--with-ld-opt=\"$NGX_LD_OPT\"
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# HG changeset patch
2+
# User Yichun Zhang <[email protected]>
3+
# Date 1383598130 28800
4+
# Node ID f64218e1ac963337d84092536f588b8e0d99bbaa
5+
# Parent dea321e5c0216efccbb23e84bbce7cf3e28f130c
6+
Cache: gracefully exit the cache manager process.
7+
8+
diff -r dea321e5c021 -r f64218e1ac96 src/os/unix/ngx_process_cycle.c
9+
--- a/src/os/unix/ngx_process_cycle.c Thu Oct 31 18:23:49 2013 +0400
10+
+++ b/src/os/unix/ngx_process_cycle.c Mon Nov 04 12:48:50 2013 -0800
11+
@@ -1335,7 +1335,7 @@
12+
13+
if (ngx_terminate || ngx_quit) {
14+
ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
15+
- exit(0);
16+
+ ngx_worker_process_exit(cycle);
17+
}
18+
19+
if (ngx_reopen) {

0 commit comments

Comments
 (0)