Mercurial > hg > nginx

comparison src/http/ngx_http.c @ 2534:2749e4bf6af0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move r->virtual_names to ngx_http_core_srv_conf_t
author Igor Sysoev <igor@sysoev.ru>
date Tue, 24 Feb 2009 07:56:47 +0000
parents c843171d5dc2
children c352c419be85
comparison
equal deleted inserted replaced
2533:c843171d5dc2 2534:2749e4bf6af0
1810 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); 1810 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t));
1811 if (vn == NULL) { 1811 if (vn == NULL) {
1812 return NGX_ERROR; 1812 return NGX_ERROR;
1813 } 1813 }
1814 1814
1815 addrs[i].conf.virtual_names = vn; 1815 addrs[i].conf.core_srv_conf->virtual_names = vn;
1816 1816
1817 vn->names.hash = addr[i].hash; 1817 vn->names.hash = addr[i].hash;
1818 vn->names.wc_head = addr[i].wc_head; 1818 vn->names.wc_head = addr[i].wc_head;
1819 vn->names.wc_tail = addr[i].wc_tail; 1819 vn->names.wc_tail = addr[i].wc_tail;
1820 #if (NGX_PCRE) 1820 #if (NGX_PCRE)
1867 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); 1867 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t));
1868 if (vn == NULL) { 1868 if (vn == NULL) {
1869 return NGX_ERROR; 1869 return NGX_ERROR;
1870 } 1870 }
1871 1871
1872 addrs6[i].conf.virtual_names = vn; 1872 addrs6[i].conf.core_srv_conf->virtual_names = vn;
1873 1873
1874 vn->names.hash = addr[i].hash; 1874 vn->names.hash = addr[i].hash;
1875 vn->names.wc_head = addr[i].wc_head; 1875 vn->names.wc_head = addr[i].wc_head;
1876 vn->names.wc_tail = addr[i].wc_tail; 1876 vn->names.wc_tail = addr[i].wc_tail;
1877 #if (NGX_PCRE) 1877 #if (NGX_PCRE)