mirror of
https://github.com/nginx/nginx.git
synced 2024-12-20 06:03:31 -06:00
fix segfault if no server_name was defined
This commit is contained in:
parent
5cb097c5b0
commit
12446d8249
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user