Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 3719:de63e1336cdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow server_name "" as the first name
author Igor Sysoev <igor@sysoev.ru>
date Thu, 29 Jul 2010 09:55:54 +0000
parents 518eeff336c1
children c3a37fc8d1fe
comparison
equal deleted inserted replaced
3718:bfd84b583868 3719:de63e1336cdb
3607 value = cf->args->elts; 3607 value = cf->args->elts;
3608 3608
3609 ch = value[1].data[0]; 3609 ch = value[1].data[0];
3610 3610
3611 if (cscf->server_name.data == NULL) { 3611 if (cscf->server_name.data == NULL) {
3612 if (value[1].len) { 3612 name = value[1];
3613 name = value[1]; 3613
3614 3614 if (ch == '.') {
3615 if (ch == '.') { 3615 name.len--;
3616 name.len--; 3616 name.data++;
3617 name.data++; 3617 }
3618 } 3618
3619 3619 cscf->server_name.len = name.len;
3620 cscf->server_name.len = name.len; 3620 cscf->server_name.data = ngx_pstrdup(cf->pool, &name);
3621 cscf->server_name.data = ngx_pstrdup(cf->pool, &name); 3621 if (cscf->server_name.data == NULL) {
3622 if (cscf->server_name.data == NULL) {
3623 return NGX_CONF_ERROR;
3624 }
3625
3626 } else {
3627 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3628 "the first server name must not be empty");
3629 return NGX_CONF_ERROR; 3622 return NGX_CONF_ERROR;
3630 } 3623 }
3631 } 3624 }
3632 3625
3633 for (i = 1; i < cf->args->nelts; i++) { 3626 for (i = 1; i < cf->args->nelts; i++) {