Mercurial > hg > nginx-vendor-0-7

comparison src/http/modules/ngx_http_gzip_static_module.c @ 504:706fef7f4dcc NGINX_0_7_64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.64 *) Security: now SSL/TLS renegotiation is disabled. Thanks to Maxim Dounin. *) Bugfix: nginx sent gzipped responses to clients those do not support gzip, if "gzip_static on" and "gzip_vary off"; the bug had appeared in 0.7.63. *) Bugfix: if names .domain.tld, .sub.domain.tld, and .domain-some.tld were defined, then the name .sub.domain.tld was matched by .domain.tld. *) Bugfix: segmentation fault and infinite looping in resolver. *) Bugfix: in resolver. Thanks to Artem Bokhan. *) Bugfix: resolver cache poisoning. Thanks to Matthew Dempsky. *) Bugfix: memory leak in resolver. Thanks to Matthew Dempsky.
author Igor Sysoev <http://sysoev.ru>
date Mon, 16 Nov 2009 00:00:00 +0300
parents 89dc5654117c
children b9fdcaf2062b
comparison
equal deleted inserted replaced
503:bedade69b1a4 504:706fef7f4dcc
97 97
98 if (!gzcf->enable) { 98 if (!gzcf->enable) {
99 return NGX_DECLINED; 99 return NGX_DECLINED;
100 } 100 }
101 101
102 rc = ngx_http_gzip_ok(r);
103
102 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 104 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
103 105
104 if (clcf->gzip_vary && ngx_http_gzip_ok(r) != NGX_OK) { 106 if (!clcf->gzip_vary && rc != NGX_OK) {
105 return NGX_DECLINED; 107 return NGX_DECLINED;
106 } 108 }
107 109
108 log = r->connection->log; 110 log = r->connection->log;
109 111
160 "%s \"%s\" failed", of.failed, path.data); 162 "%s \"%s\" failed", of.failed, path.data);
161 163
162 return NGX_DECLINED; 164 return NGX_DECLINED;
163 } 165 }
164 166
167 if (rc != NGX_OK) {
168 return NGX_DECLINED;
169 }
170
165 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http static fd: %d", of.fd); 171 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http static fd: %d", of.fd);
166 172
167 if (of.is_dir) { 173 if (of.is_dir) {
168 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "http dir"); 174 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "http dir");
169 return NGX_DECLINED; 175 return NGX_DECLINED;