nginx: src/http/modules/ngx_http_gzip_filter

annotate src/http/modules/ngx_http_gzip_filter_module.c @ 8153:fcb2333c9982

Gzip: compatibility with recent zlib-ng versions. It now uses custom alloc_aligned() wrapper for all allocations, therefore all allocations are larger than expected by (64 + sizeof(void*)). Further, they are seen as allocations of 1 element. Relevant calculations were adjusted to reflect this, and state allocation is now protected with a flag to avoid misinterpreting other allocations as the zlib deflate_state allocation. Further, it no longer forces window bits to 13 on compression level 1, so the comment was adjusted to reflect this.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Mon, 27 Mar 2023 21:25:05 +0300
parents	d26db4f82d7d
children

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;
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	58 unsigned buffering:1;
7816 1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	59 unsigned zlib_ng:1;
8153 fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	60 unsigned state_allocated:1;
177 4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	61
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	62 size_t zin;
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	63 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	64
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
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	70 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	71 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	72 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	73 ngx_chain_t *in);
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	74 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	75 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	76 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	77 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	78 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	79 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	80 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	81 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	82 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	83 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	84
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	85 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	86 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	87 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	88 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	89 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	90
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	91 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	92 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	93 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	94
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	95 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	96 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	97 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	98 void parent, void child);
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	99 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	100 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	101
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	102
158 d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	103 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	104 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	105 };
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	106
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	107 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	108 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	109
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	110
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	111 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	112
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	113 { ngx_string("gzip"),
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 483 diff changeset	114 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	115 \|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	116 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	117 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	118 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	119 NULL },
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	120
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	121 { 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	122 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	123 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	124 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	125 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	126 NULL },
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	127
452 23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	128 { ngx_string("gzip_types"),
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	129 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	130 ngx_http_types_slot,
452 23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	131 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	132 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	133 &ngx_http_html_default_types[0] },
452 23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	134
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	135 { 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	136 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	137 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	138 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	139 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	140 &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	141
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	142 { 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	143 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	144 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	145 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	146 offsetof(ngx_http_gzip_conf_t, wbits),
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	147 &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	148
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	149 { 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	150 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	151 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	152 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	153 offsetof(ngx_http_gzip_conf_t, memlevel),
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	154 &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	155
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	156 { ngx_string("postpone_gzipping"),
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	157 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	158 ngx_conf_set_size_slot,
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	159 NGX_HTTP_LOC_CONF_OFFSET,
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	160 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	161 NULL },
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	162
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	163 { 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	164 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	165 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	166 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	167 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	168 NULL },
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	169
320 d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import Igor Sysoev <igor@sysoev.ru> parents: 319 diff changeset	170 { 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	171 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	172 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	173 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	174 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	175 NULL },
314 d71c87d11b16 nginx-0.0.3-2004-04-14-09:57:36 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	176
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	177 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	178 };
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	179
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	180
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	181 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	182 ngx_http_gzip_add_variables, /* preconfiguration */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	183 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	184
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	185 NULL, /* create main configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	186 NULL, /* init main configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	187
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	188 NULL, /* create server configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	189 NULL, /* merge server configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	190
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	191 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	192 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	193 };
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	194
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	195
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	196 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	197 NGX_MODULE_V1,
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	198 &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	199 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	200 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	201 NULL, /* init master */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	202 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	203 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	204 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	205 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	206 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	207 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	208 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	209 };
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	210
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	211
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	212 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	213
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 154 diff changeset	214 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	215 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	216
7816 1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	217 static ngx_uint_t ngx_http_gzip_assume_zlib_ng;
7155 29e9571b1989 Gzip: support for a zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7033 diff changeset	218
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	219
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	220 static ngx_int_t
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	221 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	222 {
2051 115e6f029fcc "gzip_vary on" always sends "Vary: Accept-Encoding" header Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	223 ngx_table_elt_t *h;
115e6f029fcc "gzip_vary on" always sends "Vary: Accept-Encoding" header Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	224 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	225 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	226
135 e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	227 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	228
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	229 if (!conf->enable
452 23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	230 \|\| (r->headers_out.status != NGX_HTTP_OK
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	231 && r->headers_out.status != NGX_HTTP_FORBIDDEN
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	232 && 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	233 \|\| (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	234 && 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	235 \|\| (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	236 && 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	237 \|\| 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	238 \|\| 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	239 {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 154 diff changeset	240 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	241 }
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	242
3313 118169a8ec92 refactor gzip_vary handling Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	243 r->gzip_vary = 1;
118169a8ec92 refactor gzip_vary handling Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	244
3773 a08e8b3832ae gzip_disable degradation Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	245 #if (NGX_HTTP_DEGRADATION)
a08e8b3832ae gzip_disable degradation Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	246 {
a08e8b3832ae gzip_disable degradation Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	247 ngx_http_core_loc_conf_t *clcf;
a08e8b3832ae gzip_disable degradation Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	248
a08e8b3832ae gzip_disable degradation Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	249 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	250
a08e8b3832ae gzip_disable degradation Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	251 if (clcf->gzip_disable_degradation && ngx_http_degraded(r)) {
a08e8b3832ae gzip_disable degradation Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	252 return ngx_http_next_header_filter(r);
a08e8b3832ae gzip_disable degradation Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	253 }
a08e8b3832ae gzip_disable degradation Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	254 }
a08e8b3832ae gzip_disable degradation Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	255 #endif
a08e8b3832ae gzip_disable degradation Igor Sysoev <igor@sysoev.ru> parents: 3516 diff changeset	256
3313 118169a8ec92 refactor gzip_vary handling Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	257 if (!r->gzip_tested) {
118169a8ec92 refactor gzip_vary handling Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	258 if (ngx_http_gzip_ok(r) != NGX_OK) {
118169a8ec92 refactor gzip_vary handling Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	259 return ngx_http_next_header_filter(r);
118169a8ec92 refactor gzip_vary handling Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	260 }
118169a8ec92 refactor gzip_vary handling Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	261
118169a8ec92 refactor gzip_vary handling Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	262 } else if (!r->gzip_ok) {
118169a8ec92 refactor gzip_vary handling Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	263 return ngx_http_next_header_filter(r);
118169a8ec92 refactor gzip_vary handling Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	264 }
118169a8ec92 refactor gzip_vary handling Igor Sysoev <igor@sysoev.ru> parents: 2912 diff changeset	265
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	266 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	267 if (ctx == NULL) {
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	268 return NGX_ERROR;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	269 }
314 d71c87d11b16 nginx-0.0.3-2004-04-14-09:57:36 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	270
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	271 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	272
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	273 ctx->request = r;
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	274 ctx->buffering = (conf->postpone_gzipping != 0);
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	275
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	276 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	277
1790 775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	278 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	279 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	280 return NGX_ERROR;
84036764e215 nginx-0.0.1-2003-10-29-11:30:44 import Igor Sysoev <igor@sysoev.ru> parents: 160 diff changeset	281 }
135 e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	282
1790 775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	283 h->hash = 1;
8031 d26db4f82d7d All known output headers can be linked lists now. Maxim Dounin <mdounin@mdounin.ru> parents: 7817 diff changeset	284 h->next = NULL;
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3379 diff changeset	285 ngx_str_set(&h->key, "Content-Encoding");
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3379 diff changeset	286 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	287 r->headers_out.content_encoding = h;
775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	288
513 fbbf16224844 nginx-0.1.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	289 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	290
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	291 ngx_http_clear_content_length(r);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	292 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	293 ngx_http_weak_etag(r);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	294
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 154 diff changeset	295 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	296 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	297
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	298
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	299 static ngx_int_t
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	300 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	301 {
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	302 int rc;
5876 973fded4f461 Gzip, gunzip: flush busy buffers if any. Maxim Dounin <mdounin@mdounin.ru> parents: 5733 diff changeset	303 ngx_uint_t flush;
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	304 ngx_chain_t *cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	305 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	306
243 bf2faf694c19 nginx-0.0.1-2004-01-28-23:38:54 import Igor Sysoev <igor@sysoev.ru> parents: 239 diff changeset	307 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	308
4990 e2794322ec76 Fixed HEAD requests handling when proxying is used (closes #261). Valentin Bartenev <vbart@nginx.com> parents: 4965 diff changeset	309 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	310 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	311 }
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	312
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	313 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	314 "http gzip filter");
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	315
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	316 if (ctx->buffering) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	317
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	318 /*
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	319 * 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	320 * 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	321 * 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	322 * 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	323 * 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	324 * 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	325 */
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	326
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	327 if (in) {
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	328 switch (ngx_http_gzip_filter_buffer(ctx, in)) {
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	329
2468 76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	330 case NGX_OK:
76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	331 return NGX_OK;
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	332
2468 76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	333 case NGX_DONE:
76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	334 in = NULL;
76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	335 break;
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	336
2468 76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	337 default: /* NGX_ERROR */
76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	338 goto failed;
76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	339 }
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	340
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	341 } else {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	342 ctx->buffering = 0;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	343 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	344 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	345
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	346 if (ctx->preallocated == NULL) {
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	347 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	348 goto failed;
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	349 }
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	350 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	351
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	352 if (in) {
2536 a6d6d762c554 small optimization: " == NGX_ERROR" > " != NGX_OK" Igor Sysoev <igor@sysoev.ru> parents: 2468 diff changeset	353 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	354 goto failed;
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	355 }
5291 84155a389bcc Gzip: clearing of c->buffered if all data are flushed. Maxim Dounin <mdounin@mdounin.ru> parents: 5107 diff changeset	356
84155a389bcc Gzip: clearing of c->buffered if all data are flushed. Maxim Dounin <mdounin@mdounin.ru> parents: 5107 diff changeset	357 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	358 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	359
5876 973fded4f461 Gzip, gunzip: flush busy buffers if any. Maxim Dounin <mdounin@mdounin.ru> parents: 5733 diff changeset	360 if (ctx->nomem) {
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	361
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	362 /* flush busy buffers */
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	363
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	364 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	365 goto failed;
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	366 }
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	367
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	368 cl = NULL;
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	369
4114 5db098f97e0e API change: ngx_chain_update_chains() now requires pool. Maxim Dounin <mdounin@mdounin.ru> parents: 3773 diff changeset	370 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	371 (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	372 ctx->nomem = 0;
5876 973fded4f461 Gzip, gunzip: flush busy buffers if any. Maxim Dounin <mdounin@mdounin.ru> parents: 5733 diff changeset	373 flush = 0;
973fded4f461 Gzip, gunzip: flush busy buffers if any. Maxim Dounin <mdounin@mdounin.ru> parents: 5733 diff changeset	374
973fded4f461 Gzip, gunzip: flush busy buffers if any. Maxim Dounin <mdounin@mdounin.ru> parents: 5733 diff changeset	375 } else {
973fded4f461 Gzip, gunzip: flush busy buffers if any. Maxim Dounin <mdounin@mdounin.ru> parents: 5733 diff changeset	376 flush = ctx->busy ? 1 : 0;
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	377 }
141 656d468f4ead nginx-0.0.1-2003-10-08-19:32:54 import Igor Sysoev <igor@sysoev.ru> parents: 136 diff changeset	378
135 e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	379 for ( ;; ) {
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	380
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	381 /* cycle while we can write to a client */
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	382
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	383 for ( ;; ) {
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	384
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	385 /* 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	386
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	387 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	388
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	389 if (rc == NGX_DECLINED) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	390 break;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	391 }
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	392
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	393 if (rc == NGX_AGAIN) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	394 continue;
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	395 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	396
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	397
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	398 /* ... 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	399
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	400 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	401
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	402 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	403 break;
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import Igor Sysoev <igor@sysoev.ru> parents: 322 diff changeset	404 }
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import Igor Sysoev <igor@sysoev.ru> parents: 322 diff changeset	405
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	406 if (rc == NGX_ERROR) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	407 goto failed;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	408 }
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	409
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	410
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	411 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	412
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	413 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	414 break;
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import Igor Sysoev <igor@sysoev.ru> parents: 322 diff changeset	415 }
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	416
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	417 if (rc == NGX_ERROR) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	418 goto failed;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	419 }
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	420
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	421 /* rc == NGX_AGAIN */
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	422 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	423
5876 973fded4f461 Gzip, gunzip: flush busy buffers if any. Maxim Dounin <mdounin@mdounin.ru> parents: 5733 diff changeset	424 if (ctx->out == NULL && !flush) {
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	425 ngx_http_gzip_filter_free_copy_buf(r, ctx);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	426
2292 51487a60eba2 fix the previous commit Igor Sysoev <igor@sysoev.ru> parents: 2291 diff changeset	427 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	428 }
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	429
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	430 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	431
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	432 if (rc == NGX_ERROR) {
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	433 goto failed;
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	434 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	435
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	436 ngx_http_gzip_filter_free_copy_buf(r, ctx);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	437
4114 5db098f97e0e API change: ngx_chain_update_chains() now requires pool. Maxim Dounin <mdounin@mdounin.ru> parents: 3773 diff changeset	438 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	439 (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	440 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	441
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	442 ctx->nomem = 0;
5876 973fded4f461 Gzip, gunzip: flush busy buffers if any. Maxim Dounin <mdounin@mdounin.ru> parents: 5733 diff changeset	443 flush = 0;
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	444
327 e0f3f238db09 nginx-0.0.3-2004-04-26-17:40:01 import Igor Sysoev <igor@sysoev.ru> parents: 326 diff changeset	445 if (ctx->done) {
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	446 return rc;
327 e0f3f238db09 nginx-0.0.3-2004-04-26-17:40:01 import Igor Sysoev <igor@sysoev.ru> parents: 326 diff changeset	447 }
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	448 }
2291 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 /* unreachable */
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	451
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	452 failed:
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	453
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	454 ctx->done = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	455
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	456 if (ctx->preallocated) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	457 deflateEnd(&ctx->zstream);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	458
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	459 ngx_pfree(r->pool, ctx->preallocated);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	460 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	461
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	462 ngx_http_gzip_filter_free_copy_buf(r, ctx);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	463
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	464 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	465 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	466
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	467
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	468 static void
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	469 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	470 {
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	471 int wbits, memlevel;
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	472 ngx_http_gzip_conf_t *conf;
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 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	475
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	476 wbits = conf->wbits;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	477 memlevel = conf->memlevel;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	478
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	479 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	480
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	481 /* 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	482
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	483 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	484 wbits--;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	485 memlevel--;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	486 }
4965 58dfef910ccd Gzip: fixed zlib memLevel adjusting. Valentin Bartenev <vbart@nginx.com> parents: 4746 diff changeset	487
58dfef910ccd Gzip: fixed zlib memLevel adjusting. Valentin Bartenev <vbart@nginx.com> parents: 4746 diff changeset	488 if (memlevel < 1) {
58dfef910ccd Gzip: fixed zlib memLevel adjusting. Valentin Bartenev <vbart@nginx.com> parents: 4746 diff changeset	489 memlevel = 1;
58dfef910ccd Gzip: fixed zlib memLevel adjusting. Valentin Bartenev <vbart@nginx.com> parents: 4746 diff changeset	490 }
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	491 }
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 ctx->wbits = wbits;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	494 ctx->memlevel = memlevel;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	495
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	496 /*
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	497 * 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	498 * 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	499 * 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	500 * 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	501 * 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	502 *
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	503 * 8K is for zlib deflate_state, it takes
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	504 * *) 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	505 * *) 5920 bytes on amd64 and sparc64
7817 c297c2c252d8 Gzip: updated handling of zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7816 diff changeset	506 *
c297c2c252d8 Gzip: updated handling of zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7816 diff changeset	507 * A zlib variant from Intel (https://github.com/jtkukunas/zlib)
c297c2c252d8 Gzip: updated handling of zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7816 diff changeset	508 * uses additional 16-byte padding in one of window-sized buffers.
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	509 */
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	510
7817 c297c2c252d8 Gzip: updated handling of zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7816 diff changeset	511 if (!ngx_http_gzip_assume_zlib_ng) {
7155 29e9571b1989 Gzip: support for a zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7033 diff changeset	512 ctx->allocated = 8192 + 16 + (1 << (wbits + 2))
7817 c297c2c252d8 Gzip: updated handling of zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7816 diff changeset	513 + (1 << (memlevel + 9));
7816 1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	514
1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	515 } else {
1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	516 /*
1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	517 * Another zlib variant, https://github.com/zlib-ng/zlib-ng.
8153 fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	518 * It used to force window bits to 13 for fast compression level,
fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	519 * uses (64 + sizeof(void*)) additional space on all allocations
fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	520 * for alignment, 16-byte padding in one of window-sized buffers,
fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	521 * and 128K hash.
7816 1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	522 */
1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	523
1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	524 if (conf->level == 1) {
1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	525 wbits = ngx_max(wbits, 13);
1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	526 }
1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	527
1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	528 ctx->allocated = 8192 + 16 + (1 << (wbits + 2))
8153 fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	529 + 131072 + (1 << (memlevel + 8))
fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	530 + 4 * (64 + sizeof(void*));
7816 1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	531 ctx->zlib_ng = 1;
7155 29e9571b1989 Gzip: support for a zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7033 diff changeset	532 }
2410 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
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	535
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	536 static ngx_int_t
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	537 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	538 {
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	539 size_t size, buffered;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	540 ngx_buf_t b, buf;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	541 ngx_chain_t cl, *ll;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	542 ngx_http_request_t *r;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	543 ngx_http_gzip_conf_t *conf;
2410 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 = ctx->request;
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 r->connection->buffered \|= NGX_HTTP_GZIP_BUFFERED;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	548
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	549 buffered = 0;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	550 ll = &ctx->in;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	551
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	552 for (cl = ctx->in; cl; cl = cl->next) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	553 buffered += cl->buf->last - cl->buf->pos;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	554 ll = &cl->next;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	555 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	556
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	557 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	558
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	559 while (in) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	560 cl = ngx_alloc_chain_link(r->pool);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	561 if (cl == NULL) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	562 return NGX_ERROR;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	563 }
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 b = in->buf;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	566
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	567 size = b->last - b->pos;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	568 buffered += size;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	569
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	570 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	571 ctx->buffering = 0;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	572 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	573
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	574 if (ctx->buffering && size) {
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	575
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	576 buf = ngx_create_temp_buf(r->pool, size);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	577 if (buf == NULL) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	578 return NGX_ERROR;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	579 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	580
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	581 buf->last = ngx_cpymem(buf->pos, b->pos, size);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	582 b->pos = b->last;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	583
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	584 buf->last_buf = b->last_buf;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	585 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	586
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	587 cl->buf = buf;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	588
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	589 } else {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	590 cl->buf = b;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	591 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	592
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	593 *ll = cl;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	594 ll = &cl->next;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	595 in = in->next;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	596 }
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 *ll = NULL;
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 return ctx->buffering ? NGX_OK : NGX_DONE;
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
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	603
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	604 static ngx_int_t
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	605 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	606 ngx_http_gzip_ctx_t *ctx)
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	607 {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	608 int rc;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	609 ngx_http_gzip_conf_t *conf;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	610
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	611 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	612
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	613 ctx->preallocated = ngx_palloc(r->pool, ctx->allocated);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	614 if (ctx->preallocated == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	615 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	616 }
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->free_mem = ctx->preallocated;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	619
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	620 ctx->zstream.zalloc = ngx_http_gzip_filter_alloc;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	621 ctx->zstream.zfree = ngx_http_gzip_filter_free;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	622 ctx->zstream.opaque = ctx;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	623
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	624 rc = deflateInit2(&ctx->zstream, (int) conf->level, Z_DEFLATED,
7534 ac5a741d39cf Gzip: use zlib to write header and trailer. Ilya Leoshkevich <iii@linux.ibm.com> parents: 7155 diff changeset	625 ctx->wbits + 16, ctx->memlevel, Z_DEFAULT_STRATEGY);
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	626
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	627 if (rc != Z_OK) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	628 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	629 "deflateInit2() failed: %d", rc);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	630 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	631 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	632
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	633 ctx->last_out = &ctx->out;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	634 ctx->flush = Z_NO_FLUSH;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	635
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	636 return NGX_OK;
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
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	640 static ngx_int_t
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	641 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	642 {
6910 da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	643 ngx_chain_t *cl;
da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	644
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	645 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	646 return NGX_OK;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	647 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	648
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	649 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	650 "gzip in: %p", ctx->in);
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 if (ctx->in == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	653 return NGX_DECLINED;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	654 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	655
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	656 if (ctx->copy_buf) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	657
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	658 /*
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	659 * 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	660 * but postpone free()ing after zlib compressing and data output
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	661 */
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	662
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	663 ctx->copy_buf->next = ctx->copied;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	664 ctx->copied = ctx->copy_buf;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	665 ctx->copy_buf = NULL;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	666 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	667
6910 da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	668 cl = ctx->in;
da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	669 ctx->in_buf = cl->buf;
da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	670 ctx->in = cl->next;
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	671
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	672 if (ctx->in_buf->tag == (ngx_buf_tag_t) &ngx_http_gzip_filter_module) {
6910 da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	673 ctx->copy_buf = cl;
da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	674
da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	675 } else {
da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	676 ngx_free_chain(r->pool, cl);
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	677 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	678
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	679 ctx->zstream.next_in = ctx->in_buf->pos;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	680 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	681
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	682 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	683 "gzip in_buf:%p ni:%p ai:%ud",
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	684 ctx->in_buf,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	685 ctx->zstream.next_in, ctx->zstream.avail_in);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	686
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	687 if (ctx->in_buf->last_buf) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	688 ctx->flush = Z_FINISH;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	689
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	690 } else if (ctx->in_buf->flush) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	691 ctx->flush = Z_SYNC_FLUSH;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	692
7534 ac5a741d39cf Gzip: use zlib to write header and trailer. Ilya Leoshkevich <iii@linux.ibm.com> parents: 7155 diff changeset	693 } else if (ctx->zstream.avail_in == 0) {
ac5a741d39cf Gzip: use zlib to write header and trailer. Ilya Leoshkevich <iii@linux.ibm.com> parents: 7155 diff changeset	694 /* ctx->flush == Z_NO_FLUSH */
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	695 return NGX_AGAIN;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	696 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	697
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	698 return NGX_OK;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	699 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	700
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	701
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	702 static ngx_int_t
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	703 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	704 {
6910 da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	705 ngx_chain_t *cl;
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	706 ngx_http_gzip_conf_t *conf;
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 if (ctx->zstream.avail_out) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	709 return NGX_OK;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	710 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	711
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	712 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	713
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	714 if (ctx->free) {
6910 da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	715
da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	716 cl = ctx->free;
da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	717 ctx->out_buf = cl->buf;
da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	718 ctx->free = cl->next;
da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	719
da46bfc484ef Gzip: free chain links on the hot path (ticket #1046). Maxim Dounin <mdounin@mdounin.ru> parents: 6480 diff changeset	720 ngx_free_chain(r->pool, cl);
2291 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 } else if (ctx->bufs < conf->bufs.num) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	723
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	724 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	725 if (ctx->out_buf == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	726 return NGX_ERROR;
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 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	730 ctx->out_buf->recycled = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	731 ctx->bufs++;
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 } else {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	734 ctx->nomem = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	735 return NGX_DECLINED;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	736 }
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 ctx->zstream.next_out = ctx->out_buf->pos;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	739 ctx->zstream.avail_out = conf->bufs.size;
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 return NGX_OK;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	742 }
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
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	745 static ngx_int_t
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	746 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	747 {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	748 int rc;
4468 93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	749 ngx_buf_t *b;
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	750 ngx_chain_t *cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	751 ngx_http_gzip_conf_t *conf;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	752
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	753 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	754 "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	755 ctx->zstream.next_in, ctx->zstream.next_out,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	756 ctx->zstream.avail_in, ctx->zstream.avail_out,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	757 ctx->flush, ctx->redo);
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 rc = deflate(&ctx->zstream, ctx->flush);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	760
4468 93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	761 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	762 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	763 "deflate() failed: %d, %d", ctx->flush, rc);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	764 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	765 }
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 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	768 "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	769 ctx->zstream.next_in, ctx->zstream.next_out,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	770 ctx->zstream.avail_in, ctx->zstream.avail_out,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	771 rc);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	772
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	773 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	774 "gzip in_buf:%p pos:%p",
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	775 ctx->in_buf, ctx->in_buf->pos);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	776
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	777 if (ctx->zstream.next_in) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	778 ctx->in_buf->pos = ctx->zstream.next_in;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	779
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	780 if (ctx->zstream.avail_in == 0) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	781 ctx->zstream.next_in = NULL;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	782 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	783 }
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 ctx->out_buf->last = ctx->zstream.next_out;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	786
7545 0ef2bc0ec9c9 Gzip: fixed "zero size buf" alerts after ac5a741d39cf. Maxim Dounin <mdounin@mdounin.ru> parents: 7534 diff changeset	787 if (ctx->zstream.avail_out == 0 && rc != Z_STREAM_END) {
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	788
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	789 /* zlib wants to output some more gzipped data */
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	790
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	791 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	792 if (cl == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	793 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	794 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	795
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	796 cl->buf = ctx->out_buf;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	797 cl->next = NULL;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	798 *ctx->last_out = cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	799 ctx->last_out = &cl->next;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	800
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	801 ctx->redo = 1;
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 return NGX_AGAIN;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	804 }
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 ctx->redo = 0;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	807
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	808 if (ctx->flush == Z_SYNC_FLUSH) {
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 ctx->flush = Z_NO_FLUSH;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	811
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	812 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	813 if (cl == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	814 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	815 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	816
4468 93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	817 b = ctx->out_buf;
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	818
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	819 if (ngx_buf_size(b) == 0) {
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	820
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	821 b = ngx_calloc_buf(ctx->request->pool);
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	822 if (b == NULL) {
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	823 return NGX_ERROR;
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	824 }
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	825
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	826 } else {
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	827 ctx->zstream.avail_out = 0;
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	828 }
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	829
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	830 b->flush = 1;
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	831
93dd50a9dc70 Gzip filter: handling of empty flush buffers. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	832 cl->buf = b;
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	833 cl->next = NULL;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	834 *ctx->last_out = cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	835 ctx->last_out = &cl->next;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	836
5291 84155a389bcc Gzip: clearing of c->buffered if all data are flushed. Maxim Dounin <mdounin@mdounin.ru> parents: 5107 diff changeset	837 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	838
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	839 return NGX_OK;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	840 }
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 if (rc == Z_STREAM_END) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	843
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	844 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	845 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	846 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	847
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	848 return NGX_OK;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	849 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	850
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	851 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	852
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	853 if (conf->no_buffer && ctx->in == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	854
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	855 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	856 if (cl == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	857 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	858 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	859
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	860 cl->buf = ctx->out_buf;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	861 cl->next = NULL;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	862 *ctx->last_out = cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	863 ctx->last_out = &cl->next;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	864
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 return NGX_AGAIN;
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
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	871
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	872 static ngx_int_t
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	873 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	874 ngx_http_gzip_ctx_t *ctx)
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	875 {
7534 ac5a741d39cf Gzip: use zlib to write header and trailer. Ilya Leoshkevich <iii@linux.ibm.com> parents: 7155 diff changeset	876 int rc;
7545 0ef2bc0ec9c9 Gzip: fixed "zero size buf" alerts after ac5a741d39cf. Maxim Dounin <mdounin@mdounin.ru> parents: 7534 diff changeset	877 ngx_buf_t *b;
7534 ac5a741d39cf Gzip: use zlib to write header and trailer. Ilya Leoshkevich <iii@linux.ibm.com> parents: 7155 diff changeset	878 ngx_chain_t *cl;
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	879
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	880 ctx->zin = ctx->zstream.total_in;
7534 ac5a741d39cf Gzip: use zlib to write header and trailer. Ilya Leoshkevich <iii@linux.ibm.com> parents: 7155 diff changeset	881 ctx->zout = ctx->zstream.total_out;
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	882
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	883 rc = deflateEnd(&ctx->zstream);
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 if (rc != Z_OK) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	886 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	887 "deflateEnd() failed: %d", rc);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	888 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	889 }
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 ngx_pfree(r->pool, ctx->preallocated);
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 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	894 if (cl == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	895 return NGX_ERROR;
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
7545 0ef2bc0ec9c9 Gzip: fixed "zero size buf" alerts after ac5a741d39cf. Maxim Dounin <mdounin@mdounin.ru> parents: 7534 diff changeset	898 b = ctx->out_buf;
0ef2bc0ec9c9 Gzip: fixed "zero size buf" alerts after ac5a741d39cf. Maxim Dounin <mdounin@mdounin.ru> parents: 7534 diff changeset	899
0ef2bc0ec9c9 Gzip: fixed "zero size buf" alerts after ac5a741d39cf. Maxim Dounin <mdounin@mdounin.ru> parents: 7534 diff changeset	900 if (ngx_buf_size(b) == 0) {
0ef2bc0ec9c9 Gzip: fixed "zero size buf" alerts after ac5a741d39cf. Maxim Dounin <mdounin@mdounin.ru> parents: 7534 diff changeset	901 b->temporary = 0;
0ef2bc0ec9c9 Gzip: fixed "zero size buf" alerts after ac5a741d39cf. Maxim Dounin <mdounin@mdounin.ru> parents: 7534 diff changeset	902 }
0ef2bc0ec9c9 Gzip: fixed "zero size buf" alerts after ac5a741d39cf. Maxim Dounin <mdounin@mdounin.ru> parents: 7534 diff changeset	903
0ef2bc0ec9c9 Gzip: fixed "zero size buf" alerts after ac5a741d39cf. Maxim Dounin <mdounin@mdounin.ru> parents: 7534 diff changeset	904 b->last_buf = 1;
0ef2bc0ec9c9 Gzip: fixed "zero size buf" alerts after ac5a741d39cf. Maxim Dounin <mdounin@mdounin.ru> parents: 7534 diff changeset	905
0ef2bc0ec9c9 Gzip: fixed "zero size buf" alerts after ac5a741d39cf. Maxim Dounin <mdounin@mdounin.ru> parents: 7534 diff changeset	906 cl->buf = b;
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	907 cl->next = NULL;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	908 *ctx->last_out = cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	909 ctx->last_out = &cl->next;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	910
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	911 ctx->zstream.avail_in = 0;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	912 ctx->zstream.avail_out = 0;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	913
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	914 ctx->done = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	915
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	916 r->connection->buffered &= ~NGX_HTTP_GZIP_BUFFERED;
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 return NGX_OK;
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	919 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	920
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	921
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	922 static void *
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	923 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	924 {
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	925 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	926
294 5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	927 void *p;
5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	928 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	929
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	930 alloc = items * size;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	931
8153 fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	932 if (items == 1 && alloc % 512 != 0 && alloc < 8192
fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	933 && !ctx->state_allocated)
fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	934 {
346 55e496a8ece3 nginx-0.0.3-2004-06-06-23:49:18 import Igor Sysoev <igor@sysoev.ru> parents: 344 diff changeset	935 /*
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	936 * 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	937 * 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	938 */
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	939
8153 fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	940 ctx->state_allocated = 1;
fcb2333c9982 Gzip: compatibility with recent zlib-ng versions. Maxim Dounin <mdounin@mdounin.ru> parents: 8031 diff changeset	941
2425 3d60d55b9ad0 do not try to align to a page size, allocate just 8K, Igor Sysoev <igor@sysoev.ru> parents: 2412 diff changeset	942 alloc = 8192;
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	943 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	944
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	945 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	946 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	947 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	948 ctx->allocated -= alloc;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	949
257 70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import Igor Sysoev <igor@sysoev.ru> parents: 243 diff changeset	950 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ctx->request->connection->log, 0,
6480 f01ab2dbcfdc Fixed logging. Sergey Kandaurov <pluknet@nginx.com> parents: 5876 diff changeset	951 "gzip alloc: n:%ud s:%ud a:%ui p:%p",
257 70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import Igor Sysoev <igor@sysoev.ru> parents: 243 diff changeset	952 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	953
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	954 return p;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	955 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	956
7816 1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	957 if (ctx->zlib_ng) {
7155 29e9571b1989 Gzip: support for a zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7033 diff changeset	958 ngx_log_error(NGX_LOG_ALERT, ctx->request->connection->log, 0,
29e9571b1989 Gzip: support for a zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7033 diff changeset	959 "gzip filter failed to use preallocated memory: "
29e9571b1989 Gzip: support for a zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7033 diff changeset	960 "%ud of %ui", items * size, ctx->allocated);
29e9571b1989 Gzip: support for a zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7033 diff changeset	961
7817 c297c2c252d8 Gzip: updated handling of zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7816 diff changeset	962 } else {
7816 1f3d0d9f893f Gzip: support for zlib-ng. Maxim Dounin <mdounin@mdounin.ru> parents: 7545 diff changeset	963 ngx_http_gzip_assume_zlib_ng = 1;
7155 29e9571b1989 Gzip: support for a zlib variant from Intel. Maxim Dounin <mdounin@mdounin.ru> parents: 7033 diff changeset	964 }
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	965
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	966 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	967
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	968 return p;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	969 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	970
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	971
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	972 static void
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	973 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	974 {
282 30310107dbc9 nginx-0.0.2-2004-03-09-22:47:07 import Igor Sysoev <igor@sysoev.ru> parents: 265 diff changeset	975 #if 0
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	976 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	977
257 70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import Igor Sysoev <igor@sysoev.ru> parents: 243 diff changeset	978 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	979 "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	980 #endif
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	981 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	982
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	983
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	984 static void
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	985 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	986 ngx_http_gzip_ctx_t *ctx)
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	987 {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	988 ngx_chain_t *cl;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	989
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	990 for (cl = ctx->copied; cl; cl = cl->next) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	991 ngx_pfree(r->pool, cl->buf->start);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	992 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	993
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	994 ctx->copied = NULL;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	995 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	996
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	997
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	998 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	999 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	1000 {
880 3b763d36e055 axe old % log format Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	1001 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	1002
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1003 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	1004 if (var == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1005 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1006 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1007
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	1008 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	1009
177 4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	1010 return NGX_OK;
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	1011 }
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	1012
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	1013
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1014 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1015 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	1016 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	1017 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1018 ngx_uint_t zint, zfrac;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1019 ngx_http_gzip_ctx_t *ctx;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1020
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1021 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	1022
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1023 if (ctx == NULL \|\| ctx->zout == 0) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1024 v->not_found = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1025 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1026 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1027
7033 ab5117642647 Gzip: fixed style in $gzip_ratio variable handler. Ruslan Ermilov <ru@nginx.com> parents: 6973 diff changeset	1028 v->valid = 1;
ab5117642647 Gzip: fixed style in $gzip_ratio variable handler. Ruslan Ermilov <ru@nginx.com> parents: 6973 diff changeset	1029 v->no_cacheable = 0;
ab5117642647 Gzip: fixed style in $gzip_ratio variable handler. Ruslan Ermilov <ru@nginx.com> parents: 6973 diff changeset	1030 v->not_found = 0;
ab5117642647 Gzip: fixed style in $gzip_ratio variable handler. Ruslan Ermilov <ru@nginx.com> parents: 6973 diff changeset	1031
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1790 diff changeset	1032 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	1033 if (v->data == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1034 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1035 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1036
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1037 zint = (ngx_uint_t) (ctx->zin / ctx->zout);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1038 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	1039
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1040 if ((ctx->zin * 1000 / ctx->zout) % 10 > 4) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1041
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1042 /* 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	1043
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1044 zfrac++;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1045
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1046 if (zfrac > 99) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1047 zint++;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1048 zfrac = 0;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1049 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1050 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1051
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1052 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	1053
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1054 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1055 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1056
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1057
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1058 static void *
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1059 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	1060 {
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1061 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	1062
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	1063 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	1064 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	1065 return NULL;
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1066 }
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1067
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1068 /*
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	1069 * set by ngx_pcalloc():
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	1070 *
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	1071 * 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	1072 * conf->types = { NULL };
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	1073 * 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	1074 */
320 d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import Igor Sysoev <igor@sysoev.ru> parents: 319 diff changeset	1075
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1076 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	1077 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	1078
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1079 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	1080 conf->level = NGX_CONF_UNSET;
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1081 conf->wbits = NGX_CONF_UNSET_SIZE;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1082 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	1083 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	1084
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1085 return conf;
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1086 }
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1087
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1088
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1089 static char *
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1090 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	1091 {
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1092 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	1093 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	1094
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1095 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	1096 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	1097
2412 086c20fe2e97 set default gzip_buffers to 32 4k or 16 8k Igor Sysoev <igor@sysoev.ru> parents: 2410 diff changeset	1098 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	1099 (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	1100
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1101 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	1102 0);
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1103 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	1104 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	1105 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	1106 MAX_MEM_LEVEL - 1);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1107 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	1108
3372 6b8e5c882e47 support "" in gzip_types, ssi_types, etc Igor Sysoev <igor@sysoev.ru>* parents: 3314 diff changeset	1109 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	1110 &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	1111 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	1112 != NGX_OK)
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	1113 {
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	1114 return NGX_CONF_ERROR;
452 23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1115 }
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1116
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1117 return NGX_CONF_OK;
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1118 }
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1119
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1120
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1121 static ngx_int_t
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1122 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	1123 {
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1124 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	1125 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	1126
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1127 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	1128 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	1129
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1130 return NGX_OK;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1131 }
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1132
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1133
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1134 static char *
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	1135 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	1136 {
2290 1a7567e5b988 change int to size_t Igor Sysoev <igor@sysoev.ru> parents: 2288 diff changeset	1137 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	1138
2290 1a7567e5b988 change int to size_t Igor Sysoev <igor@sysoev.ru> parents: 2288 diff changeset	1139 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	1140
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1141 wbits = 15;
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1142
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1143 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	1144
158 d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	1145 if (wsize == *np) {
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	1146 *np = wbits;
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1147
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1148 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	1149 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1150
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1151 wbits--;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1152 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1153
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1154 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	1155 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1156
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1157
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1158 static char *
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	1159 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	1160 {
2290 1a7567e5b988 change int to size_t Igor Sysoev <igor@sysoev.ru> parents: 2288 diff changeset	1161 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	1162
2290 1a7567e5b988 change int to size_t Igor Sysoev <igor@sysoev.ru> parents: 2288 diff changeset	1163 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	1164
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1165 memlevel = 9;
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1166
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1167 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	1168
158 d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	1169 if (hsize == *np) {
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	1170 *np = memlevel;
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1171
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1172 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	1173 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1174
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1175 memlevel--;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1176 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1177
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1178 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	1179 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_gzip_filter_module.c @ 8153:fcb2333c9982