Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_access_module.c @ 670:ad45b044f1e5 NGINX_1_1_19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.19 *) Security: specially crafted mp4 file might allow to overwrite memory locations in a worker process if the ngx_http_mp4_module was used, potentially resulting in arbitrary code execution (CVE-2012-2089). Thanks to Matthew Daley. *) Bugfix: nginx/Windows might be terminated abnormally. Thanks to Vincent Lee. *) Bugfix: nginx hogged CPU if all servers in an upstream were marked as "backup". *) Bugfix: the "allow" and "deny" directives might be inherited incorrectly if they were used with IPv6 addresses. *) Bugfix: the "modern_browser" and "ancient_browser" directives might be inherited incorrectly. *) Bugfix: timeouts might be handled incorrectly on Solaris/SPARC. *) Bugfix: in the ngx_http_mp4_module.
author Igor Sysoev <http://sysoev.ru>
date Thu, 12 Apr 2012 00:00:00 +0400
parents d0f7a625f27c
children
comparison
equal deleted inserted replaced
669:3f5d0be5ee74 670:ad45b044f1e5
349 ngx_http_access_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) 349 ngx_http_access_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
350 { 350 {
351 ngx_http_access_loc_conf_t *prev = parent; 351 ngx_http_access_loc_conf_t *prev = parent;
352 ngx_http_access_loc_conf_t *conf = child; 352 ngx_http_access_loc_conf_t *conf = child;
353 353
354 #if (NGX_HAVE_INET6)
355
356 if (conf->rules == NULL && conf->rules6 == NULL) {
357 conf->rules = prev->rules;
358 conf->rules6 = prev->rules6;
359 }
360
361 #else
362
354 if (conf->rules == NULL) { 363 if (conf->rules == NULL) {
355 conf->rules = prev->rules; 364 conf->rules = prev->rules;
356 } 365 }
357 366
358 #if (NGX_HAVE_INET6)
359 if (conf->rules6 == NULL) {
360 conf->rules6 = prev->rules6;
361 }
362 #endif 367 #endif
363 368
364 return NGX_CONF_OK; 369 return NGX_CONF_OK;
365 } 370 }
366 371