comparison src/http/modules/ngx_http_access_module.c @ 362:54fad6c4b555 NGINX_0_6_25

nginx 0.6.25 *) Change: now the "server_name_in_redirect" directive is used instead of the "server_name" directive's special "*" parameter. *) Change: now wildcard and regex names can be used as main name in a "server_name" directive. *) Change: the "satisfy_any" directive was replaced by the "satisfy" directive. *) Workaround: old worker processes might hog CPU after reconfiguration if they was run under Linux OpenVZ. *) Feature: the "min_delete_depth" directive. *) Bugfix: the COPY and MOVE methods did not work with single files. *) Bugfix: the ngx_http_gzip_static_module did not allow the ngx_http_dav_module to work; bug appeared in 0.6.23. *) Bugfix: socket leak in HTTPS mode if deferred accept was used. Thanks to Ben Maurer. *) Bugfix: nginx could not be built without PCRE library; bug appeared in 0.6.23.
author Igor Sysoev <http://sysoev.ru>
date Tue, 08 Jan 2008 00:00:00 +0300
parents 9121a0a91f47
children 6ebbca3d5ed7
comparison
equal deleted inserted replaced
361:160660bad929 362:54fad6c4b555
114 114
115 if ((sin->sin_addr.s_addr & rule[i].mask) == rule[i].addr) { 115 if ((sin->sin_addr.s_addr & rule[i].mask) == rule[i].addr) {
116 if (rule[i].deny) { 116 if (rule[i].deny) {
117 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 117 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
118 118
119 if (!clcf->satisfy_any) { 119 if (clcf->satisfy == NGX_HTTP_SATISFY_ALL) {
120 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, 120 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
121 "access forbidden by rule"); 121 "access forbidden by rule");
122 } 122 }
123 123
124 return NGX_HTTP_FORBIDDEN; 124 return NGX_HTTP_FORBIDDEN;