Mercurial > hg > nginx-vendor-current

diff src/http/ngx_http.c @ 162:6be073125f2e NGINX_0_3_28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 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.
author Igor Sysoev <http://sysoev.ru>
date Thu, 16 Feb 2006 00:00:00 +0300
parents 2d15b82126ed
children 3314be145cb9
line wrap: on
line diff
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -534,7 +534,6 @@ ngx_http_block(ngx_conf_t *cf, ngx_comma
         /*
          * 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_comma
             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_comma
             /*
              * 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
              */