$hostname variable

This commit is contained in:
Igor Sysoev
2008-05-16 14:39:06 +00:00
parent 76566f88d9
commit 3be5257a4f
6 changed files with 48 additions and 32 deletions

View File

@@ -2606,20 +2606,7 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
}
if (conf->server_name.data == NULL) {
conf->server_name.data = ngx_palloc(cf->pool, NGX_MAXHOSTNAMELEN);
if (conf->server_name.data == NULL) {
return NGX_CONF_ERROR;
}
if (gethostname((char *) conf->server_name.data, NGX_MAXHOSTNAMELEN)
== -1)
{
ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
"gethostname() failed");
return NGX_CONF_ERROR;
}
conf->server_name.len = ngx_strlen(conf->server_name.data);
conf->server_name = cf->cycle->hostname;
sn = ngx_array_push(&conf->server_names);
if (sn == NULL) {