pull/401/merge
YuanSheng Wang 7 years ago committed by GitHub
commit 57b12bb800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,12 @@
diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
index ab672110..f259af31 100644
--- a/src/os/unix/ngx_daemon.c
+++ b/src/os/unix/ngx_daemon.c
@@ -23,6 +23,8 @@ ngx_daemon(ngx_log_t *log)
break;
default:
+ /* ASAN clean */
+ ngx_destroy_pool(ngx_cycle->pool);
exit(0);
}

@ -65,6 +65,10 @@ if [ "$answer" = "Y" ]; then
echo "$info_txt applying the resolver_conf_parsing patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-resolver_conf_parsing.patch || exit 1
echo
echo "$info_txt applying the daemon-destroy-pool patch for nginx"
patch -p1 < $root/patches/nginx-$main_ver-daemon-destroy-pool.patch || exit 1
echo
fi
answer=`$root/util/ver-ge "$main_ver" 1.5.12`

Loading…
Cancel
Save