Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gzip_disable degradation

This commit is contained in:
Igor Sysoev 2010-10-04 15:03:00 +00:00
parent 06957e0754
commit 661df40ad7
4 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
auto/modules
View File

@ -322,6 +322,7 @@ if [ $HTTP_SECURE_LINK = YES ]; then
fi
if [ $HTTP_DEGRADATION = YES ]; then
have=NGX_HTTP_DEGRADATION . auto/have
HTTP_MODULES="$HTTP_MODULES $HTTP_DEGRADATION_MODULE"
HTTP_SRCS="$HTTP_SRCS $HTTP_DEGRADATION_SRCS"
fi

12
src/http/modules/ngx_http_gzip_filter_module.c
View File

@ -258,6 +258,18 @@ ngx_http_gzip_header_filter(ngx_http_request_t *r)
r->gzip_vary = 1;
#if (NGX_HTTP_DEGRADATION)
{
ngx_http_core_loc_conf_t *clcf;
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
if (clcf->gzip_disable_degradation && ngx_http_degraded(r)) {
return ngx_http_next_header_filter(r);
}
}
#endif
if (!r->gzip_tested) {
if (ngx_http_gzip_ok(r) != NGX_OK) {
return ngx_http_next_header_filter(r);

52
src/http/ngx_http_core_module.c
View File

@ -3113,6 +3113,9 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
clcf->gzip_disable = NGX_CONF_UNSET_PTR;
#endif
clcf->gzip_disable_msie6 = 3;
#if (NGX_HTTP_DEGRADATION)
clcf->gzip_disable_degradation = 3;
#endif
#endif
return clcf;
@ -3373,6 +3376,15 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
(prev->gzip_disable_msie6 == 3) ? 0 : prev->gzip_disable_msie6;
}
#if (NGX_HTTP_DEGRADATION)
if (conf->gzip_disable_degradation == 3) {
conf->gzip_disable_degradation =
(prev->gzip_disable_degradation == 3) ?
0 : prev->gzip_disable_degradation;
}
#endif
#endif
return NGX_CONF_OK;
@ -4394,6 +4406,15 @@ ngx_http_gzip_disable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
continue;
}
#if (NGX_HTTP_DEGRADATION)
if (ngx_strcmp(value[i].data, "degradation") == 0) {
clcf->gzip_disable_degradation = 1;
continue;
}
#endif
re = ngx_array_push(clcf->gzip_disable);
if (re == NULL) {
return NGX_CONF_ERROR;
@ -4414,20 +4435,35 @@ ngx_http_gzip_disable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_OK;
#else
ngx_str_t *value;
ngx_str_t *value;
ngx_uint_t i;
value = cf->args->elts;
if (cf->args->nelts == 2 && ngx_strcmp(value[1].data, "msie6") == 0) {
clcf->gzip_disable_msie6 = 1;
return NGX_CONF_OK;
for (i = 1; i < cf->args->nelts; i++) {
if (ngx_strcmp(value[i].data, "msie6") == 0) {
clcf->gzip_disable_msie6 = 1;
continue;
}
#if (NGX_HTTP_DEGRADATION)
if (ngx_strcmp(value[i].data, "degradation") == 0) {
clcf->gzip_disable_degradation = 1;
continue;
}
#endif
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"without PCRE library \"gzip_disable\" supports "
"builtin \"msie6\" and \"degradation\" mask only");
return NGX_CONF_ERROR;
}
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"without PCRE library \"gzip_disable\" supports "
"builtin \"msie6\" mask only");
return NGX_CONF_OK;
return NGX_CONF_ERROR;
#endif
}

3
src/http/ngx_http_core_module.h
View File

@ -295,6 +295,9 @@ struct ngx_http_core_loc_conf_s {
unsigned auto_redirect:1;
#if (NGX_HTTP_GZIP)
unsigned gzip_disable_msie6:2;
#if (NGX_HTTP_DEGRADATION)
unsigned gzip_disable_degradation:2;
#endif
#endif
ngx_http_location_tree_node_t *static_locations;