mirror of
https://github.com/nginx/nginx.git
synced 2025-02-25 18:55:26 -06:00
$hostname variable
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user