← Back to branch summary

~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-05-31 18:38:56 UTC
  • mfrom: (1.1.10 upstream) (4.1.12 experimental)
  • Revision ID: james.westby@ubuntu.com-20090531183856-3xhvf6wd0bw5556i
Tags: 0.7.59-1
http://bugs.debian.org/515904
http://bugs.debian.org/507913
http://bugs.debian.org/509390
http://bugs.debian.org/524785
* New upstream release, first in Debian for the 0.7 branch. Among other
  issues, it also fixes the problem with wildcard dns names used with SSL.
  (Closes: #515904)
* debian/watch: updated.
* debian/postinst: fixed a bashism. (Closes: #507913)
* debian/conf/nginx.conf: removed default_type. (Closes: #509390)
* debian/control: updated Standards-Version to 3.8.1, no changes needed.
* debian/NEWS.Debian: documented the issues with
  server_names_hash_bucket_size. (Closes: #524785)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/http/modules/ngx_http_gzip_static_module.c
89
89
        return NGX_DECLINED;
90
90
    }
91
91
 
92
 
    /* TODO: Win32 */
93
92
    if (r->zero_in_uri) {
94
93
        return NGX_DECLINED;
95
94
    }
119
118
 
120
119
    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
121
120
 
122
 
    of.test_dir = 0;
 
121
    ngx_memzero(&of, sizeof(ngx_open_file_info_t));
 
122
 
 
123
    of.directio = clcf->directio;
123
124
    of.valid = clcf->open_file_cache_valid;
124
125
    of.min_uses = clcf->open_file_cache_min_uses;
125
126
    of.errors = clcf->open_file_cache_errors;
151
152
        }
152
153
 
153
154
        ngx_log_error(level, log, of.err,
154
 
                      ngx_open_file_n " \"%s\" failed", path.data);
 
155
                      "%s \"%s\" failed", of.failed, path.data);
155
156
 
156
157
        return NGX_DECLINED;
157
158
    }
174
175
 
175
176
#endif
176
177
 
 
178
    r->root_tested = !r->error_page;
 
179
 
177
180
    rc = ngx_http_discard_request_body(r);
178
181
 
179
182
    if (rc != NGX_OK) {
202
205
    h->value.data = (u_char *) "gzip";
203
206
 
204
207
    r->headers_out.content_encoding = h;
 
208
    r->ignore_content_encoding = 1;
205
209
 
206
210
    /* we need to allocate all before the header would be sent */
207
211
 
231
235
    b->file->fd = of.fd;
232
236
    b->file->name = path;
233
237
    b->file->log = log;
 
238
    b->file->directio = of.is_directio;
234
239
 
235
240
    out.buf = b;
236
241
    out.next = NULL;