comparison src/http/modules/ngx_http_sub_filter_module.c @ 694:88a1b4797f2e NGINX_1_3_10

nginx 1.3.10 *) Change: domain names specified in configuration file are now resolved to IPv6 addresses as well as IPv4 ones. *) Change: now if the "include" directive with mask is used on Unix systems, included files are sorted in alphabetical order. *) Change: the "add_header" directive adds headers to 201 responses. *) Feature: the "geo" directive now supports IPv6 addresses in CIDR notation. *) Feature: the "flush" and "gzip" parameters of the "access_log" directive. *) Feature: variables support in the "auth_basic" directive. *) Bugfix: nginx could not be built with the ngx_http_perl_module in some cases. *) Bugfix: a segmentation fault might occur in a worker process if the ngx_http_xslt_module was used. *) Bugfix: nginx could not be built on MacOSX in some cases. Thanks to Piotr Sikora. *) Bugfix: the "limit_rate" directive with high rates might result in truncated responses on 32-bit platforms. Thanks to Alexey Antropov. *) Bugfix: a segmentation fault might occur in a worker process if the "if" directive was used. Thanks to Piotr Sikora. *) Bugfix: a "100 Continue" response was issued with "413 Request Entity Too Large" responses. *) Bugfix: the "image_filter", "image_filter_jpeg_quality" and "image_filter_sharpen" directives might be inherited incorrectly. Thanks to Ian Babrou. *) Bugfix: "crypt_r() failed" errors might appear if the "auth_basic" directive was used on Linux. *) Bugfix: in backup servers handling. Thanks to Thomas Chen. *) Bugfix: proxied HEAD requests might return incorrect response if the "gzip" directive was used.
author Igor Sysoev <http://sysoev.ru>
date Tue, 25 Dec 2012 00:00:00 +0400
parents 597573166f34
children
comparison
equal deleted inserted replaced
693:cfd4279acc6e 694:88a1b4797f2e
626 ngx_http_sub_loc_conf_t *slcf = conf; 626 ngx_http_sub_loc_conf_t *slcf = conf;
627 627
628 ngx_str_t *value; 628 ngx_str_t *value;
629 ngx_http_compile_complex_value_t ccv; 629 ngx_http_compile_complex_value_t ccv;
630 630
631 if (slcf->match.len) { 631 if (slcf->match.data) {
632 return "is duplicate"; 632 return "is duplicate";
633 } 633 }
634 634
635 value = cf->args->elts; 635 value = cf->args->elts;
636 636
686 ngx_http_sub_loc_conf_t *conf = child; 686 ngx_http_sub_loc_conf_t *conf = child;
687 687
688 ngx_conf_merge_value(conf->once, prev->once, 1); 688 ngx_conf_merge_value(conf->once, prev->once, 1);
689 ngx_conf_merge_str_value(conf->match, prev->match, ""); 689 ngx_conf_merge_str_value(conf->match, prev->match, "");
690 690
691 if (conf->value.value.len == 0) { 691 if (conf->value.value.data == NULL) {
692 conf->value = prev->value; 692 conf->value = prev->value;
693 } 693 }
694 694
695 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types, 695 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types,
696 &prev->types_keys, &prev->types, 696 &prev->types_keys, &prev->types,