annotate src/http/modules/ngx_http_gzip_filter_module.c @ 5876:973fded4f461

Gzip, gunzip: flush busy buffers if any. Previous code resulted in transfer stalls when client happened to read all the data in buffers at once, while all gzip buffers were exhausted (but ctx->nomem wasn't set). Make sure to call next body filter at least once per call if there are busy buffers. Additionally, handling of calls with NULL chain was changed to follow the same logic, i.e., next body filter is only called with NULL chain if there are busy buffers. This is expected to fix "output chain is empty" alerts as reported by some users after c52a761a2029 (1.5.7).
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 15 Oct 2014 22:57:23 +0400
parents e491b26fa5a1
children f01ab2dbcfdc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
441
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents: 433
diff changeset
1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents: 433
diff changeset
2 /*
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 441
diff changeset
3 * Copyright (C) Igor Sysoev
4412
d620f497c50f Copyright updated.
Maxim Konovalov <maxim@nginx.com>
parents: 4114
diff changeset
4 * Copyright (C) Nginx, Inc.
441
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents: 433
diff changeset
5 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents: 433
diff changeset
6
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
7
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
8 #include <ngx_config.h>
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
9 #include <ngx_core.h>
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
10 #include <ngx_http.h>
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
11
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
12 #include <zlib.h>
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
13
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
14
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
15 typedef struct {
290
87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents: 289
diff changeset
16 ngx_flag_t enable;
87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents: 289
diff changeset
17 ngx_flag_t no_buffer;
87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents: 289
diff changeset
18
2166
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
19 ngx_hash_t types;
452
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
20
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
21 ngx_bufs_t bufs;
290
87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents: 289
diff changeset
22
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
23 size_t postpone_gzipping;
589
d4e858a5751a nginx-0.3.16-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 583
diff changeset
24 ngx_int_t level;
319
7a8ebba985a9 nginx-0.0.3-2004-04-16-19:27:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 315
diff changeset
25 size_t wbits;
7a8ebba985a9 nginx-0.0.3-2004-04-16-19:27:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 315
diff changeset
26 size_t memlevel;
335
d4241d7787fe nginx-0.0.3-2004-05-14-20:51:47 import
Igor Sysoev <igor@sysoev.ru>
parents: 327
diff changeset
27 ssize_t min_length;
2166
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
28
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
29 ngx_array_t *types_keys;
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
30 } ngx_http_gzip_conf_t;
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
31
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
32
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
33 typedef struct {
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
34 ngx_chain_t *in;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
35 ngx_chain_t *free;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
36 ngx_chain_t *busy;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
37 ngx_chain_t *out;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
38 ngx_chain_t **last_out;
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
39
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
40 ngx_chain_t *copied;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
41 ngx_chain_t *copy_buf;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
42
343
6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t
Igor Sysoev <igor@sysoev.ru>
parents: 335
diff changeset
43 ngx_buf_t *in_buf;
6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t
Igor Sysoev <igor@sysoev.ru>
parents: 335
diff changeset
44 ngx_buf_t *out_buf;
6bdf858bff8c nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t
Igor Sysoev <igor@sysoev.ru>
parents: 335
diff changeset
45 ngx_int_t bufs;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
46
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
47 void *preallocated;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
48 char *free_mem;
294
5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 292
diff changeset
49 ngx_uint_t allocated;
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
50
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
51 int wbits;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
52 int memlevel;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
53
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
54 unsigned flush:4;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
55 unsigned redo:1;
430
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
56 unsigned done:1;
2287
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
57 unsigned nomem:1;
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
58 unsigned gzheader:1;
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
59 unsigned buffering:1;
177
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
60
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
61 size_t zin;
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
62 size_t zout;
135
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import
Igor Sysoev <igor@sysoev.ru>
parents: 134
diff changeset
63
290
87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents: 289
diff changeset
64 uint32_t crc32;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
65 z_stream zstream;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
66 ngx_http_request_t *request;
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
67 } ngx_http_gzip_ctx_t;
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
68
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
69
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
70 #if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
71
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
72 struct gztrailer {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
73 uint32_t crc32;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
74 uint32_t zlen;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
75 };
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
76
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
77 #else /* NGX_HAVE_BIG_ENDIAN || !NGX_HAVE_NONALIGNED */
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
78
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
79 struct gztrailer {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
80 u_char crc32[4];
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
81 u_char zlen[4];
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
82 };
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
83
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
84 #endif
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
85
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
86
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
87 static void ngx_http_gzip_filter_memory(ngx_http_request_t *r,
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
88 ngx_http_gzip_ctx_t *ctx);
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
89 static ngx_int_t ngx_http_gzip_filter_buffer(ngx_http_gzip_ctx_t *ctx,
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
90 ngx_chain_t *in);
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
91 static ngx_int_t ngx_http_gzip_filter_deflate_start(ngx_http_request_t *r,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
92 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
93 static ngx_int_t ngx_http_gzip_filter_gzheader(ngx_http_request_t *r,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
94 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
95 static ngx_int_t ngx_http_gzip_filter_add_data(ngx_http_request_t *r,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
96 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
97 static ngx_int_t ngx_http_gzip_filter_get_buf(ngx_http_request_t *r,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
98 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
99 static ngx_int_t ngx_http_gzip_filter_deflate(ngx_http_request_t *r,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
100 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
101 static ngx_int_t ngx_http_gzip_filter_deflate_end(ngx_http_request_t *r,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
102 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
103
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
104 static void *ngx_http_gzip_filter_alloc(void *opaque, u_int items,
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
105 u_int size);
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
106 static void ngx_http_gzip_filter_free(void *opaque, void *address);
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
107 static void ngx_http_gzip_filter_free_copy_buf(ngx_http_request_t *r,
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
108 ngx_http_gzip_ctx_t *ctx);
177
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
109
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
110 static ngx_int_t ngx_http_gzip_add_variables(ngx_conf_t *cf);
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
111 static ngx_int_t ngx_http_gzip_ratio_variable(ngx_http_request_t *r,
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
112 ngx_http_variable_value_t *v, uintptr_t data);
479
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 469
diff changeset
113
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
114 static ngx_int_t ngx_http_gzip_filter_init(ngx_conf_t *cf);
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
115 static void *ngx_http_gzip_create_conf(ngx_conf_t *cf);
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
116 static char *ngx_http_gzip_merge_conf(ngx_conf_t *cf,
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
117 void *parent, void *child);
527
7fa11e5c6e96 nginx-0.1.38-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 513
diff changeset
118 static char *ngx_http_gzip_window(ngx_conf_t *cf, void *post, void *data);
7fa11e5c6e96 nginx-0.1.38-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 513
diff changeset
119 static char *ngx_http_gzip_hash(ngx_conf_t *cf, void *post, void *data);
158
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import
Igor Sysoev <igor@sysoev.ru>
parents: 157
diff changeset
120
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
121
158
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import
Igor Sysoev <igor@sysoev.ru>
parents: 157
diff changeset
122 static ngx_conf_num_bounds_t ngx_http_gzip_comp_level_bounds = {
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import
Igor Sysoev <igor@sysoev.ru>
parents: 157
diff changeset
123 ngx_conf_check_num_bounds, 1, 9
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import
Igor Sysoev <igor@sysoev.ru>
parents: 157
diff changeset
124 };
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import
Igor Sysoev <igor@sysoev.ru>
parents: 157
diff changeset
125
527
7fa11e5c6e96 nginx-0.1.38-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 513
diff changeset
126 static ngx_conf_post_handler_pt ngx_http_gzip_window_p = ngx_http_gzip_window;
7fa11e5c6e96 nginx-0.1.38-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 513
diff changeset
127 static ngx_conf_post_handler_pt ngx_http_gzip_hash_p = ngx_http_gzip_hash;
158
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import
Igor Sysoev <igor@sysoev.ru>
parents: 157
diff changeset
128
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
129
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
130 static ngx_command_t ngx_http_gzip_filter_commands[] = {
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
131
239
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
132 { ngx_string("gzip"),
485
4ebe09b07e30 nginx-0.1.17-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 483
diff changeset
133 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
4ebe09b07e30 nginx-0.1.17-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 483
diff changeset
134 |NGX_CONF_FLAG,
239
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
135 ngx_conf_set_flag_slot,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
136 NGX_HTTP_LOC_CONF_OFFSET,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
137 offsetof(ngx_http_gzip_conf_t, enable),
412
199cd29f35a3 nginx-0.0.10-2004-08-31-19:32:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 370
diff changeset
138 NULL },
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
139
239
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
140 { ngx_string("gzip_buffers"),
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
141 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE2,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
142 ngx_conf_set_bufs_slot,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
143 NGX_HTTP_LOC_CONF_OFFSET,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
144 offsetof(ngx_http_gzip_conf_t, bufs),
412
199cd29f35a3 nginx-0.0.10-2004-08-31-19:32:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 370
diff changeset
145 NULL },
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
146
452
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
147 { ngx_string("gzip_types"),
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
148 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
2166
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
149 ngx_http_types_slot,
452
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
150 NGX_HTTP_LOC_CONF_OFFSET,
2166
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
151 offsetof(ngx_http_gzip_conf_t, types_keys),
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
152 &ngx_http_html_default_types[0] },
452
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
153
239
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
154 { ngx_string("gzip_comp_level"),
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
155 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
156 ngx_conf_set_num_slot,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
157 NGX_HTTP_LOC_CONF_OFFSET,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
158 offsetof(ngx_http_gzip_conf_t, level),
412
199cd29f35a3 nginx-0.0.10-2004-08-31-19:32:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 370
diff changeset
159 &ngx_http_gzip_comp_level_bounds },
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
160
239
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
161 { ngx_string("gzip_window"),
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
162 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
163 ngx_conf_set_size_slot,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
164 NGX_HTTP_LOC_CONF_OFFSET,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
165 offsetof(ngx_http_gzip_conf_t, wbits),
527
7fa11e5c6e96 nginx-0.1.38-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 513
diff changeset
166 &ngx_http_gzip_window_p },
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
167
239
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
168 { ngx_string("gzip_hash"),
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
169 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
170 ngx_conf_set_size_slot,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
171 NGX_HTTP_LOC_CONF_OFFSET,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
172 offsetof(ngx_http_gzip_conf_t, memlevel),
527
7fa11e5c6e96 nginx-0.1.38-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 513
diff changeset
173 &ngx_http_gzip_hash_p },
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
174
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
175 { ngx_string("postpone_gzipping"),
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
176 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
177 ngx_conf_set_size_slot,
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
178 NGX_HTTP_LOC_CONF_OFFSET,
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
179 offsetof(ngx_http_gzip_conf_t, postpone_gzipping),
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
180 NULL },
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
181
239
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
182 { ngx_string("gzip_no_buffer"),
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
183 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
184 ngx_conf_set_flag_slot,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
185 NGX_HTTP_LOC_CONF_OFFSET,
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
186 offsetof(ngx_http_gzip_conf_t, no_buffer),
412
199cd29f35a3 nginx-0.0.10-2004-08-31-19:32:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 370
diff changeset
187 NULL },
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
188
320
d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import
Igor Sysoev <igor@sysoev.ru>
parents: 319
diff changeset
189 { ngx_string("gzip_min_length"),
d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import
Igor Sysoev <igor@sysoev.ru>
parents: 319
diff changeset
190 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import
Igor Sysoev <igor@sysoev.ru>
parents: 319
diff changeset
191 ngx_conf_set_size_slot,
d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import
Igor Sysoev <igor@sysoev.ru>
parents: 319
diff changeset
192 NGX_HTTP_LOC_CONF_OFFSET,
d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import
Igor Sysoev <igor@sysoev.ru>
parents: 319
diff changeset
193 offsetof(ngx_http_gzip_conf_t, min_length),
412
199cd29f35a3 nginx-0.0.10-2004-08-31-19:32:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 370
diff changeset
194 NULL },
314
d71c87d11b16 nginx-0.0.3-2004-04-14-09:57:36 import
Igor Sysoev <igor@sysoev.ru>
parents: 294
diff changeset
195
239
574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 177
diff changeset
196 ngx_null_command
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
197 };
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
198
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
199
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
200 static ngx_http_module_t ngx_http_gzip_filter_module_ctx = {
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
201 ngx_http_gzip_add_variables, /* preconfiguration */
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
202 ngx_http_gzip_filter_init, /* postconfiguration */
177
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
203
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
204 NULL, /* create main configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
205 NULL, /* init main configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
206
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
207 NULL, /* create server configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
208 NULL, /* merge server configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
209
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
210 ngx_http_gzip_create_conf, /* create location configuration */
489
45a460f82aec nginx-0.1.19-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 485
diff changeset
211 ngx_http_gzip_merge_conf /* merge location configuration */
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
212 };
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
213
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
214
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
215 ngx_module_t ngx_http_gzip_filter_module = {
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
216 NGX_MODULE_V1,
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
217 &ngx_http_gzip_filter_module_ctx, /* module context */
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
218 ngx_http_gzip_filter_commands, /* module directives */
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
219 NGX_HTTP_MODULE, /* module type */
541
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 529
diff changeset
220 NULL, /* init master */
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
221 NULL, /* init module */
541
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 529
diff changeset
222 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 529
diff changeset
223 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 529
diff changeset
224 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 529
diff changeset
225 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 529
diff changeset
226 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 529
diff changeset
227 NGX_MODULE_V1_PADDING
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
228 };
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
229
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
230
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
231 static ngx_str_t ngx_http_gzip_ratio = ngx_string("gzip_ratio");
509
9b8c906f6e63 nginx-0.1.29-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
232
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 154
diff changeset
233 static ngx_http_output_header_filter_pt ngx_http_next_header_filter;
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 154
diff changeset
234 static ngx_http_output_body_filter_pt ngx_http_next_body_filter;
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
235
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
236
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
237 static ngx_int_t
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
238 ngx_http_gzip_header_filter(ngx_http_request_t *r)
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
239 {
2051
115e6f029fcc "gzip_vary on" always sends "Vary: Accept-Encoding" header
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
240 ngx_table_elt_t *h;
115e6f029fcc "gzip_vary on" always sends "Vary: Accept-Encoding" header
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
241 ngx_http_gzip_ctx_t *ctx;
115e6f029fcc "gzip_vary on" always sends "Vary: Accept-Encoding" header
Igor Sysoev <igor@sysoev.ru>
parents: 2049
diff changeset
242 ngx_http_gzip_conf_t *conf;
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
243
135
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import
Igor Sysoev <igor@sysoev.ru>
parents: 134
diff changeset
244 conf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_filter_module);
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import
Igor Sysoev <igor@sysoev.ru>
parents: 134
diff changeset
245
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import
Igor Sysoev <igor@sysoev.ru>
parents: 134
diff changeset
246 if (!conf->enable
452
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
247 || (r->headers_out.status != NGX_HTTP_OK
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
248 && r->headers_out.status != NGX_HTTP_FORBIDDEN
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
249 && r->headers_out.status != NGX_HTTP_NOT_FOUND)
135
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import
Igor Sysoev <igor@sysoev.ru>
parents: 134
diff changeset
250 || (r->headers_out.content_encoding
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import
Igor Sysoev <igor@sysoev.ru>
parents: 134
diff changeset
251 && r->headers_out.content_encoding->value.len)
320
d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import
Igor Sysoev <igor@sysoev.ru>
parents: 319
diff changeset
252 || (r->headers_out.content_length_n != -1
d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import
Igor Sysoev <igor@sysoev.ru>
parents: 319
diff changeset
253 && r->headers_out.content_length_n < conf->min_length)
3379
0c517d0cabe0 backout r3315 and test r->header_only last, since it's not actually
Igor Sysoev <igor@sysoev.ru>
parents: 3372
diff changeset
254 || ngx_http_test_content_type(r, &conf->types) == NULL
0c517d0cabe0 backout r3315 and test r->header_only last, since it's not actually
Igor Sysoev <igor@sysoev.ru>
parents: 3372
diff changeset
255 || r->header_only)
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
256 {
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 154
diff changeset
257 return ngx_http_next_header_filter(r);
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
258 }
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
259
3313
118169a8ec92 refactor gzip_vary handling
Igor Sysoev <igor@sysoev.ru>
parents: 2912
diff changeset
260 r->gzip_vary = 1;
118169a8ec92 refactor gzip_vary handling
Igor Sysoev <igor@sysoev.ru>
parents: 2912
diff changeset
261
3773
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
262 #if (NGX_HTTP_DEGRADATION)
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
263 {
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
264 ngx_http_core_loc_conf_t *clcf;
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
265
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
266 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
267
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
268 if (clcf->gzip_disable_degradation && ngx_http_degraded(r)) {
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
269 return ngx_http_next_header_filter(r);
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
270 }
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
271 }
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
272 #endif
a08e8b3832ae gzip_disable degradation
Igor Sysoev <igor@sysoev.ru>
parents: 3516
diff changeset
273
3313
118169a8ec92 refactor gzip_vary handling
Igor Sysoev <igor@sysoev.ru>
parents: 2912
diff changeset
274 if (!r->gzip_tested) {
118169a8ec92 refactor gzip_vary handling
Igor Sysoev <igor@sysoev.ru>
parents: 2912
diff changeset
275 if (ngx_http_gzip_ok(r) != NGX_OK) {
118169a8ec92 refactor gzip_vary handling
Igor Sysoev <igor@sysoev.ru>
parents: 2912
diff changeset
276 return ngx_http_next_header_filter(r);
118169a8ec92 refactor gzip_vary handling
Igor Sysoev <igor@sysoev.ru>
parents: 2912
diff changeset
277 }
118169a8ec92 refactor gzip_vary handling
Igor Sysoev <igor@sysoev.ru>
parents: 2912
diff changeset
278
118169a8ec92 refactor gzip_vary handling
Igor Sysoev <igor@sysoev.ru>
parents: 2912
diff changeset
279 } else if (!r->gzip_ok) {
118169a8ec92 refactor gzip_vary handling
Igor Sysoev <igor@sysoev.ru>
parents: 2912
diff changeset
280 return ngx_http_next_header_filter(r);
118169a8ec92 refactor gzip_vary handling
Igor Sysoev <igor@sysoev.ru>
parents: 2912
diff changeset
281 }
118169a8ec92 refactor gzip_vary handling
Igor Sysoev <igor@sysoev.ru>
parents: 2912
diff changeset
282
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 497
diff changeset
283 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_gzip_ctx_t));
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 497
diff changeset
284 if (ctx == NULL) {
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 497
diff changeset
285 return NGX_ERROR;
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 497
diff changeset
286 }
314
d71c87d11b16 nginx-0.0.3-2004-04-14-09:57:36 import
Igor Sysoev <igor@sysoev.ru>
parents: 294
diff changeset
287
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 497
diff changeset
288 ngx_http_set_ctx(r, ctx, ngx_http_gzip_filter_module);
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 497
diff changeset
289
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
290 ctx->request = r;
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
291 ctx->buffering = (conf->postpone_gzipping != 0);
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
292
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
293 ngx_http_gzip_filter_memory(r, ctx);
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
294
1790
775edc46ee66 ngx_http_gzip_static_module and gzip_disable
Igor Sysoev <igor@sysoev.ru>
parents: 1626
diff changeset
295 h = ngx_list_push(&r->headers_out.headers);
775edc46ee66 ngx_http_gzip_static_module and gzip_disable
Igor Sysoev <igor@sysoev.ru>
parents: 1626
diff changeset
296 if (h == NULL) {
164
84036764e215 nginx-0.0.1-2003-10-29-11:30:44 import
Igor Sysoev <igor@sysoev.ru>
parents: 160
diff changeset
297 return NGX_ERROR;
84036764e215 nginx-0.0.1-2003-10-29-11:30:44 import
Igor Sysoev <igor@sysoev.ru>
parents: 160
diff changeset
298 }
135
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import
Igor Sysoev <igor@sysoev.ru>
parents: 134
diff changeset
299
1790
775edc46ee66 ngx_http_gzip_static_module and gzip_disable
Igor Sysoev <igor@sysoev.ru>
parents: 1626
diff changeset
300 h->hash = 1;
3516
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3379
diff changeset
301 ngx_str_set(&h->key, "Content-Encoding");
dd1570b6f237 ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents: 3379
diff changeset
302 ngx_str_set(&h->value, "gzip");
1790
775edc46ee66 ngx_http_gzip_static_module and gzip_disable
Igor Sysoev <igor@sysoev.ru>
parents: 1626
diff changeset
303 r->headers_out.content_encoding = h;
775edc46ee66 ngx_http_gzip_static_module and gzip_disable
Igor Sysoev <igor@sysoev.ru>
parents: 1626
diff changeset
304
513
fbbf16224844 nginx-0.1.31-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 509
diff changeset
305 r->main_filter_need_in_memory = 1;
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
306
577
4d9ea73a627a nginx-0.3.10-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 573
diff changeset
307 ngx_http_clear_content_length(r);
4d9ea73a627a nginx-0.3.10-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 573
diff changeset
308 ngx_http_clear_accept_ranges(r);
5733
e491b26fa5a1 Entity tags: downgrade strong etags to weak ones as needed.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5432
diff changeset
309 ngx_http_weak_etag(r);
577
4d9ea73a627a nginx-0.3.10-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 573
diff changeset
310
155
46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import
Igor Sysoev <igor@sysoev.ru>
parents: 154
diff changeset
311 return ngx_http_next_header_filter(r);
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
312 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
313
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
314
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
315 static ngx_int_t
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
316 ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
317 {
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
318 int rc;
5876
973fded4f461 Gzip, gunzip: flush busy buffers if any.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5733
diff changeset
319 ngx_uint_t flush;
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
320 ngx_chain_t *cl;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
321 ngx_http_gzip_ctx_t *ctx;
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
322
243
bf2faf694c19 nginx-0.0.1-2004-01-28-23:38:54 import
Igor Sysoev <igor@sysoev.ru>
parents: 239
diff changeset
323 ctx = ngx_http_get_module_ctx(r, ngx_http_gzip_filter_module);
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
324
4990
e2794322ec76 Fixed HEAD requests handling when proxying is used (closes #261).
Valentin Bartenev <vbart@nginx.com>
parents: 4965
diff changeset
325 if (ctx == NULL || ctx->done || r->header_only) {
177
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
326 return ngx_http_next_body_filter(r, in);
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
327 }
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
328
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
329 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
330 "http gzip filter");
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
331
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
332 if (ctx->buffering) {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
333
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
334 /*
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
335 * With default memory settings zlib starts to output gzipped data
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
336 * only after it has got about 90K, so it makes sense to allocate
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
337 * zlib memory (200-400K) only after we have enough data to compress.
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
338 * Although we copy buffers, nevertheless for not big responses
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
339 * this allows to allocate zlib memory, to compress and to output
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
340 * the response in one step using hot CPU cache.
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
341 */
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
342
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
343 if (in) {
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
344 switch (ngx_http_gzip_filter_buffer(ctx, in)) {
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
345
2468
76925110cdae style fix: remove tabs
Igor Sysoev <igor@sysoev.ru>
parents: 2425
diff changeset
346 case NGX_OK:
76925110cdae style fix: remove tabs
Igor Sysoev <igor@sysoev.ru>
parents: 2425
diff changeset
347 return NGX_OK;
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
348
2468
76925110cdae style fix: remove tabs
Igor Sysoev <igor@sysoev.ru>
parents: 2425
diff changeset
349 case NGX_DONE:
76925110cdae style fix: remove tabs
Igor Sysoev <igor@sysoev.ru>
parents: 2425
diff changeset
350 in = NULL;
76925110cdae style fix: remove tabs
Igor Sysoev <igor@sysoev.ru>
parents: 2425
diff changeset
351 break;
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
352
2468
76925110cdae style fix: remove tabs
Igor Sysoev <igor@sysoev.ru>
parents: 2425
diff changeset
353 default: /* NGX_ERROR */
76925110cdae style fix: remove tabs
Igor Sysoev <igor@sysoev.ru>
parents: 2425
diff changeset
354 goto failed;
76925110cdae style fix: remove tabs
Igor Sysoev <igor@sysoev.ru>
parents: 2425
diff changeset
355 }
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
356
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
357 } else {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
358 ctx->buffering = 0;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
359 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
360 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
361
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
362 if (ctx->preallocated == NULL) {
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
363 if (ngx_http_gzip_filter_deflate_start(r, ctx) != NGX_OK) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
364 goto failed;
430
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
365 }
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
366 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
367
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
368 if (in) {
2536
a6d6d762c554 small optimization: " == NGX_ERROR" > " != NGX_OK"
Igor Sysoev <igor@sysoev.ru>
parents: 2468
diff changeset
369 if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) {
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
370 goto failed;
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
371 }
5291
84155a389bcc Gzip: clearing of c->buffered if all data are flushed.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5107
diff changeset
372
84155a389bcc Gzip: clearing of c->buffered if all data are flushed.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5107
diff changeset
373 r->connection->buffered |= NGX_HTTP_GZIP_BUFFERED;
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
374 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
375
5876
973fded4f461 Gzip, gunzip: flush busy buffers if any.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5733
diff changeset
376 if (ctx->nomem) {
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
377
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
378 /* flush busy buffers */
2287
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
379
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
380 if (ngx_http_next_body_filter(r, NULL) == NGX_ERROR) {
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
381 goto failed;
2287
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
382 }
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
383
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
384 cl = NULL;
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
385
4114
5db098f97e0e API change: ngx_chain_update_chains() now requires pool.
Maxim Dounin <mdounin@mdounin.ru>
parents: 3773
diff changeset
386 ngx_chain_update_chains(r->pool, &ctx->free, &ctx->busy, &cl,
2287
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
387 (ngx_buf_tag_t) &ngx_http_gzip_filter_module);
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
388 ctx->nomem = 0;
5876
973fded4f461 Gzip, gunzip: flush busy buffers if any.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5733
diff changeset
389 flush = 0;
973fded4f461 Gzip, gunzip: flush busy buffers if any.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5733
diff changeset
390
973fded4f461 Gzip, gunzip: flush busy buffers if any.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5733
diff changeset
391 } else {
973fded4f461 Gzip, gunzip: flush busy buffers if any.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5733
diff changeset
392 flush = ctx->busy ? 1 : 0;
2287
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
393 }
141
656d468f4ead nginx-0.0.1-2003-10-08-19:32:54 import
Igor Sysoev <igor@sysoev.ru>
parents: 136
diff changeset
394
135
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import
Igor Sysoev <igor@sysoev.ru>
parents: 134
diff changeset
395 for ( ;; ) {
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import
Igor Sysoev <igor@sysoev.ru>
parents: 134
diff changeset
396
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
397 /* cycle while we can write to a client */
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
398
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
399 for ( ;; ) {
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
400
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
401 /* cycle while there is data to feed zlib and ... */
323
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import
Igor Sysoev <igor@sysoev.ru>
parents: 322
diff changeset
402
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
403 rc = ngx_http_gzip_filter_add_data(r, ctx);
323
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import
Igor Sysoev <igor@sysoev.ru>
parents: 322
diff changeset
404
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
405 if (rc == NGX_DECLINED) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
406 break;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
407 }
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
408
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
409 if (rc == NGX_AGAIN) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
410 continue;
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
411 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
412
430
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
413
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
414 /* ... there are buffers to write zlib output */
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
415
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
416 rc = ngx_http_gzip_filter_get_buf(r, ctx);
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 497
diff changeset
417
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
418 if (rc == NGX_DECLINED) {
323
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import
Igor Sysoev <igor@sysoev.ru>
parents: 322
diff changeset
419 break;
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import
Igor Sysoev <igor@sysoev.ru>
parents: 322
diff changeset
420 }
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import
Igor Sysoev <igor@sysoev.ru>
parents: 322
diff changeset
421
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
422 if (rc == NGX_ERROR) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
423 goto failed;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
424 }
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
425
479
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 469
diff changeset
426
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
427 rc = ngx_http_gzip_filter_deflate(r, ctx);
355
0fb6c53fb135 nginx-0.0.7-2004-06-15-21:47:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 346
diff changeset
428
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
429 if (rc == NGX_OK) {
323
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import
Igor Sysoev <igor@sysoev.ru>
parents: 322
diff changeset
430 break;
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import
Igor Sysoev <igor@sysoev.ru>
parents: 322
diff changeset
431 }
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
432
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
433 if (rc == NGX_ERROR) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
434 goto failed;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
435 }
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 497
diff changeset
436
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
437 /* rc == NGX_AGAIN */
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
438 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
439
5876
973fded4f461 Gzip, gunzip: flush busy buffers if any.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5733
diff changeset
440 if (ctx->out == NULL && !flush) {
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
441 ngx_http_gzip_filter_free_copy_buf(r, ctx);
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
442
2292
51487a60eba2 fix the previous commit
Igor Sysoev <igor@sysoev.ru>
parents: 2291
diff changeset
443 return ctx->busy ? NGX_AGAIN : NGX_OK;
430
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
444 }
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
445
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
446 if (!ctx->gzheader) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
447 if (ngx_http_gzip_filter_gzheader(r, ctx) != NGX_OK) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
448 goto failed;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
449 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
450 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
451
2287
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
452 rc = ngx_http_next_body_filter(r, ctx->out);
141
656d468f4ead nginx-0.0.1-2003-10-08-19:32:54 import
Igor Sysoev <igor@sysoev.ru>
parents: 136
diff changeset
453
2287
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
454 if (rc == NGX_ERROR) {
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
455 goto failed;
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
456 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
457
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
458 ngx_http_gzip_filter_free_copy_buf(r, ctx);
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
459
4114
5db098f97e0e API change: ngx_chain_update_chains() now requires pool.
Maxim Dounin <mdounin@mdounin.ru>
parents: 3773
diff changeset
460 ngx_chain_update_chains(r->pool, &ctx->free, &ctx->busy, &ctx->out,
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 497
diff changeset
461 (ngx_buf_tag_t) &ngx_http_gzip_filter_module);
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
462 ctx->last_out = &ctx->out;
327
e0f3f238db09 nginx-0.0.3-2004-04-26-17:40:01 import
Igor Sysoev <igor@sysoev.ru>
parents: 326
diff changeset
463
2287
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
464 ctx->nomem = 0;
5876
973fded4f461 Gzip, gunzip: flush busy buffers if any.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5733
diff changeset
465 flush = 0;
2287
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
466
327
e0f3f238db09 nginx-0.0.3-2004-04-26-17:40:01 import
Igor Sysoev <igor@sysoev.ru>
parents: 326
diff changeset
467 if (ctx->done) {
2287
baa61933d5ed use nomem flag to flush busy bufs,
Igor Sysoev <igor@sysoev.ru>
parents: 2166
diff changeset
468 return rc;
327
e0f3f238db09 nginx-0.0.3-2004-04-26-17:40:01 import
Igor Sysoev <igor@sysoev.ru>
parents: 326
diff changeset
469 }
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
470 }
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
471
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
472 /* unreachable */
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
473
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
474 failed:
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
475
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
476 ctx->done = 1;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
477
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
478 if (ctx->preallocated) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
479 deflateEnd(&ctx->zstream);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
480
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
481 ngx_pfree(r->pool, ctx->preallocated);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
482 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
483
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
484 ngx_http_gzip_filter_free_copy_buf(r, ctx);
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
485
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
486 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
487 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
488
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
489
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
490 static void
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
491 ngx_http_gzip_filter_memory(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
492 {
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
493 int wbits, memlevel;
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
494 ngx_http_gzip_conf_t *conf;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
495
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
496 conf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_filter_module);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
497
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
498 wbits = conf->wbits;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
499 memlevel = conf->memlevel;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
500
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
501 if (r->headers_out.content_length_n > 0) {
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
502
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
503 /* the actual zlib window size is smaller by 262 bytes */
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
504
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
505 while (r->headers_out.content_length_n < ((1 << (wbits - 1)) - 262)) {
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
506 wbits--;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
507 memlevel--;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
508 }
4965
58dfef910ccd Gzip: fixed zlib memLevel adjusting.
Valentin Bartenev <vbart@nginx.com>
parents: 4746
diff changeset
509
58dfef910ccd Gzip: fixed zlib memLevel adjusting.
Valentin Bartenev <vbart@nginx.com>
parents: 4746
diff changeset
510 if (memlevel < 1) {
58dfef910ccd Gzip: fixed zlib memLevel adjusting.
Valentin Bartenev <vbart@nginx.com>
parents: 4746
diff changeset
511 memlevel = 1;
58dfef910ccd Gzip: fixed zlib memLevel adjusting.
Valentin Bartenev <vbart@nginx.com>
parents: 4746
diff changeset
512 }
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
513 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
514
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
515 ctx->wbits = wbits;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
516 ctx->memlevel = memlevel;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
517
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
518 /*
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
519 * We preallocate a memory for zlib in one buffer (200K-400K), this
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
520 * decreases a number of malloc() and free() calls and also probably
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
521 * decreases a number of syscalls (sbrk()/mmap() and so on).
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
522 * Besides we free the memory as soon as a gzipping will complete
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
523 * and do not wait while a whole response will be sent to a client.
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
524 *
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
525 * 8K is for zlib deflate_state, it takes
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
526 * *) 5816 bytes on i386 and sparc64 (32-bit mode)
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
527 * *) 5920 bytes on amd64 and sparc64
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
528 */
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
529
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
530 ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9));
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
531 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
532
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
533
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
534 static ngx_int_t
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
535 ngx_http_gzip_filter_buffer(ngx_http_gzip_ctx_t *ctx, ngx_chain_t *in)
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
536 {
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
537 size_t size, buffered;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
538 ngx_buf_t *b, *buf;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
539 ngx_chain_t *cl, **ll;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
540 ngx_http_request_t *r;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
541 ngx_http_gzip_conf_t *conf;
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
542
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
543 r = ctx->request;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
544
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
545 r->connection->buffered |= NGX_HTTP_GZIP_BUFFERED;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
546
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
547 buffered = 0;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
548 ll = &ctx->in;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
549
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
550 for (cl = ctx->in; cl; cl = cl->next) {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
551 buffered += cl->buf->last - cl->buf->pos;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
552 ll = &cl->next;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
553 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
554
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
555 conf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_filter_module);
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
556
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
557 while (in) {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
558 cl = ngx_alloc_chain_link(r->pool);
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
559 if (cl == NULL) {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
560 return NGX_ERROR;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
561 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
562
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
563 b = in->buf;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
564
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
565 size = b->last - b->pos;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
566 buffered += size;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
567
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
568 if (b->flush || b->last_buf || buffered > conf->postpone_gzipping) {
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
569 ctx->buffering = 0;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
570 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
571
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
572 if (ctx->buffering && size) {
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
573
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
574 buf = ngx_create_temp_buf(r->pool, size);
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
575 if (buf == NULL) {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
576 return NGX_ERROR;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
577 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
578
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
579 buf->last = ngx_cpymem(buf->pos, b->pos, size);
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
580 b->pos = b->last;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
581
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
582 buf->last_buf = b->last_buf;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
583 buf->tag = (ngx_buf_tag_t) &ngx_http_gzip_filter_module;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
584
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
585 cl->buf = buf;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
586
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
587 } else {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
588 cl->buf = b;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
589 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
590
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
591 *ll = cl;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
592 ll = &cl->next;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
593 in = in->next;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
594 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
595
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
596 *ll = NULL;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
597
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
598 return ctx->buffering ? NGX_OK : NGX_DONE;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
599 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
600
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
601
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
602 static ngx_int_t
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
603 ngx_http_gzip_filter_deflate_start(ngx_http_request_t *r,
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
604 ngx_http_gzip_ctx_t *ctx)
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
605 {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
606 int rc;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
607 ngx_http_gzip_conf_t *conf;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
608
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
609 conf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_filter_module);
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
610
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
611 ctx->preallocated = ngx_palloc(r->pool, ctx->allocated);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
612 if (ctx->preallocated == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
613 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
614 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
615
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
616 ctx->free_mem = ctx->preallocated;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
617
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
618 ctx->zstream.zalloc = ngx_http_gzip_filter_alloc;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
619 ctx->zstream.zfree = ngx_http_gzip_filter_free;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
620 ctx->zstream.opaque = ctx;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
621
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
622 rc = deflateInit2(&ctx->zstream, (int) conf->level, Z_DEFLATED,
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
623 - ctx->wbits, ctx->memlevel, Z_DEFAULT_STRATEGY);
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
624
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
625 if (rc != Z_OK) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
626 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
627 "deflateInit2() failed: %d", rc);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
628 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
629 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
630
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
631 ctx->last_out = &ctx->out;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
632 ctx->crc32 = crc32(0L, Z_NULL, 0);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
633 ctx->flush = Z_NO_FLUSH;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
634
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
635 return NGX_OK;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
636 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
637
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
638
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
639 static ngx_int_t
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
640 ngx_http_gzip_filter_gzheader(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
641 {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
642 ngx_buf_t *b;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
643 ngx_chain_t *cl;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
644 static u_char gzheader[10] =
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
645 { 0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0, 3 };
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
646
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
647 b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
648 if (b == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
649 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
650 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
651
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
652 b->memory = 1;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
653 b->pos = gzheader;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
654 b->last = b->pos + 10;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
655
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
656 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
657 if (cl == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
658 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
659 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
660
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
661 cl->buf = b;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
662 cl->next = ctx->out;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
663 ctx->out = cl;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
664
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
665 ctx->gzheader = 1;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
666
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
667 return NGX_OK;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
668 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
669
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
670
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
671 static ngx_int_t
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
672 ngx_http_gzip_filter_add_data(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
673 {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
674 if (ctx->zstream.avail_in || ctx->flush != Z_NO_FLUSH || ctx->redo) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
675 return NGX_OK;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
676 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
677
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
678 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
679 "gzip in: %p", ctx->in);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
680
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
681 if (ctx->in == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
682 return NGX_DECLINED;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
683 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
684
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
685 if (ctx->copy_buf) {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
686
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
687 /*
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
688 * to avoid CPU cache trashing we do not free() just quit buf,
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
689 * but postpone free()ing after zlib compressing and data output
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
690 */
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
691
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
692 ctx->copy_buf->next = ctx->copied;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
693 ctx->copied = ctx->copy_buf;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
694 ctx->copy_buf = NULL;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
695 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
696
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
697 ctx->in_buf = ctx->in->buf;
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
698
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
699 if (ctx->in_buf->tag == (ngx_buf_tag_t) &ngx_http_gzip_filter_module) {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
700 ctx->copy_buf = ctx->in;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
701 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
702
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
703 ctx->in = ctx->in->next;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
704
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
705 ctx->zstream.next_in = ctx->in_buf->pos;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
706 ctx->zstream.avail_in = ctx->in_buf->last - ctx->in_buf->pos;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
707
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
708 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
709 "gzip in_buf:%p ni:%p ai:%ud",
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
710 ctx->in_buf,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
711 ctx->zstream.next_in, ctx->zstream.avail_in);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
712
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
713 if (ctx->in_buf->last_buf) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
714 ctx->flush = Z_FINISH;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
715
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
716 } else if (ctx->in_buf->flush) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
717 ctx->flush = Z_SYNC_FLUSH;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
718 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
719
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
720 if (ctx->zstream.avail_in) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
721
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
722 ctx->crc32 = crc32(ctx->crc32, ctx->zstream.next_in,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
723 ctx->zstream.avail_in);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
724
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
725 } else if (ctx->flush == Z_NO_FLUSH) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
726 return NGX_AGAIN;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
727 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
728
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
729 return NGX_OK;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
730 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
731
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
732
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
733 static ngx_int_t
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
734 ngx_http_gzip_filter_get_buf(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
735 {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
736 ngx_http_gzip_conf_t *conf;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
737
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
738 if (ctx->zstream.avail_out) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
739 return NGX_OK;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
740 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
741
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
742 conf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_filter_module);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
743
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
744 if (ctx->free) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
745 ctx->out_buf = ctx->free->buf;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
746 ctx->free = ctx->free->next;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
747
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
748 } else if (ctx->bufs < conf->bufs.num) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
749
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
750 ctx->out_buf = ngx_create_temp_buf(r->pool, conf->bufs.size);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
751 if (ctx->out_buf == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
752 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
753 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
754
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
755 ctx->out_buf->tag = (ngx_buf_tag_t) &ngx_http_gzip_filter_module;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
756 ctx->out_buf->recycled = 1;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
757 ctx->bufs++;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
758
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
759 } else {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
760 ctx->nomem = 1;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
761 return NGX_DECLINED;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
762 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
763
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
764 ctx->zstream.next_out = ctx->out_buf->pos;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
765 ctx->zstream.avail_out = conf->bufs.size;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
766
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
767 return NGX_OK;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
768 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
769
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
770
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
771 static ngx_int_t
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
772 ngx_http_gzip_filter_deflate(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
773 {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
774 int rc;
4468
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
775 ngx_buf_t *b;
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
776 ngx_chain_t *cl;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
777 ngx_http_gzip_conf_t *conf;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
778
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
779 ngx_log_debug6(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
780 "deflate in: ni:%p no:%p ai:%ud ao:%ud fl:%d redo:%d",
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
781 ctx->zstream.next_in, ctx->zstream.next_out,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
782 ctx->zstream.avail_in, ctx->zstream.avail_out,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
783 ctx->flush, ctx->redo);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
784
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
785 rc = deflate(&ctx->zstream, ctx->flush);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
786
4468
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
787 if (rc != Z_OK && rc != Z_STREAM_END && rc != Z_BUF_ERROR) {
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
788 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
789 "deflate() failed: %d, %d", ctx->flush, rc);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
790 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
791 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
792
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
793 ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
794 "deflate out: ni:%p no:%p ai:%ud ao:%ud rc:%d",
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
795 ctx->zstream.next_in, ctx->zstream.next_out,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
796 ctx->zstream.avail_in, ctx->zstream.avail_out,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
797 rc);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
798
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
799 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
800 "gzip in_buf:%p pos:%p",
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
801 ctx->in_buf, ctx->in_buf->pos);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
802
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
803 if (ctx->zstream.next_in) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
804 ctx->in_buf->pos = ctx->zstream.next_in;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
805
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
806 if (ctx->zstream.avail_in == 0) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
807 ctx->zstream.next_in = NULL;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
808 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
809 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
810
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
811 ctx->out_buf->last = ctx->zstream.next_out;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
812
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
813 if (ctx->zstream.avail_out == 0) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
814
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
815 /* zlib wants to output some more gzipped data */
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
816
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
817 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
818 if (cl == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
819 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
820 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
821
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
822 cl->buf = ctx->out_buf;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
823 cl->next = NULL;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
824 *ctx->last_out = cl;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
825 ctx->last_out = &cl->next;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
826
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
827 ctx->redo = 1;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
828
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
829 return NGX_AGAIN;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
830 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
831
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
832 ctx->redo = 0;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
833
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
834 if (ctx->flush == Z_SYNC_FLUSH) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
835
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
836 ctx->flush = Z_NO_FLUSH;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
837
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
838 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
839 if (cl == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
840 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
841 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
842
4468
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
843 b = ctx->out_buf;
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
844
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
845 if (ngx_buf_size(b) == 0) {
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
846
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
847 b = ngx_calloc_buf(ctx->request->pool);
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
848 if (b == NULL) {
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
849 return NGX_ERROR;
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
850 }
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
851
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
852 } else {
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
853 ctx->zstream.avail_out = 0;
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
854 }
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
855
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
856 b->flush = 1;
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
857
93dd50a9dc70 Gzip filter: handling of empty flush buffers.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4412
diff changeset
858 cl->buf = b;
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
859 cl->next = NULL;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
860 *ctx->last_out = cl;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
861 ctx->last_out = &cl->next;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
862
5291
84155a389bcc Gzip: clearing of c->buffered if all data are flushed.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5107
diff changeset
863 r->connection->buffered &= ~NGX_HTTP_GZIP_BUFFERED;
84155a389bcc Gzip: clearing of c->buffered if all data are flushed.
Maxim Dounin <mdounin@mdounin.ru>
parents: 5107
diff changeset
864
2291
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
865 return NGX_OK;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
866 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
867
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
868 if (rc == Z_STREAM_END) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
869
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
870 if (ngx_http_gzip_filter_deflate_end(r, ctx) != NGX_OK) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
871 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
872 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
873
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
874 return NGX_OK;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
875 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
876
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
877 conf = ngx_http_get_module_loc_conf(r, ngx_http_gzip_filter_module);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
878
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
879 if (conf->no_buffer && ctx->in == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
880
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
881 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
882 if (cl == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
883 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
884 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
885
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
886 cl->buf = ctx->out_buf;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
887 cl->next = NULL;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
888 *ctx->last_out = cl;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
889 ctx->last_out = &cl->next;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
890
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
891 return NGX_OK;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
892 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
893
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
894 return NGX_AGAIN;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
895 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
896
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
897
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
898 static ngx_int_t
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
899 ngx_http_gzip_filter_deflate_end(ngx_http_request_t *r,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
900 ngx_http_gzip_ctx_t *ctx)
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
901 {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
902 int rc;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
903 ngx_buf_t *b;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
904 ngx_chain_t *cl;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
905 struct gztrailer *trailer;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
906
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
907 ctx->zin = ctx->zstream.total_in;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
908 ctx->zout = 10 + ctx->zstream.total_out + 8;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
909
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
910 rc = deflateEnd(&ctx->zstream);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
911
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
912 if (rc != Z_OK) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
913 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
914 "deflateEnd() failed: %d", rc);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
915 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
916 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
917
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
918 ngx_pfree(r->pool, ctx->preallocated);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
919
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
920 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
921 if (cl == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
922 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
923 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
924
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
925 cl->buf = ctx->out_buf;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
926 cl->next = NULL;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
927 *ctx->last_out = cl;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
928 ctx->last_out = &cl->next;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
929
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
930 if (ctx->zstream.avail_out >= 8) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
931 trailer = (struct gztrailer *) ctx->out_buf->last;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
932 ctx->out_buf->last += 8;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
933 ctx->out_buf->last_buf = 1;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
934
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
935 } else {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
936 b = ngx_create_temp_buf(r->pool, 8);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
937 if (b == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
938 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
939 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
940
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
941 b->last_buf = 1;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
942
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
943 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
944 if (cl == NULL) {
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
945 return NGX_ERROR;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
946 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
947
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
948 cl->buf = b;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
949 cl->next = NULL;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
950 *ctx->last_out = cl;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
951 ctx->last_out = &cl->next;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
952 trailer = (struct gztrailer *) b->pos;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
953 b->last += 8;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
954 }
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
955
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
956 #if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
957
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
958 trailer->crc32 = ctx->crc32;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
959 trailer->zlen = ctx->zin;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
960
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
961 #else
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
962
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
963 trailer->crc32[0] = (u_char) (ctx->crc32 & 0xff);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
964 trailer->crc32[1] = (u_char) ((ctx->crc32 >> 8) & 0xff);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
965 trailer->crc32[2] = (u_char) ((ctx->crc32 >> 16) & 0xff);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
966 trailer->crc32[3] = (u_char) ((ctx->crc32 >> 24) & 0xff);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
967
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
968 trailer->zlen[0] = (u_char) (ctx->zin & 0xff);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
969 trailer->zlen[1] = (u_char) ((ctx->zin >> 8) & 0xff);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
970 trailer->zlen[2] = (u_char) ((ctx->zin >> 16) & 0xff);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
971 trailer->zlen[3] = (u_char) ((ctx->zin >> 24) & 0xff);
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
972
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
973 #endif
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
974
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
975 ctx->zstream.avail_in = 0;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
976 ctx->zstream.avail_out = 0;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
977
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
978 ctx->done = 1;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
979
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
980 r->connection->buffered &= ~NGX_HTTP_GZIP_BUFFERED;
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
981
e9a1cddf2aaa *) split ngx_http_gzip_body_filter()
Igor Sysoev <igor@sysoev.ru>
parents: 2290
diff changeset
982 return NGX_OK;
133
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
983 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
984
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
985
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
986 static void *
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
987 ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size)
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
988 {
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
989 ngx_http_gzip_ctx_t *ctx = opaque;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
990
294
5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 292
diff changeset
991 void *p;
5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import
Igor Sysoev <igor@sysoev.ru>
parents: 292
diff changeset
992 ngx_uint_t alloc;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
993
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
994 alloc = items * size;
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
995
2425
3d60d55b9ad0 do not try to align to a page size, allocate just 8K,
Igor Sysoev <igor@sysoev.ru>
parents: 2412
diff changeset
996 if (alloc % 512 != 0 && alloc < 8192) {
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
997
346
55e496a8ece3 nginx-0.0.3-2004-06-06-23:49:18 import
Igor Sysoev <igor@sysoev.ru>
parents: 344
diff changeset
998 /*
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
999 * The zlib deflate_state allocation, it takes about 6K,
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
1000 * we allocate 8K. Other allocations are divisible by 512.
346
55e496a8ece3 nginx-0.0.3-2004-06-06-23:49:18 import
Igor Sysoev <igor@sysoev.ru>
parents: 344
diff changeset
1001 */
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1002
2425
3d60d55b9ad0 do not try to align to a page size, allocate just 8K,
Igor Sysoev <igor@sysoev.ru>
parents: 2412
diff changeset
1003 alloc = 8192;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1004 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1005
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1006 if (alloc <= ctx->allocated) {
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1007 p = ctx->free_mem;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1008 ctx->free_mem += alloc;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1009 ctx->allocated -= alloc;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1010
257
70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 243
diff changeset
1011 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ctx->request->connection->log, 0,
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
1012 "gzip alloc: n:%ud s:%ud a:%ud p:%p",
257
70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 243
diff changeset
1013 items, size, alloc, p);
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1014
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1015 return p;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1016 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1017
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1018 ngx_log_error(NGX_LOG_ALERT, ctx->request->connection->log, 0,
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
1019 "gzip filter failed to use preallocated memory: %ud of %ud",
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1020 items * size, ctx->allocated);
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1021
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1022 p = ngx_palloc(ctx->request->pool, items * size);
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1023
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1024 return p;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1025 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1026
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1027
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
1028 static void
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
1029 ngx_http_gzip_filter_free(void *opaque, void *address)
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1030 {
282
30310107dbc9 nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents: 265
diff changeset
1031 #if 0
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1032 ngx_http_gzip_ctx_t *ctx = opaque;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1033
257
70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import
Igor Sysoev <igor@sysoev.ru>
parents: 243
diff changeset
1034 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ctx->request->connection->log, 0,
461
a88a3e4e158f nginx-0.1.5-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 455
diff changeset
1035 "gzip free: %p", address);
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1036 #endif
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1037 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1038
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1039
2410
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1040 static void
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1041 ngx_http_gzip_filter_free_copy_buf(ngx_http_request_t *r,
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1042 ngx_http_gzip_ctx_t *ctx)
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1043 {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1044 ngx_chain_t *cl;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1045
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1046 for (cl = ctx->copied; cl; cl = cl->next) {
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1047 ngx_pfree(r->pool, cl->buf->start);
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1048 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1049
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1050 ctx->copied = NULL;
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1051 }
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1052
bbfaeb220e90 postpone zlib memory allocation
Igor Sysoev <igor@sysoev.ru>
parents: 2292
diff changeset
1053
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
1054 static ngx_int_t
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1055 ngx_http_gzip_add_variables(ngx_conf_t *cf)
177
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
1056 {
880
3b763d36e055 axe old % log format
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
1057 ngx_http_variable_t *var;
177
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
1058
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 577
diff changeset
1059 var = ngx_http_add_variable(cf, &ngx_http_gzip_ratio, NGX_HTTP_VAR_NOHASH);
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1060 if (var == NULL) {
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1061 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1062 }
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1063
637
e60fe4cf1d4e nginx-0.3.40-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 597
diff changeset
1064 var->get_handler = ngx_http_gzip_ratio_variable;
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1065
177
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
1066 return NGX_OK;
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
1067 }
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
1068
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 166
diff changeset
1069
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
1070 static ngx_int_t
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1071 ngx_http_gzip_ratio_variable(ngx_http_request_t *r,
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1072 ngx_http_variable_value_t *v, uintptr_t data)
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1073 {
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1074 ngx_uint_t zint, zfrac;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1075 ngx_http_gzip_ctx_t *ctx;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1076
577
4d9ea73a627a nginx-0.3.10-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 573
diff changeset
1077 v->valid = 1;
1565
4c43e25d11ea fix English grammar
Igor Sysoev <igor@sysoev.ru>
parents: 1554
diff changeset
1078 v->no_cacheable = 0;
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1079 v->not_found = 0;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1080
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1081 ctx = ngx_http_get_module_ctx(r, ngx_http_gzip_filter_module);
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1082
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1083 if (ctx == NULL || ctx->zout == 0) {
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1084 v->not_found = 1;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1085 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1086 }
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1087
2049
2a92804f4109 *) back out r2040
Igor Sysoev <igor@sysoev.ru>
parents: 1790
diff changeset
1088 v->data = ngx_pnalloc(r->pool, NGX_INT32_LEN + 3);
573
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1089 if (v->data == NULL) {
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1090 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1091 }
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1092
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1093 zint = (ngx_uint_t) (ctx->zin / ctx->zout);
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1094 zfrac = (ngx_uint_t) ((ctx->zin * 100 / ctx->zout) % 100);
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1095
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1096 if ((ctx->zin * 1000 / ctx->zout) % 10 > 4) {
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1097
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1098 /* the rounding, e.g., 2.125 to 2.13 */
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1099
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1100 zfrac++;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1101
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1102 if (zfrac > 99) {
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1103 zint++;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1104 zfrac = 0;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1105 }
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1106 }
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1107
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1108 v->len = ngx_sprintf(v->data, "%ui.%02ui", zint, zfrac) - v->data;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1109
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1110 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1111 }
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1112
58475592100c nginx-0.3.8-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 553
diff changeset
1113
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
1114 static void *
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
1115 ngx_http_gzip_create_conf(ngx_conf_t *cf)
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1116 {
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1117 ngx_http_gzip_conf_t *conf;
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1118
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 497
diff changeset
1119 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_gzip_conf_t));
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 497
diff changeset
1120 if (conf == NULL) {
2912
c7d57b539248 return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents: 2542
diff changeset
1121 return NULL;
430
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
1122 }
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1123
430
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
1124 /*
479
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 469
diff changeset
1125 * set by ngx_pcalloc():
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 469
diff changeset
1126 *
c52408583801 nginx-0.1.14-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 469
diff changeset
1127 * conf->bufs.num = 0;
2166
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
1128 * conf->types = { NULL };
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
1129 * conf->types_keys = NULL;
430
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
1130 */
320
d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import
Igor Sysoev <igor@sysoev.ru>
parents: 319
diff changeset
1131
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1132 conf->enable = NGX_CONF_UNSET;
290
87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents: 289
diff changeset
1133 conf->no_buffer = NGX_CONF_UNSET;
314
d71c87d11b16 nginx-0.0.3-2004-04-14-09:57:36 import
Igor Sysoev <igor@sysoev.ru>
parents: 294
diff changeset
1134
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
1135 conf->postpone_gzipping = NGX_CONF_UNSET_SIZE;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1136 conf->level = NGX_CONF_UNSET;
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
1137 conf->wbits = NGX_CONF_UNSET_SIZE;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
1138 conf->memlevel = NGX_CONF_UNSET_SIZE;
356
2e3cbc1bbe3c nginx-0.0.7-2004-06-16-19:32:11 import
Igor Sysoev <igor@sysoev.ru>
parents: 355
diff changeset
1139 conf->min_length = NGX_CONF_UNSET;
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1140
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1141 return conf;
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1142 }
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1143
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1144
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
1145 static char *
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
1146 ngx_http_gzip_merge_conf(ngx_conf_t *cf, void *parent, void *child)
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1147 {
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1148 ngx_http_gzip_conf_t *prev = parent;
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1149 ngx_http_gzip_conf_t *conf = child;
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1150
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1151 ngx_conf_merge_value(conf->enable, prev->enable, 0);
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
1152 ngx_conf_merge_value(conf->no_buffer, prev->no_buffer, 0);
314
d71c87d11b16 nginx-0.0.3-2004-04-14-09:57:36 import
Igor Sysoev <igor@sysoev.ru>
parents: 294
diff changeset
1153
2412
086c20fe2e97 set default gzip_buffers to 32 4k or 16 8k
Igor Sysoev <igor@sysoev.ru>
parents: 2410
diff changeset
1154 ngx_conf_merge_bufs_value(conf->bufs, prev->bufs,
086c20fe2e97 set default gzip_buffers to 32 4k or 16 8k
Igor Sysoev <igor@sysoev.ru>
parents: 2410
diff changeset
1155 (128 * 1024) / ngx_pagesize, ngx_pagesize);
314
d71c87d11b16 nginx-0.0.3-2004-04-14-09:57:36 import
Igor Sysoev <igor@sysoev.ru>
parents: 294
diff changeset
1156
2542
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
1157 ngx_conf_merge_size_value(conf->postpone_gzipping, prev->postpone_gzipping,
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411
Igor Sysoev <igor@sysoev.ru>
parents: 2536
diff changeset
1158 0);
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1159 ngx_conf_merge_value(conf->level, prev->level, 1);
319
7a8ebba985a9 nginx-0.0.3-2004-04-16-19:27:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 315
diff changeset
1160 ngx_conf_merge_size_value(conf->wbits, prev->wbits, MAX_WBITS);
7a8ebba985a9 nginx-0.0.3-2004-04-16-19:27:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 315
diff changeset
1161 ngx_conf_merge_size_value(conf->memlevel, prev->memlevel,
7a8ebba985a9 nginx-0.0.3-2004-04-16-19:27:31 import
Igor Sysoev <igor@sysoev.ru>
parents: 315
diff changeset
1162 MAX_MEM_LEVEL - 1);
577
4d9ea73a627a nginx-0.3.10-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 573
diff changeset
1163 ngx_conf_merge_value(conf->min_length, prev->min_length, 20);
134
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import
Igor Sysoev <igor@sysoev.ru>
parents: 133
diff changeset
1164
3372
6b8e5c882e47 support "*" in gzip_types, ssi_types, etc
Igor Sysoev <igor@sysoev.ru>
parents: 3314
diff changeset
1165 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types,
6b8e5c882e47 support "*" in gzip_types, ssi_types, etc
Igor Sysoev <igor@sysoev.ru>
parents: 3314
diff changeset
1166 &prev->types_keys, &prev->types,
2166
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
1167 ngx_http_html_default_types)
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
1168 != NGX_OK)
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
1169 {
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types
Igor Sysoev <igor@sysoev.ru>
parents: 2051
diff changeset
1170 return NGX_CONF_ERROR;
452
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
1171 }
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
1172
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
1173 return NGX_CONF_OK;
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
1174 }
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
1175
23fb87bddda1 nginx-0.1.1-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 444
diff changeset
1176
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1177 static ngx_int_t
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1178 ngx_http_gzip_filter_init(ngx_conf_t *cf)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1179 {
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1180 ngx_http_next_header_filter = ngx_http_top_header_filter;
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1181 ngx_http_top_header_filter = ngx_http_gzip_header_filter;
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1182
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1183 ngx_http_next_body_filter = ngx_http_top_body_filter;
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1184 ngx_http_top_body_filter = ngx_http_gzip_body_filter;
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1185
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1186 return NGX_OK;
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1187 }
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1188
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 663
diff changeset
1189
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
1190 static char *
527
7fa11e5c6e96 nginx-0.1.38-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 513
diff changeset
1191 ngx_http_gzip_window(ngx_conf_t *cf, void *post, void *data)
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1192 {
2290
1a7567e5b988 change int to size_t
Igor Sysoev <igor@sysoev.ru>
parents: 2288
diff changeset
1193 size_t *np = data;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1194
2290
1a7567e5b988 change int to size_t
Igor Sysoev <igor@sysoev.ru>
parents: 2288
diff changeset
1195 size_t wbits, wsize;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1196
430
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
1197 wbits = 15;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1198
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1199 for (wsize = 32 * 1024; wsize > 256; wsize >>= 1) {
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1200
158
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import
Igor Sysoev <igor@sysoev.ru>
parents: 157
diff changeset
1201 if (wsize == *np) {
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import
Igor Sysoev <igor@sysoev.ru>
parents: 157
diff changeset
1202 *np = wbits;
430
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
1203
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
1204 return NGX_CONF_OK;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1205 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1206
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1207 wbits--;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1208 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1209
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1210 return "must be 512, 1k, 2k, 4k, 8k, 16k, or 32k";
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1211 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1212
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1213
497
d7c90bb5ce83 nginx-0.1.23-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 489
diff changeset
1214 static char *
527
7fa11e5c6e96 nginx-0.1.38-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 513
diff changeset
1215 ngx_http_gzip_hash(ngx_conf_t *cf, void *post, void *data)
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1216 {
2290
1a7567e5b988 change int to size_t
Igor Sysoev <igor@sysoev.ru>
parents: 2288
diff changeset
1217 size_t *np = data;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1218
2290
1a7567e5b988 change int to size_t
Igor Sysoev <igor@sysoev.ru>
parents: 2288
diff changeset
1219 size_t memlevel, hsize;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1220
430
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
1221 memlevel = 9;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1222
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1223 for (hsize = 128 * 1024; hsize > 256; hsize >>= 1) {
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1224
158
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import
Igor Sysoev <igor@sysoev.ru>
parents: 157
diff changeset
1225 if (hsize == *np) {
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import
Igor Sysoev <igor@sysoev.ru>
parents: 157
diff changeset
1226 *np = memlevel;
430
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
1227
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import
Igor Sysoev <igor@sysoev.ru>
parents: 416
diff changeset
1228 return NGX_CONF_OK;
156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1229 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1230
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1231 memlevel--;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1232 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1233
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1234 return "must be 512, 1k, 2k, 4k, 8k, 16k, 32k, 64k, or 128k";
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import
Igor Sysoev <igor@sysoev.ru>
parents: 155
diff changeset
1235 }