aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http_core_module.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2007-10-17 13:22:26 +0000
committerIgor Sysoev <igor@sysoev.ru>2007-10-17 13:22:26 +0000
commit12446d82496b9da38f0e638671a3082703f4c95d (patch)
tree172f2c30d2369903e52f5760d2ad70fa2c48bfb9 /src/http/ngx_http_core_module.c
parent5cb097c5b0f7ae935bbff0985c132e0ff105606c (diff)
downloadnginx-12446d82496b9da38f0e638671a3082703f4c95d.tar.gz
nginx-12446d82496b9da38f0e638671a3082703f4c95d.zip
fix segfault if no server_name was defined
Diffstat (limited to 'src/http/ngx_http_core_module.c')
-rw-r--r--src/http/ngx_http_core_module.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 462393b63..b5f24d92b 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2292,9 +2292,12 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
return NGX_CONF_ERROR;
}
+#if (NGX_PCRE)
+ sn->regex = NULL;
+#endif
+ sn->core_srv_conf = conf;
sn->name.len = conf->server_name.len;
sn->name.data = conf->server_name.data;
- sn->core_srv_conf = conf;
}
ngx_conf_merge_size_value(conf->connection_pool_size,