diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-03-23 13:29:41 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2009-03-23 13:29:41 +0000 |
| commit | e729b9875df37eb1b9ab8bbb62aa84a48d1e0f04 (patch) | |
| tree | 88d06e6e5efb53995d6553f84f203e4e494df0ce /src/http/ngx_http.c | |
| parent | edb4d121199e5911d3c39a25ea36f63fa8dcf6a9 (diff) | |
| download | nginx-e729b9875df37eb1b9ab8bbb62aa84a48d1e0f04.tar.gz | |
Changes with nginx 0.7.44 23 Mar 2009v0.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.
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index d519bf981..2e7018003 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1395,7 +1395,12 @@ ngx_http_optimize_servers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf, name = addr[a].names.elts; for (s = 0; s < addr[a].names.nelts; s++) { - if (addr[a].core_srv_conf == name[s].core_srv_conf) { + if (addr[a].core_srv_conf == name[s].core_srv_conf +#if (NGX_PCRE) + && name[s].captures == 0 +#endif + ) + { continue; } @@ -1805,8 +1810,12 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport, if (addr[i].hash.buckets == NULL && (addr[i].wc_head == NULL || addr[i].wc_head->hash.buckets == NULL) - && (addr[i].wc_head == NULL - || addr[i].wc_head->hash.buckets == NULL)) + && (addr[i].wc_tail == NULL + || addr[i].wc_tail->hash.buckets == NULL) +#if (NGX_PCRE) + && addr[i].nregex == 0 +#endif + ) { continue; } |