Mercurial > hg > nginx
changeset 2011:b56d4b1ebac7
$hostname variable
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 16 May 2008 14:39:06 +0000 |
parents | bd6cc5370fc1 |
children | 220f5e8603d0 |
files | src/core/ngx_config.h src/core/ngx_cycle.c src/core/ngx_cycle.h src/http/ngx_http_core_module.c src/http/ngx_http_variables.c src/mail/ngx_mail_core_module.c |
diffstat | 6 files changed, 48 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_config.h Fri May 16 14:32:58 2008 +0000 +++ b/src/core/ngx_config.h Fri May 16 14:39:06 2008 +0000 @@ -116,10 +116,11 @@ #define INET_ADDRSTRLEN 16 #endif -#define NGX_MAXHOSTNAMELEN 64 -/* -#define NGX_MAXHOSTNAMELEN MAXHOSTNAMELEN -*/ +#ifdef MAXHOSTNAMELEN +#define NGX_MAXHOSTNAMELEN MAXHOSTNAMELEN +#else +#define NGX_MAXHOSTNAMELEN 256 +#endif #if ((__GNU__ == 2) && (__GNUC_MINOR__ < 8))
--- a/src/core/ngx_cycle.c Fri May 16 14:32:58 2008 +0000 +++ b/src/core/ngx_cycle.c Fri May 16 14:39:06 2008 +0000 @@ -57,6 +57,7 @@ ngx_listening_t *ls, *nls; ngx_core_conf_t *ccf, *old_ccf; ngx_core_module_t *module; + char hostname[NGX_MAXHOSTNAMELEN]; log = old_cycle->log; @@ -170,6 +171,26 @@ } + if (gethostname(hostname, NGX_MAXHOSTNAMELEN) == -1) { + ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "gethostname() failed"); + ngx_destroy_pool(pool); + return NULL; + } + + /* on Linux gethostname() silently truncates name that does not fit */ + + hostname[NGX_MAXHOSTNAMELEN - 1] = '\0'; + cycle->hostname.len = ngx_strlen(hostname); + + cycle->hostname.data = ngx_palloc(pool, cycle->hostname.len); + if (cycle->hostname.data == NULL) { + ngx_destroy_pool(pool); + return NULL; + } + + ngx_memcpy(cycle->hostname.data, hostname, cycle->hostname.len); + + for (i = 0; ngx_modules[i]; i++) { if (ngx_modules[i]->type != NGX_CORE_MODULE) { continue;
--- a/src/core/ngx_cycle.h Fri May 16 14:32:58 2008 +0000 +++ b/src/core/ngx_cycle.h Fri May 16 14:39:06 2008 +0000 @@ -62,6 +62,7 @@ ngx_str_t conf_file; ngx_str_t root; ngx_str_t lock_file; + ngx_str_t hostname; };
--- a/src/http/ngx_http_core_module.c Fri May 16 14:32:58 2008 +0000 +++ b/src/http/ngx_http_core_module.c Fri May 16 14:39:06 2008 +0000 @@ -2606,20 +2606,7 @@ } 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) {
--- a/src/http/ngx_http_variables.c Fri May 16 14:32:58 2008 +0000 +++ b/src/http/ngx_http_variables.c Fri May 16 14:39:06 2008 +0000 @@ -75,6 +75,8 @@ static ngx_int_t ngx_http_variable_nginx_version(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); +static ngx_int_t ngx_http_variable_hostname(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data); /* * TODO: @@ -221,6 +223,9 @@ { ngx_string("nginx_version"), NULL, ngx_http_variable_nginx_version, 0, 0, 0 }, + { ngx_string("hostname"), NULL, ngx_http_variable_hostname, + 0, 0, 0 }, + { ngx_null_string, NULL, NULL, 0, 0, 0 } }; @@ -1272,6 +1277,20 @@ } +static ngx_int_t +ngx_http_variable_hostname(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data) +{ + v->len = ngx_cycle->hostname.len; + v->valid = 1; + v->no_cacheable = 0; + v->not_found = 0; + v->data = ngx_cycle->hostname.data; + + return NGX_OK; +} + + ngx_int_t ngx_http_variables_add_core_vars(ngx_conf_t *cf) {
--- a/src/mail/ngx_mail_core_module.c Fri May 16 14:32:58 2008 +0000 +++ b/src/mail/ngx_mail_core_module.c Fri May 16 14:39:06 2008 +0000 @@ -185,20 +185,7 @@ 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) {