diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-07-07 11:20:46 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-07-07 11:20:46 +0000 |
| commit | 696f38c2dd6b6c6c88239893442b5c81e3f4fcd1 (patch) | |
| tree | 99b7b11996c22a3f47ded71972b2e451fdf4bbcc /src/mail | |
| parent | 36efca02afd1216fb2a4fb2e5488dd1294ce5e5b (diff) | |
| download | nginx-696f38c2dd6b6c6c88239893442b5c81e3f4fcd1.tar.gz nginx-696f38c2dd6b6c6c88239893442b5c81e3f4fcd1.tar.bz2 | |
r2012 merge:
$hostname variable
Diffstat (limited to 'src/mail')
| -rw-r--r-- | src/mail/ngx_mail_core_module.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c index 03635fc43..e52ea5750 100644 --- a/src/mail/ngx_mail_core_module.c +++ b/src/mail/ngx_mail_core_module.c @@ -185,20 +185,7 @@ ngx_mail_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_str_value(conf->server_name, prev->server_name, ""); if (conf->server_name.len == 0) { - 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_log_error(NGX_LOG_EMERG, cf->log, ngx_errno, - "gethostname() failed"); - return NGX_CONF_ERROR; - } - - conf->server_name.len = ngx_strlen(conf->server_name.data); + conf->server_name = cf->cycle->hostname; } if (conf->protocol == NULL) { |