mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-09 19:12:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor gzip_vary handling

Browse Source
This commit is contained in:
Igor Sysoev 2009-11-12 13:41:56 +00:00
parent 2c0b6f3e70
commit 6c49a5afcf
5 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,12 +251,22 @@ ngx_http_gzip_header_filter(ngx_http_request_t *r)
&& r->headers_out.content_encoding->value.len) && r->headers_out.content_encoding->value.len)
|| (r->headers_out.content_length_n != -1 || (r->headers_out.content_length_n != -1
&& r->headers_out.content_length_n < conf->min_length) && r->headers_out.content_length_n < conf->min_length)
|| ngx_http_test_content_type(r, &conf->types) == NULL || ngx_http_test_content_type(r, &conf->types) == NULL)
|| ngx_http_gzip_ok(r) != NGX_OK)
{ {
return ngx_http_next_header_filter(r); return ngx_http_next_header_filter(r);
} }
r->gzip_vary = 1;
if (!r->gzip_tested) {
if (ngx_http_gzip_ok(r) != NGX_OK) {
return ngx_http_next_header_filter(r);
}
} else if (!r->gzip_ok) {
return ngx_http_next_header_filter(r);
}
ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_gzip_ctx_t)); ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_gzip_ctx_t));
if (ctx == NULL) { if (ctx == NULL) {
return NGX_ERROR; return NGX_ERROR;

3
src/http/modules/ngx_http_gzip_static_module.c
View File

@ -145,7 +145,6 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
case NGX_ENOTDIR: case NGX_ENOTDIR:
case NGX_ENAMETOOLONG: case NGX_ENAMETOOLONG:
r->gzip = 0;
return NGX_DECLINED; return NGX_DECLINED;
case NGX_EACCES: case NGX_EACCES:
@ -165,6 +164,8 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r)
return NGX_DECLINED; return NGX_DECLINED;
} }
r->gzip_vary = 1;
if (rc != NGX_OK) { if (rc != NGX_OK) {
return NGX_DECLINED; return NGX_DECLINED;
} }

18
src/http/ngx_http_core_module.c
View File

@ -812,7 +812,11 @@ ngx_http_handler(ngx_http_request_t *r)
} }
r->valid_location = 1; r->valid_location = 1;
r->gzip = 0; #if (NGX_HTTP_GZIP)
r->gzip_tested = 0;
r->gzip_ok = 0;
r->gzip_vary = 0;
#endif
r->write_event_handler = ngx_http_core_run_phases; r->write_event_handler = ngx_http_core_run_phases;
ngx_http_core_run_phases(r); ngx_http_core_run_phases(r);
@ -1891,15 +1895,7 @@ ngx_http_gzip_ok(ngx_http_request_t *r)
ngx_table_elt_t *e, *d; ngx_table_elt_t *e, *d;
ngx_http_core_loc_conf_t *clcf; ngx_http_core_loc_conf_t *clcf;
if (r->gzip == 1) { r->gzip_tested = 1;
return NGX_OK;
}
if (r->gzip == 2) {
return NGX_DECLINED;
}
r->gzip = 2;
if (r != r->main if (r != r->main
|| r->headers_in.accept_encoding == NULL || r->headers_in.accept_encoding == NULL
@ -2034,7 +2030,7 @@ ok:
#endif #endif
r->gzip = 1; r->gzip_ok = 1;
return NGX_OK; return NGX_OK;
} }

9
src/http/ngx_http_header_filter_module.c
View File

@ -399,8 +399,13 @@ ngx_http_header_filter(ngx_http_request_t *r)
} }
#if (NGX_HTTP_GZIP) #if (NGX_HTTP_GZIP)
if (r->gzip && clcf->gzip_vary) { if (r->gzip_vary) {
if (clcf->gzip_vary) {
len += sizeof("Vary: Accept-Encoding" CRLF) - 1; len += sizeof("Vary: Accept-Encoding" CRLF) - 1;
} else {
r->gzip_vary = 0;
}
} }
#endif #endif
@ -559,7 +564,7 @@ ngx_http_header_filter(ngx_http_request_t *r)
} }
#if (NGX_HTTP_GZIP) #if (NGX_HTTP_GZIP)
if (r->gzip && clcf->gzip_vary) { if (r->gzip_vary) {
b->last = ngx_cpymem(b->last, "Vary: Accept-Encoding" CRLF, b->last = ngx_cpymem(b->last, "Vary: Accept-Encoding" CRLF,
sizeof("Vary: Accept-Encoding" CRLF) - 1); sizeof("Vary: Accept-Encoding" CRLF) - 1);
} }

7
src/http/ngx_http_request.h
View File

@ -457,7 +457,12 @@ struct ngx_http_request_s {
#if (NGX_HTTP_CACHE) #if (NGX_HTTP_CACHE)
unsigned cached:1; unsigned cached:1;
#endif #endif
unsigned gzip:2;
#if (NGX_HTTP_GZIP)
unsigned gzip_tested:1;
unsigned gzip_ok:1;
unsigned gzip_vary:1;
#endif
unsigned proxy:1; unsigned proxy:1;
unsigned bypass_cache:1; unsigned bypass_cache:1;