github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Nginx Fixed if "master_process off" is set nginx will crash at exit

Browse Source
This commit is contained in:
chaizhenhua
2013-04-04 21:42:05 +08:00
parent 36c2e1bcce
commit 5ce1818a9a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nginx/modsecurity/ngx_http_modsecurity.c
View File

@@ -122,6 +122,7 @@ static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
static ngx_http_upstream_t ngx_http_modsecurity_upstream;
static ngx_uint_t ngx_http_modsecurity_term = 0;
static struct {
char *name;
@@ -950,9 +951,16 @@ ngx_http_modsecurity_init_process(ngx_cycle_t *cycle)
return NGX_OK;
}
static void
ngx_http_modsecurity_exit_process(ngx_cycle_t *cycle)
{
/* ngx_single_process_cycle will call master and worker exit_process twice */
if (ngx_http_modsecurity_term) {
return;
}
ngx_http_modsecurity_term = 1;
modsecTerminate();
}