Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 1617:cacb565c554e stable-0.5
r1254, r1416, r1493 merge:
the "www.example.*" wildcard hash support
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 07 Nov 2007 13:39:53 +0000 |
parents | fd1fca184e67 |
children | fbf94b8341bf |
comparison
equal
deleted
inserted
replaced
1615:ca6845b19113 | 1617:cacb565c554e |
---|---|
2723 value = cf->args->elts; | 2723 value = cf->args->elts; |
2724 | 2724 |
2725 ch = value[1].data[0]; | 2725 ch = value[1].data[0]; |
2726 | 2726 |
2727 if (cscf->server_name.data == NULL && value[1].len) { | 2727 if (cscf->server_name.data == NULL && value[1].len) { |
2728 if (ch == '*') { | 2728 if (ngx_strchr(value[1].data, '*')) { |
2729 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 2729 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
2730 "first server name \"%V\" must not be wildcard", | 2730 "first server name \"%V\" must not be wildcard", |
2731 &value[1]); | 2731 &value[1]); |
2732 return NGX_CONF_ERROR; | 2732 return NGX_CONF_ERROR; |
2733 } | 2733 } |