github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #116 from chaizhenhua/remotes/trunk

Browse Source 
Nginx: Fixed segfaults on reload
This commit is contained in:
Breno Silva 2013-06-12 07:32:53 -07:00
commit a79e818497
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
nginx/modsecurity/ngx_http_modsecurity.c
View File

@ -61,7 +61,7 @@ static char *ngx_http_modsecurity_enable(ngx_conf_t *cf, ngx_command_t *cmd, voi
static ngx_http_modsecurity_ctx_t * ngx_http_modsecurity_create_ctx(ngx_http_request_t *r); static ngx_http_modsecurity_ctx_t * ngx_http_modsecurity_create_ctx(ngx_http_request_t *r);
static int ngx_http_modsecurity_drop_action(request_rec *r); static int ngx_http_modsecurity_drop_action(request_rec *r);
static void ngx_http_modsecurity_finalize(void *data); static void ngx_http_modsecurity_terminate(ngx_cycle_t *cycle);
static void ngx_http_modsecurity_cleanup(void *data); static void ngx_http_modsecurity_cleanup(void *data);
static int ngx_http_modsecurity_save_headers_in_visitor(void *data, const char *key, const char *value); static int ngx_http_modsecurity_save_headers_in_visitor(void *data, const char *key, const char *value);
@ -115,8 +115,8 @@ ngx_module_t ngx_http_modsecurity = {
ngx_http_modsecurity_init_process, /* init process */ ngx_http_modsecurity_init_process, /* init process */
NULL, /* init thread */ NULL, /* init thread */
NULL, /* exit thread */ NULL, /* exit thread */
NULL, /* exit process */ ngx_http_modsecurity_terminate, /* exit process */
NULL, /* exit master */ ngx_http_modsecurity_terminate, /* exit master */
NGX_MODULE_V1_PADDING NGX_MODULE_V1_PADDING
}; };
@ -881,12 +881,11 @@ modsec_pcre_free(void *ptr)
{ {
} }
static server_rec *modsec_server = NULL;
static ngx_int_t static ngx_int_t
ngx_http_modsecurity_preconfiguration(ngx_conf_t *cf) ngx_http_modsecurity_preconfiguration(ngx_conf_t *cf)
{ {
server_rec *s;
ngx_pool_cleanup_t *cln;
/* XXX: temporary hack, nginx uses pcre as well and hijacks these two */ /* XXX: temporary hack, nginx uses pcre as well and hijacks these two */
pcre_malloc = modsec_pcre_malloc; pcre_malloc = modsec_pcre_malloc;
pcre_free = modsec_pcre_free; pcre_free = modsec_pcre_free;
@ -895,24 +894,18 @@ ngx_http_modsecurity_preconfiguration(ngx_conf_t *cf)
modsecSetDropAction(ngx_http_modsecurity_drop_action); modsecSetDropAction(ngx_http_modsecurity_drop_action);
/* TODO: server_rec per server conf */ /* TODO: server_rec per server conf */
s = modsecInit(); modsec_server = modsecInit();
if (s == NULL) { if (modsec_server == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
cln = ngx_pool_cleanup_add(cf->pool, 0);
if (cln == NULL) {
return NGX_ERROR;
}
cln->handler = ngx_http_modsecurity_finalize;
/* set host name */ /* set host name */
s->server_hostname = ngx_palloc(cf->pool, ngx_cycle->hostname.len + 1); modsec_server->server_hostname = ngx_palloc(cf->pool, ngx_cycle->hostname.len + 1);
if (s->server_hostname == NULL) { if (modsec_server->server_hostname == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
ngx_memcpy(s->server_hostname, ngx_cycle->hostname.data, ngx_cycle->hostname.len); ngx_memcpy(modsec_server->server_hostname, ngx_cycle->hostname.data, ngx_cycle->hostname.len);
s->server_hostname[ ngx_cycle->hostname.len] = '\0'; modsec_server->server_hostname[ ngx_cycle->hostname.len] = '\0';
modsecStartConfig(); modsecStartConfig();
return NGX_OK; return NGX_OK;
@ -920,9 +913,12 @@ ngx_http_modsecurity_preconfiguration(ngx_conf_t *cf)
static void static void
ngx_http_modsecurity_finalize(void *data) ngx_http_modsecurity_terminate(ngx_cycle_t *cycle)
{ {
modsecTerminate(); if (modsec_server) {
modsecTerminate();
modsec_server = NULL;
}
} }