comparison src/http/ngx_http_header_filter_module.c @ 2092:65cff41e9a4e stable-0.6

r2008 merge: *) host in request line has priority *) allow several Host headers *) validate host
author Igor Sysoev <igor@sysoev.ru>
date Mon, 07 Jul 2008 10:22:30 +0000
parents 9f15e5f8ff9e
children b274942c09c3
comparison
equal deleted inserted replaced
2091:9f15e5f8ff9e 2092:65cff41e9a4e
284 284
285 if (clcf->server_name_in_redirect) { 285 if (clcf->server_name_in_redirect) {
286 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); 286 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
287 host = cscf->server_name; 287 host = cscf->server_name;
288 288
289 } else if (r->headers_in.host) { 289 } else if (r->headers_in.server.len) {
290 host.len = r->headers_in.host_name_len; 290 host = r->headers_in.server;
291 host.data = r->headers_in.host->value.data;
292 291
293 } else { 292 } else {
294 host.data = addr; 293 host.data = addr;
295 294
296 if (ngx_http_server_addr(r, &host) != NGX_OK) { 295 if (ngx_http_server_addr(r, &host) != NGX_OK) {