Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 3335:616ff375a68f stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r3117, r3123, r3229 merge: server name related merges: *) If .domain.com, .sub.domain.com, and .domain-some.com were defined, then .sub.domain.com was matched by .domain.com: wildcard names hash was built incorrectly due to sorting order issue of "." vs "-". They were sorted as com.domain com.domain-some com.domain.sub while they should be sorted as com.domain com.domain.sub com.domain-some for correct hash building *) test space between "~" and regex in server_name and invalid_referers *) do not run regex for empty host name since regex always fails in this case, the bug had been introduced in r2196
author Igor Sysoev <igor@sysoev.ru>
date Mon, 16 Nov 2009 15:00:13 +0000
parents ff7e1ec2c9a4
children 612436ad775a
comparison
equal deleted inserted replaced
3334:52af73f2def5 3335:616ff375a68f
3510 #if (NGX_PCRE) 3510 #if (NGX_PCRE)
3511 { 3511 {
3512 ngx_str_t err; 3512 ngx_str_t err;
3513 u_char errstr[NGX_MAX_CONF_ERRSTR]; 3513 u_char errstr[NGX_MAX_CONF_ERRSTR];
3514 3514
3515 if (value[i].len == 1) {
3516 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
3517 "empty regex in server name \"%V\"", &value[i]);
3518 return NGX_CONF_ERROR;
3519 }
3520
3515 err.len = NGX_MAX_CONF_ERRSTR; 3521 err.len = NGX_MAX_CONF_ERRSTR;
3516 err.data = errstr; 3522 err.data = errstr;
3517 3523
3518 value[i].len--; 3524 value[i].len--;
3519 value[i].data++; 3525 value[i].data++;