diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-02-16 15:26:46 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-02-16 15:26:46 +0000 |
| commit | c2807ecf4522cbd23c18fe87e3d4c0f793026e7a (patch) | |
| tree | d6c4d64689d7ec8dd8315988360e6c5b62b3c210 /src/http/ngx_http.c | |
| parent | c07b968bebe0801836ee94753b28a7d227ff76cc (diff) | |
| download | nginx-release-0.3.28.tar.gz nginx-release-0.3.28.zip | |
nginx-0.3.28-RELEASE importrelease-0.3.28
*) Feature: the "restrict_host_names" directive was canceled.
*) Feature: the --with-cpu-opt=ppc64 configuration parameter.
*) Bugfix: on some condition the proxied connection with a client was
terminated prematurely.
Thanks to Vladimir Shutoff.
*) Bugfix: the "X-Accel-Limit-Rate" header line was not taken into
account if the request was redirected using the "X-Accel-Redirect"
header line.
*) Bugfix: the "post_action" directive ran only after a successful
completion of a request.
*) Bugfix: the proxied response body generated by the "post_action"
directive was transferred to a client.
Diffstat (limited to 'src/http/ngx_http.c')
| -rw-r--r-- | src/http/ngx_http.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 6211f0e1e..7f19a4347 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -534,7 +534,6 @@ 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 server names */ @@ -545,9 +544,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_server_names == 0 - || name[s].core_srv_conf->restrict_host_names - != NGX_HTTP_RESTRICT_HOST_OFF) + || name[s].core_srv_conf->optimize_server_names == 0) { goto virtual_names; } @@ -556,7 +553,6 @@ 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 server names * then we do not need to check them at run-time at all */ |