diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-02-03 12:58:48 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-02-03 12:58:48 +0000 |
| commit | 8290d287b40f017404ef90dc93cc793f987d1492 (patch) | |
| tree | 1f69eb2c85bb6f839ec654dd8826b9c839167e8c /src/http/ngx_http.c | |
| parent | 3d1679b4b03162ec477a90dce2088ab40aee830f (diff) | |
| download | nginx-8290d287b40f017404ef90dc93cc793f987d1492.tar.gz nginx-8290d287b40f017404ef90dc93cc793f987d1492.zip | |
nginx-0.3.26-RELEASE importrelease-0.3.26
*) Change: the "optimize_host_names" directive was renamed to the
"optimize_server_names".
*) Bugfix: if in the "proxy_pass" directive was no the URI part, then
the main request URI was transferred to a backend while proxying the
SSI subrequest.
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 61f9430fd..6211f0e1e 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -535,7 +535,7 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) * check whether all name-based servers have the same configuraiton * as the default server, * or some servers restrict the host names, - * or some servers disable optimizing the host names + * or some servers disable optimizing the server names */ in_addr = in_port[p].addrs.elts; @@ -545,7 +545,7 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) for (s = 0; s < in_addr[a].names.nelts; s++) { if (in_addr[a].core_srv_conf != name[s].core_srv_conf - || name[s].core_srv_conf->optimize_host_names == 0 + || name[s].core_srv_conf->optimize_server_names == 0 || name[s].core_srv_conf->restrict_host_names != NGX_HTTP_RESTRICT_HOST_OFF) { @@ -557,7 +557,7 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) * if all name-based servers have the same configuration * as the default server, * and no servers restrict the host names, - * and no servers disable optimizing the host names + * and no servers disable optimizing the server names * then we do not need to check them at run-time at all */ |