Mercurial > hg > nginx

comparison src/mail/ngx_mail_core_module.c @ 2096:a2199268010a stable-0.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r2012 merge: $hostname variable
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Jul 2008 11:20:46 +0000
parents a47516c7065b
children 8e5bf1bc87e2
comparison
equal deleted inserted replaced
2095:ab63bc586ada 2096:a2199268010a
183 183
184 184
185 ngx_conf_merge_str_value(conf->server_name, prev->server_name, ""); 185 ngx_conf_merge_str_value(conf->server_name, prev->server_name, "");
186 186
187 if (conf->server_name.len == 0) { 187 if (conf->server_name.len == 0) {
188 conf->server_name.data = ngx_palloc(cf->pool, NGX_MAXHOSTNAMELEN); 188 conf->server_name = cf->cycle->hostname;
189 if (conf->server_name.data == NULL) {
190 return NGX_CONF_ERROR;
191 }
192
193 if (gethostname((char *) conf->server_name.data, NGX_MAXHOSTNAMELEN)
194 == -1)
195 {
196 ngx_log_error(NGX_LOG_EMERG, cf->log, ngx_errno,
197 "gethostname() failed");
198 return NGX_CONF_ERROR;
199 }
200
201 conf->server_name.len = ngx_strlen(conf->server_name.data);
202 } 189 }
203 190
204 if (conf->protocol == NULL) { 191 if (conf->protocol == NULL) {
205 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, 192 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
206 "unknown mail protocol for server in %s:%ui", 193 "unknown mail protocol for server in %s:%ui",