Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 1580:c9a0f82deb7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix segfault if no server_name was defined
author Igor Sysoev <igor@sysoev.ru>
date Wed, 17 Oct 2007 13:22:26 +0000
parents fe11e2a3946d
children 4435ca2e467d
comparison
equal deleted inserted replaced
1579:aa1835ad46ba 1580:c9a0f82deb7c
2290 sn = ngx_array_push(&conf->server_names); 2290 sn = ngx_array_push(&conf->server_names);
2291 if (sn == NULL) { 2291 if (sn == NULL) {
2292 return NGX_CONF_ERROR; 2292 return NGX_CONF_ERROR;
2293 } 2293 }
2294 2294
2295 #if (NGX_PCRE)
2296 sn->regex = NULL;
2297 #endif
2298 sn->core_srv_conf = conf;
2295 sn->name.len = conf->server_name.len; 2299 sn->name.len = conf->server_name.len;
2296 sn->name.data = conf->server_name.data; 2300 sn->name.data = conf->server_name.data;
2297 sn->core_srv_conf = conf;
2298 } 2301 }
2299 2302
2300 ngx_conf_merge_size_value(conf->connection_pool_size, 2303 ngx_conf_merge_size_value(conf->connection_pool_size,
2301 prev->connection_pool_size, 256); 2304 prev->connection_pool_size, 256);
2302 ngx_conf_merge_size_value(conf->request_pool_size, 2305 ngx_conf_merge_size_value(conf->request_pool_size,