~ubuntu-branches/debian/squeeze/nginx/squeeze

« back to all changes in this revision

Viewing changes to src/http/modules/ngx_http_gzip_static_module.c

Committer: Bazaar Package Importer
Author(s): Fabio Tranchitella
Date: 2009-11-08 09:53:46 UTC
mfrom: (1.1.13 upstream)
Revision ID: james.westby@ubuntu.com-20091108095346-yt4eypw2l176tl53

Tags: 0.7.63-1

New upstream release.

files added:
auto/lib/geoip

auto/lib/geoip/conf

src/http/modules/ngx_http_geoip_module.c

files modified:
CHANGES

CHANGES.ru

auto/lib/conf

auto/modules

auto/options

auto/sources

debian/changelog

src/core/nginx.c

src/core/nginx.h

src/core/ngx_cycle.c

src/core/ngx_file.c

src/core/ngx_file.h

src/core/ngx_hash.c

src/core/ngx_output_chain.c

src/core/ngx_string.c

src/event/modules/ngx_devpoll_module.c

src/event/modules/ngx_epoll_module.c

src/event/modules/ngx_eventport_module.c

src/event/modules/ngx_kqueue_module.c

src/event/modules/ngx_rtsig_module.c

src/event/ngx_event.c

src/event/ngx_event_openssl.c

src/event/ngx_event_openssl.h

src/http/modules/ngx_http_access_module.c

src/http/modules/ngx_http_addition_filter_module.c

src/http/modules/ngx_http_auth_basic_module.c

src/http/modules/ngx_http_autoindex_module.c

src/http/modules/ngx_http_browser_module.c

src/http/modules/ngx_http_charset_filter_module.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/ngx_http_fastcgi_module.c

src/http/modules/ngx_http_geo_module.c

src/http/modules/ngx_http_gzip_filter_module.c

src/http/modules/ngx_http_gzip_static_module.c

src/http/modules/ngx_http_headers_filter_module.c

src/http/modules/ngx_http_image_filter_module.c

src/http/modules/ngx_http_index_module.c

src/http/modules/ngx_http_limit_req_module.c

src/http/modules/ngx_http_limit_zone_module.c

src/http/modules/ngx_http_log_module.c

src/http/modules/ngx_http_map_module.c

src/http/modules/ngx_http_memcached_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_random_index_module.c

src/http/modules/ngx_http_realip_module.c

src/http/modules/ngx_http_referer_module.c

src/http/modules/ngx_http_rewrite_module.c

src/http/modules/ngx_http_secure_link_module.c

src/http/modules/ngx_http_ssi_filter_module.c

src/http/modules/ngx_http_ssl_module.c

src/http/modules/ngx_http_ssl_module.h

src/http/modules/ngx_http_sub_filter_module.c

src/http/modules/ngx_http_userid_filter_module.c

src/http/modules/ngx_http_xslt_filter_module.c

src/http/modules/perl/nginx.pm

src/http/modules/perl/ngx_http_perl_module.c

src/http/ngx_http_cache.h

src/http/ngx_http_core_module.c

src/http/ngx_http_core_module.h

src/http/ngx_http_file_cache.c

src/http/ngx_http_parse.c

src/http/ngx_http_request.c

src/http/ngx_http_request.h

src/http/ngx_http_script.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream.h

src/http/ngx_http_write_filter_module.c

src/mail/ngx_mail_auth_http_module.c

src/mail/ngx_mail_core_module.c

src/mail/ngx_mail_proxy_module.c

src/mail/ngx_mail_ssl_module.c

src/os/unix/ngx_errno.h

src/os/unix/ngx_files.h

src/os/unix/ngx_process.c

src/os/unix/ngx_process.h

src/os/unix/ngx_process_cycle.c

src/os/unix/ngx_process_cycle.h

Show diffs side-by-side

added added

removed removed

src/http/modules/ngx_http_gzip_static_module.c

gzcf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_static_module);

if (!gzcf->enable || ngx_http_gzip_ok(r) != NGX_OK) {

if (!gzcf->enable) {

return NGX_DECLINED;

100

}

101

102

clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);

103

104

if (clcf->gzip_vary && ngx_http_gzip_ok(r) != NGX_OK) {

105

return NGX_DECLINED;

100

106

}

101

107

116

122

ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,

117

123

"http filename: \"%s\"", path.data);

118

124

119

clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);

120

121

125

ngx_memzero(&of, sizeof(ngx_open_file_info_t));

122

126

123

127

of.directio = clcf->directio;

138

142

case NGX_ENOTDIR:

139

143

case NGX_ENAMETOOLONG:

140

144

145

r->gzip = 0;

141

146

return NGX_DECLINED;

142

147

143

148

case NGX_EACCES:

251

256

252

257

conf = ngx_palloc(cf->pool, sizeof(ngx_http_gzip_static_conf_t));

253

258

if (conf == NULL) {

254

return NGX_CONF_ERROR;

259

return NULL;

255

260

}

256

261

257

262

conf->enable = NGX_CONF_UNSET;

Older »