IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-01-23 23:03:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor gzip quantity introduced in r3981: it ignored "q=1.000"

Browse Source
This commit is contained in:
Igor Sysoev 2011-08-04 14:50:59 +00:00
parent dfd81a23b2
commit 48d17bca94
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/http/ngx_http_core_module.c
View File

@ -71,6 +71,7 @@ static char *ngx_http_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf); void *conf);
#if (NGX_HTTP_GZIP) #if (NGX_HTTP_GZIP)
static ngx_int_t ngx_http_gzip_accept_encoding(ngx_str_t *ae); static ngx_int_t ngx_http_gzip_accept_encoding(ngx_str_t *ae);
static ngx_uint_t ngx_http_gzip_quantity(u_char *p, u_char *last);
static char *ngx_http_gzip_disable(ngx_conf_t *cf, ngx_command_t *cmd, static char *ngx_http_gzip_disable(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf); void *conf);
#endif #endif
@ -2189,7 +2190,7 @@ ok:
/* /*
* gzip is enabled for the following quantities: * gzip is enabled for the following quantities:
* "gzip; q=0.001" ... "gzip; q=0.999", "gzip; q=1" * "gzip; q=0.001" ... "gzip; q=1.000"
* gzip is disabled for the following quantities: * gzip is disabled for the following quantities:
* "gzip; q=0" ... "gzip; q=0.000", and for any invalid cases * "gzip; q=0" ... "gzip; q=0.000", and for any invalid cases
*/ */
@ -2197,8 +2198,7 @@ ok:
static ngx_int_t static ngx_int_t
ngx_http_gzip_accept_encoding(ngx_str_t *ae) ngx_http_gzip_accept_encoding(ngx_str_t *ae)
{ {
u_char c, *p, *start, *last; u_char *p, *start, *last;
ngx_uint_t n, q;
start = ae->data; start = ae->data;
last = start + ae->len; last = start + ae->len;
@ -2255,56 +2255,65 @@ equal:
return NGX_DECLINED; return NGX_DECLINED;
} }
if (ngx_http_gzip_quantity(p, last) == 0) {
return NGX_DECLINED;
}
return NGX_OK;
}
ngx_uint_t
ngx_http_gzip_quantity(u_char *p, u_char *last)
{
u_char c;
ngx_uint_t n, q;
c = *p++; c = *p++;
if (c == '1') { if (c != '0' && c != '1') {
if (p == last || *p == ',' || *p == ' ') { return 0;
return NGX_OK;
}
return NGX_DECLINED;
} }
if (c != '0') { q = (c - '0') * 100;
return NGX_DECLINED;
}
if (p == last) { if (p == last) {
return NGX_DECLINED; return q;
} }
if (*p++ != '.') { c = *p++;
return NGX_DECLINED;
if (c == ',' || c == ' ') {
return q;
}
if (c != '.') {
return 0;
} }
n = 0; n = 0;
q = 0;
while (p < last) { while (p < last) {
c = *p++; c = *p++;
if (c == ',') { if (c == ',' || c == ' ') {
break; break;
} }
if (c >= '1' && c <= '9') { if (c >= '0' && c <= '9') {
n++; q += c - '0';
q++;
continue;
}
if (c == '0') {
n++; n++;
continue; continue;
} }
return NGX_DECLINED; return 0;
} }
if (n < 4 && q != 0) { if (q > 100 || n == 0 || n > 3) {
return NGX_OK; return 0;
} }
return NGX_DECLINED; return q;
} }
#endif #endif