comparison src/http/modules/ngx_http_access_module.c @ 326:9fc4ab6673f9 NGINX_0_6_7

nginx 0.6.7 *) Change: now the paths specified in the "include", "auth_basic_user_file", "perl_modules", "ssl_certificate", "ssl_certificate_key", and "ssl_client_certificate" directives are relative to directory of nginx configuration file nginx.conf, but not to nginx prefix directory. *) Change: the --sysconfdir=PATH option in configure was canceled. *) Change: the special make target "upgrade1" was defined for online upgrade of 0.1.x versions. *) Feature: the "server_name" and "valid_referers" directives support regular expressions. *) Feature: the "server" directive in the "upstream" context supports the "backup" parameter. *) Feature: the ngx_http_perl_module supports the $r->discard_request_body. *) Feature: the "add_header Last-Modified ..." directive changes the "Last-Modified" response header line. *) Bugfix: if an response different than 200 was returned to an request with body and connection went to the keep-alive state after the request, then nginx returned 400 for the next request. *) Bugfix: a segmentation fault occurred in worker process if invalid address was set in the "auth_http" directive. *) Bugfix: now nginx uses default listen backlog value 511 on all platforms except FreeBSD. Thanks to Jiang Hong. *) Bugfix: a worker process may got caught in an endless loop, if an "server" inside "upstream" block was marked as "down"; bug appeared in 0.6.6. *) Bugfix: now Solaris sendfilev() is not used to transfer the client request body to FastCGI-server via the unix domain socket.
author Igor Sysoev <http://sysoev.ru>
date Wed, 15 Aug 2007 00:00:00 +0400
parents 38e7b94d63ac
children 9121a0a91f47
comparison
equal deleted inserted replaced
325:f395c7a4c8a8 326:9fc4ab6673f9
135 static char * 135 static char *
136 ngx_http_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) 136 ngx_http_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
137 { 137 {
138 ngx_http_access_loc_conf_t *alcf = conf; 138 ngx_http_access_loc_conf_t *alcf = conf;
139 139
140 ngx_int_t rc;
140 ngx_str_t *value; 141 ngx_str_t *value;
141 ngx_inet_cidr_t in_cidr; 142 ngx_inet_cidr_t in_cidr;
142 ngx_http_access_rule_t *rule; 143 ngx_http_access_rule_t *rule;
143 144
144 if (alcf->rules == NULL) { 145 if (alcf->rules == NULL) {
171 rule->mask = 0xffffffff; 172 rule->mask = 0xffffffff;
172 173
173 return NGX_CONF_OK; 174 return NGX_CONF_OK;
174 } 175 }
175 176
176 if (ngx_ptocidr(&value[1], &in_cidr) == NGX_ERROR) { 177 rc = ngx_ptocidr(&value[1], &in_cidr);
178
179 if (rc == NGX_ERROR) {
177 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"", 180 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"",
178 &value[1]); 181 &value[1]);
179 return NGX_CONF_ERROR; 182 return NGX_CONF_ERROR;
180 } 183 }
181 184
185 if (rc == NGX_DONE) {
186 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
187 "low address bits of %V are meaningless", &value[1]);
188 }
189
182 rule->mask = in_cidr.mask; 190 rule->mask = in_cidr.mask;
183 rule->addr = in_cidr.addr; 191 rule->addr = in_cidr.addr;
184 192
185 return NGX_CONF_OK; 193 return NGX_CONF_OK;
186 } 194 }