Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http.c @ 464:c8cfb6c462ef NGINX_0_7_44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.44 *) Feature: the ngx_http_proxy_module preliminary cache support. *) Feature: the --with-pcre option in the configure. *) Feature: the "try_files" directive is now allowed on the server block level. *) Bugfix: the "try_files" directive handled incorrectly a query string in a fallback parameter. *) Bugfix: the "try_files" directive might test incorrectly directories. *) Bugfix: if there is the single server for given address:port pair, then captures in regular expressions in a "server_name" directive did not work.
author Igor Sysoev <http://sysoev.ru>
date Mon, 23 Mar 2009 00:00:00 +0300
parents bb941a2996a6
children f2c6a7373274
comparison
equal deleted inserted replaced
463:51cb914e6d3a 464:c8cfb6c462ef
1393 for (a = 0; a < port[p].addrs.nelts; a++) { 1393 for (a = 0; a < port[p].addrs.nelts; a++) {
1394 1394
1395 name = addr[a].names.elts; 1395 name = addr[a].names.elts;
1396 for (s = 0; s < addr[a].names.nelts; s++) { 1396 for (s = 0; s < addr[a].names.nelts; s++) {
1397 1397
1398 if (addr[a].core_srv_conf == name[s].core_srv_conf) { 1398 if (addr[a].core_srv_conf == name[s].core_srv_conf
1399 #if (NGX_PCRE)
1400 && name[s].captures == 0
1401 #endif
1402 )
1403 {
1399 continue; 1404 continue;
1400 } 1405 }
1401 1406
1402 if (ngx_http_server_names(cf, cmcf, &addr[a]) != NGX_OK) { 1407 if (ngx_http_server_names(cf, cmcf, &addr[a]) != NGX_OK) {
1403 return NGX_ERROR; 1408 return NGX_ERROR;
1803 #endif 1808 #endif
1804 1809
1805 if (addr[i].hash.buckets == NULL 1810 if (addr[i].hash.buckets == NULL
1806 && (addr[i].wc_head == NULL 1811 && (addr[i].wc_head == NULL
1807 || addr[i].wc_head->hash.buckets == NULL) 1812 || addr[i].wc_head->hash.buckets == NULL)
1808 && (addr[i].wc_head == NULL 1813 && (addr[i].wc_tail == NULL
1809 || addr[i].wc_head->hash.buckets == NULL)) 1814 || addr[i].wc_tail->hash.buckets == NULL)
1815 #if (NGX_PCRE)
1816 && addr[i].nregex == 0
1817 #endif
1818 )
1810 { 1819 {
1811 continue; 1820 continue;
1812 } 1821 }
1813 1822
1814 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); 1823 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t));