comparison src/http/ngx_http.c @ 2651:e3baaf7a9bde stable-0.6

r2581 merge: test wildcard tail hash existance
author Igor Sysoev <igor@sysoev.ru>
date Wed, 01 Apr 2009 16:36:47 +0000
parents 7f6f4568574d
children 87e1fcd9b604
comparison
equal deleted inserted replaced
2650:117442ab7c47 2651:e3baaf7a9bde
894 hip->addrs[i].core_srv_conf = in_addr[i].core_srv_conf; 894 hip->addrs[i].core_srv_conf = in_addr[i].core_srv_conf;
895 895
896 if (in_addr[i].hash.buckets == NULL 896 if (in_addr[i].hash.buckets == NULL
897 && (in_addr[i].wc_head == NULL 897 && (in_addr[i].wc_head == NULL
898 || in_addr[i].wc_head->hash.buckets == NULL) 898 || in_addr[i].wc_head->hash.buckets == NULL)
899 && (in_addr[i].wc_head == NULL 899 && (in_addr[i].wc_tail == NULL
900 || in_addr[i].wc_head->hash.buckets == NULL)) 900 || in_addr[i].wc_tail->hash.buckets == NULL))
901 { 901 {
902 continue; 902 continue;
903 } 903 }
904 904
905 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); 905 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t));