diff --git a/patches/nginx-1.13.6-init_cycle_pool_release.patch b/patches/nginx-1.13.6-init_cycle_pool_release.patch new file mode 100644 index 0000000..8f9f6cf --- /dev/null +++ b/patches/nginx-1.13.6-init_cycle_pool_release.patch @@ -0,0 +1,44 @@ +diff -ur nginx-1.13.6/src/core/nginx.c nginx-1.13.6-patched/src/core/nginx.c +--- nginx-1.13.6/src/core/nginx.c 2017-12-16 12:04:13.923270925 -0800 ++++ nginx-1.13.6-patched/src/core/nginx.c 2017-12-16 12:03:55.013934545 -0800 +@@ -198,6 +198,7 @@ + static u_char *ngx_conf_file; + static u_char *ngx_conf_params; + static char *ngx_signal; ++ngx_pool_t *saved_init_cycle_pool = NULL; + + + static char **ngx_os_environ; +@@ -265,6 +266,8 @@ + return 1; + } + ++ saved_init_cycle_pool = init_cycle.pool; ++ + if (ngx_save_argv(&init_cycle, argc, argv) != NGX_OK) { + return 1; + } +diff -ur nginx-1.13.6/src/core/ngx_core.h nginx-1.13.6-patched/src/core/ngx_core.h +--- nginx-1.13.6/src/core/ngx_core.h 2017-10-10 08:22:51.000000000 -0700 ++++ nginx-1.13.6-patched/src/core/ngx_core.h 2017-12-16 12:03:55.013934545 -0800 +@@ -108,4 +108,6 @@ + #define NGX_DISABLE_SYMLINKS_NOTOWNER 2 + #endif + ++extern ngx_pool_t *saved_init_cycle_pool; ++ + #endif /* _NGX_CORE_H_INCLUDED_ */ +diff -ur nginx-1.13.6/src/os/unix/ngx_process_cycle.c nginx-1.13.6-patched/src/os/unix/ngx_process_cycle.c +--- nginx-1.13.6/src/os/unix/ngx_process_cycle.c 2017-12-16 12:04:13.901271675 -0800 ++++ nginx-1.13.6-patched/src/os/unix/ngx_process_cycle.c 2017-12-16 12:03:55.027933951 -0800 +@@ -785,6 +785,10 @@ + + ngx_destroy_pool(cycle->pool); + ++ if (saved_init_cycle_pool != NULL && saved_init_cycle_pool != cycle->pool) { ++ ngx_destroy_pool(saved_init_cycle_pool); ++ } ++ + exit(0); + } + diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 5a12e04..cea6ce3 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -379,6 +379,12 @@ if [ "$main_ver" = "1.9.7" ]; then echo fi +if [ "$main_ver" = "1.13.6" ]; then + echo "$info_txt applying the init_cycle_pool_release patch for nginx" + patch -p1 < $root/patches/nginx-$main_ver-init_cycle_pool_release.patch || exit 1 + echo +fi + rm -f *.patch || exit 1 echo "$info_txt applying the always_enable_cc_feature_tests patch to nginx"