Mercurial > hg > nginx-mail
diff src/http/ngx_http_core_module.c @ 639:6c96fdd2dfc3 NGINX_0_8_50
nginx 0.8.50
*) Feature: the "secure_link", "secure_link_md5", and
"secure_link_expires" directives of the ngx_http_secure_link_module.
*) Feature: the -q switch.
Thanks to Gena Makhomed.
*) Bugfix: worker processes may got caught in an endless loop during
reconfiguration, if a caching was used; the bug had appeared in
0.8.48.
*) Bugfix: in the "gzip_disable" directive.
Thanks to Derrick Petzold.
*) Bugfix: nginx/Windows could not send stop, quit, reopen, and reload
signals to a process run in other session.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 02 Sep 2010 00:00:00 +0400 |
parents | 09d5f308901f |
children | be70f83b184f |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -3111,9 +3111,9 @@ ngx_http_core_create_loc_conf(ngx_conf_t clcf->gzip_http_version = NGX_CONF_UNSET_UINT; #if (NGX_PCRE) clcf->gzip_disable = NGX_CONF_UNSET_PTR; +#endif clcf->gzip_disable_msie6 = 3; #endif -#endif return clcf; } @@ -3788,13 +3788,19 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_c n = ngx_http_script_variables_count(&clcf->root); ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); + sc.variables = n; + +#if (NGX_PCRE) + if (alias && clcf->regex) { + n = 1; + } +#endif if (n) { sc.cf = cf; sc.source = &clcf->root; sc.lengths = &clcf->root_lengths; sc.values = &clcf->root_values; - sc.variables = n; sc.complete_lengths = 1; sc.complete_values = 1; @@ -4384,7 +4390,7 @@ ngx_http_gzip_disable(ngx_conf_t *cf, ng for (i = 1; i < cf->args->nelts; i++) { - if (ngx_strcmp(value[1].data, "msie6") == 0) { + if (ngx_strcmp(value[i].data, "msie6") == 0) { clcf->gzip_disable_msie6 = 1; continue; } @@ -4394,7 +4400,7 @@ ngx_http_gzip_disable(ngx_conf_t *cf, ng return NGX_CONF_ERROR; } - rc.pattern = value[1]; + rc.pattern = value[i]; rc.options = NGX_REGEX_CASELESS; if (ngx_regex_compile(&rc) != NGX_OK) {