diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-05-16 14:39:06 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-05-16 14:39:06 +0000 |
| commit | 3be5257a4f8e6e0fd5d058a314adbe5b7f5b9dd7 (patch) | |
| tree | eb8ec2fe0dc4f288caa29e991318cbd9bc21e36b /src/http/ngx_http_core_module.c | |
| parent | 76566f88d9984cc870aa6ccb4eca64ef43ff40d2 (diff) | |
| download | nginx-3be5257a4f8e6e0fd5d058a314adbe5b7f5b9dd7.tar.gz nginx-3be5257a4f8e6e0fd5d058a314adbe5b7f5b9dd7.zip | |
$hostname variable
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index a80947058..f9b11b930 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -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) { |