comparison src/http/modules/ngx_http_realip_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 5bef04fc3fd5
children 984bb0b1399b
comparison
equal deleted inserted replaced
325:f395c7a4c8a8 326:9fc4ab6673f9
186 static char * 186 static char *
187 ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) 187 ngx_http_realip_from(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
188 { 188 {
189 ngx_http_realip_loc_conf_t *rlcf = conf; 189 ngx_http_realip_loc_conf_t *rlcf = conf;
190 190
191 ngx_int_t rc;
191 ngx_str_t *value; 192 ngx_str_t *value;
192 ngx_inet_cidr_t in_cidr; 193 ngx_inet_cidr_t in_cidr;
193 ngx_http_realip_from_t *from; 194 ngx_http_realip_from_t *from;
194 195
195 if (rlcf->from == NULL) { 196 if (rlcf->from == NULL) {
213 from->mask = 0xffffffff; 214 from->mask = 0xffffffff;
214 215
215 return NGX_CONF_OK; 216 return NGX_CONF_OK;
216 } 217 }
217 218
218 if (ngx_ptocidr(&value[1], &in_cidr) == NGX_ERROR) { 219 rc = ngx_ptocidr(&value[1], &in_cidr);
220
221 if (rc == NGX_ERROR) {
219 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"", 222 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%V\"",
220 &value[1]); 223 &value[1]);
221 return NGX_CONF_ERROR; 224 return NGX_CONF_ERROR;
225 }
226
227 if (rc == NGX_DONE) {
228 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
229 "low address bits of %V are meaningless", &value[1]);
222 } 230 }
223 231
224 from->mask = in_cidr.mask; 232 from->mask = in_cidr.mask;
225 from->addr = in_cidr.addr; 233 from->addr = in_cidr.addr;
226 234