nginx: src/http/modules/ngx_http_gzip_filter

annotate src/http/modules/ngx_http_gzip_filter_module.c @ 3440:88741ec7731a stable-0.7

merge r3294, r3305: Fix a bug introduced in r2032: After a child process has read a terminate message from a channel, the process tries to read the channel again. The kernel (at least FreeBSD) may preempt the process and sends a SIGIO signal to a master process. The master process sends a new terminate message, the kernel switches again to the the child process, and the child process reads the messages instead of an EAGAIN error. And this may repeat over and over. Being that the child process can not exit the cycle and test the termination flag set by the message handler. The fix disallow the master process to send a new terminate message on SIGIO signal reception. It may send the message only on SIGALARM signal.

author	Igor Sysoev <igor@sysoev.ru>
date	Mon, 01 Feb 2010 15:49:36 +0000
parents	2efa8d2fcde1
children	118169a8ec92 b0fbe6ab9ebe

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
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	4 */
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
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	6
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7 #include <ngx_config.h>
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_core.h>
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_http.h>
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	11 #include <zlib.h>
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12
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 typedef struct {
290 87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import Igor Sysoev <igor@sysoev.ru> parents: 289 diff changeset	15 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	16 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	17
2166 723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	18 ngx_hash_t types;
452 23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	19
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	20 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	21
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	22 size_t postpone_gzipping;
589 d4e858a5751a nginx-0.3.16-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	23 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	24 size_t wbits;
7a8ebba985a9 nginx-0.0.3-2004-04-16-19:27:31 import Igor Sysoev <igor@sysoev.ru> parents: 315 diff changeset	25 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	26 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	27
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	28 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	29 } 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	30
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 typedef struct {
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	33 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	34 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	35 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	36 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	37 ngx_chain_t **last_out;
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	38
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	39 ngx_chain_t *copied;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	40 ngx_chain_t *copy_buf;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	41
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	42 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	43 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	44 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	45
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	46 void *preallocated;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	47 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	48 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	49
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	50 int wbits;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	51 int memlevel;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	52
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	53 unsigned flush:4;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	54 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	55 unsigned done:1;
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	56 unsigned nomem:1;
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	57 unsigned gzheader:1;
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	58 unsigned buffering:1;
177 4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	59
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	60 size_t zin;
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	61 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	62
290 87e73f067470 nginx-0.0.2-2004-03-16-10:10:12 import Igor Sysoev <igor@sysoev.ru> parents: 289 diff changeset	63 uint32_t crc32;
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	64 z_stream zstream;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	65 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	66 } 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	67
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	68
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	69 #if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	70
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	71 struct gztrailer {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	72 uint32_t crc32;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	73 uint32_t zlen;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	74 };
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	75
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	76 #else /* NGX_HAVE_BIG_ENDIAN \|\| !NGX_HAVE_NONALIGNED */
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	77
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	78 struct gztrailer {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	79 u_char crc32[4];
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	80 u_char zlen[4];
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	81 };
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	82
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	83 #endif
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	84
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	85
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	86 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	87 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	88 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	89 ngx_chain_t *in);
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	90 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	91 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	92 static ngx_int_t ngx_http_gzip_filter_gzheader(ngx_http_request_t *r,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	93 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	94 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	95 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	96 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	97 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	98 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	99 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	100 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	101 ngx_http_gzip_ctx_t *ctx);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	102
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	103 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	104 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	105 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	106 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	107 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	108
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	109 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	110 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	111 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	112
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	113 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	114 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	115 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	116 void parent, void child);
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	117 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	118 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	119
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	120
158 d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	121 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	122 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	123 };
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	124
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	125 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	126 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	127
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	128
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	129 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	130
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	131 { ngx_string("gzip"),
485 4ebe09b07e30 nginx-0.1.17-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 483 diff changeset	132 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	133 \|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	134 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	135 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	136 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	137 NULL },
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	138
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	139 { 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	140 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	141 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	142 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	143 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	144 NULL },
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	145
452 23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	146 { ngx_string("gzip_types"),
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	147 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	148 ngx_http_types_slot,
452 23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	149 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	150 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	151 &ngx_http_html_default_types[0] },
452 23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	152
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	153 { 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	154 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	155 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	156 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	157 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	158 &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	159
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	160 { 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	161 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	162 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	163 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	164 offsetof(ngx_http_gzip_conf_t, wbits),
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	165 &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	166
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	167 { 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	168 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	169 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	170 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	171 offsetof(ngx_http_gzip_conf_t, memlevel),
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	172 &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	173
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	174 { ngx_string("postpone_gzipping"),
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	175 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	176 ngx_conf_set_size_slot,
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	177 NGX_HTTP_LOC_CONF_OFFSET,
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	178 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	179 NULL },
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	180
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	181 { 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	182 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	183 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	184 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	185 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	186 NULL },
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	187
320 d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import Igor Sysoev <igor@sysoev.ru> parents: 319 diff changeset	188 { 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	189 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	190 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	191 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	192 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	193 NULL },
314 d71c87d11b16 nginx-0.0.3-2004-04-14-09:57:36 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	194
239 574bea0142be nginx-0.0.1-2004-01-26-11:52:49 import Igor Sysoev <igor@sysoev.ru> parents: 177 diff changeset	195 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	196 };
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	197
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	198
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	199 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	200 ngx_http_gzip_add_variables, /* preconfiguration */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	201 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	202
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	203 NULL, /* create main configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	204 NULL, /* init main configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	205
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	206 NULL, /* create server configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	207 NULL, /* merge server configuration */
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	208
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	209 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	210 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	211 };
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	212
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	213
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	214 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	215 NGX_MODULE_V1,
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	216 &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	217 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	218 NGX_HTTP_MODULE, /* module type */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	219 NULL, /* init master */
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	220 NULL, /* init module */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	221 NULL, /* init process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	222 NULL, /* init thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	223 NULL, /* exit thread */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	224 NULL, /* exit process */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	225 NULL, /* exit master */
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	226 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	227 };
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	228
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	229
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	230 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	231
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 154 diff changeset	232 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	233 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	234
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	235
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	236 static ngx_int_t
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	237 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	238 {
2051 115e6f029fcc "gzip_vary on" always sends "Vary: Accept-Encoding" header Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	239 ngx_table_elt_t *h;
115e6f029fcc "gzip_vary on" always sends "Vary: Accept-Encoding" header Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	240 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	241 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	242
135 e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	243 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	244
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	245 if (!conf->enable
452 23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	246 \|\| (r->headers_out.status != NGX_HTTP_OK
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	247 && r->headers_out.status != NGX_HTTP_FORBIDDEN
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	248 && r->headers_out.status != NGX_HTTP_NOT_FOUND)
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	249 \|\| r->header_only
135 e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	250 \|\| (r->headers_out.content_encoding
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	251 && r->headers_out.content_encoding->value.len)
320 d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import Igor Sysoev <igor@sysoev.ru> parents: 319 diff changeset	252 \|\| (r->headers_out.content_length_n != -1
d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import Igor Sysoev <igor@sysoev.ru> parents: 319 diff changeset	253 && r->headers_out.content_length_n < conf->min_length)
2166 723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	254 \|\| ngx_http_test_content_type(r, &conf->types) == NULL
1790 775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	255 \|\| ngx_http_gzip_ok(r) != NGX_OK)
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	256 {
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 154 diff changeset	257 return ngx_http_next_header_filter(r);
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	258 }
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	259
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	260 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	261 if (ctx == NULL) {
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	262 return NGX_ERROR;
d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	263 }
314 d71c87d11b16 nginx-0.0.3-2004-04-14-09:57:36 import Igor Sysoev <igor@sysoev.ru> parents: 294 diff changeset	264
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	265 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	266
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	267 ctx->request = r;
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	268 ctx->buffering = (conf->postpone_gzipping != 0);
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	269
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	270 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	271
1790 775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	272 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	273 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	274 return NGX_ERROR;
84036764e215 nginx-0.0.1-2003-10-29-11:30:44 import Igor Sysoev <igor@sysoev.ru> parents: 160 diff changeset	275 }
135 e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	276
1790 775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	277 h->hash = 1;
775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	278 h->key.len = sizeof("Content-Encoding") - 1;
775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	279 h->key.data = (u_char *) "Content-Encoding";
775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	280 h->value.len = sizeof("gzip") - 1;
775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	281 h->value.data = (u_char *) "gzip";
1583 45cbc1aa8652 gzip_vary Igor Sysoev <igor@sysoev.ru> parents: 1565 diff changeset	282
1790 775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	283 r->headers_out.content_encoding = h;
775edc46ee66 ngx_http_gzip_static_module and gzip_disable Igor Sysoev <igor@sysoev.ru> parents: 1626 diff changeset	284
513 fbbf16224844 nginx-0.1.31-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	285 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	286
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	287 ngx_http_clear_content_length(r);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	288 ngx_http_clear_accept_ranges(r);
4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	289
155 46eb23d9471d nginx-0.0.1-2003-10-22-20:38:26 import Igor Sysoev <igor@sysoev.ru> parents: 154 diff changeset	290 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	291 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	292
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	293
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	294 static ngx_int_t
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	295 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	296 {
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	297 int rc;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	298 ngx_chain_t *cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	299 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	300
243 bf2faf694c19 nginx-0.0.1-2004-01-28-23:38:54 import Igor Sysoev <igor@sysoev.ru> parents: 239 diff changeset	301 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	302
243 bf2faf694c19 nginx-0.0.1-2004-01-28-23:38:54 import Igor Sysoev <igor@sysoev.ru> parents: 239 diff changeset	303 if (ctx == NULL \|\| ctx->done) {
177 4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	304 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	305 }
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	306
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	307 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	308 "http gzip filter");
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	309
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	310 if (ctx->buffering) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	311
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	312 /*
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	313 * 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	314 * 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	315 * 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	316 * 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	317 * 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	318 * 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	319 */
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	320
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	321 if (in) {
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	322 switch (ngx_http_gzip_filter_buffer(ctx, in)) {
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	323
2468 76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	324 case NGX_OK:
76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	325 return NGX_OK;
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	326
2468 76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	327 case NGX_DONE:
76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	328 in = NULL;
76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	329 break;
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	330
2468 76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	331 default: /* NGX_ERROR */
76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	332 goto failed;
76925110cdae style fix: remove tabs Igor Sysoev <igor@sysoev.ru> parents: 2425 diff changeset	333 }
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	334
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	335 } else {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	336 ctx->buffering = 0;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	337 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	338 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	339
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	340 if (ctx->preallocated == NULL) {
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	341 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	342 goto failed;
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	343 }
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	344 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	345
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	346 if (in) {
2536 a6d6d762c554 small optimization: " == NGX_ERROR" > " != NGX_OK" Igor Sysoev <igor@sysoev.ru> parents: 2468 diff changeset	347 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	348 goto failed;
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 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
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	352 if (ctx->nomem) {
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	353
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	354 /* flush busy buffers */
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	355
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	356 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	357 goto failed;
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	358 }
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	359
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	360 cl = NULL;
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	361
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	362 ngx_chain_update_chains(&ctx->free, &ctx->busy, &cl,
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	363 (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	364 ctx->nomem = 0;
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	365 }
141 656d468f4ead nginx-0.0.1-2003-10-08-19:32:54 import Igor Sysoev <igor@sysoev.ru> parents: 136 diff changeset	366
135 e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	367 for ( ;; ) {
e29909bd9b8a nginx-0.0.1-2003-09-28-23:29:06 import Igor Sysoev <igor@sysoev.ru> parents: 134 diff changeset	368
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	369 /* cycle while we can write to a client */
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	370
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	371 for ( ;; ) {
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	372
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	373 /* 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	374
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	375 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	376
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	377 if (rc == NGX_DECLINED) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	378 break;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	379 }
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	380
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	381 if (rc == NGX_AGAIN) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	382 continue;
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	383 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	384
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	385
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	386 /* ... 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	387
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	388 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	389
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	390 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	391 break;
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import Igor Sysoev <igor@sysoev.ru> parents: 322 diff changeset	392 }
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import Igor Sysoev <igor@sysoev.ru> parents: 322 diff changeset	393
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	394 if (rc == NGX_ERROR) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	395 goto failed;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	396 }
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	397
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	398
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	399 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	400
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	401 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	402 break;
ba876b26b76d nginx-0.0.3-2004-04-21-22:54:33 import Igor Sysoev <igor@sysoev.ru> parents: 322 diff changeset	403 }
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	404
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	405 if (rc == NGX_ERROR) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	406 goto failed;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	407 }
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	408
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	409 /* rc == NGX_AGAIN */
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	410 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	411
1626 7caa66b819df fix gzip and SSL Igor Sysoev <igor@sysoev.ru> parents: 1583 diff changeset	412 if (ctx->out == NULL) {
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	413 ngx_http_gzip_filter_free_copy_buf(r, ctx);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	414
2292 51487a60eba2 fix the previous commit Igor Sysoev <igor@sysoev.ru> parents: 2291 diff changeset	415 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	416 }
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	417
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	418 if (!ctx->gzheader) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	419 if (ngx_http_gzip_filter_gzheader(r, ctx) != NGX_OK) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	420 goto failed;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	421 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	422 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	423
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	424 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	425
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	426 if (rc == NGX_ERROR) {
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	427 goto failed;
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	428 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	429
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	430 ngx_http_gzip_filter_free_copy_buf(r, ctx);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	431
154 eac26585476e nginx-0.0.1-2003-10-22-11:05:29 import Igor Sysoev <igor@sysoev.ru> parents: 153 diff changeset	432 ngx_chain_update_chains(&ctx->free, &ctx->busy, &ctx->out,
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	433 (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	434 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	435
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	436 ctx->nomem = 0;
baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	437
327 e0f3f238db09 nginx-0.0.3-2004-04-26-17:40:01 import Igor Sysoev <igor@sysoev.ru> parents: 326 diff changeset	438 if (ctx->done) {
2287 baa61933d5ed use nomem flag to flush busy bufs, Igor Sysoev <igor@sysoev.ru> parents: 2166 diff changeset	439 return rc;
327 e0f3f238db09 nginx-0.0.3-2004-04-26-17:40:01 import Igor Sysoev <igor@sysoev.ru> parents: 326 diff changeset	440 }
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	441 }
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	442
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	443 /* unreachable */
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	444
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	445 failed:
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	446
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	447 ctx->done = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	448
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	449 if (ctx->preallocated) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	450 deflateEnd(&ctx->zstream);
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 ngx_pfree(r->pool, ctx->preallocated);
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
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	455 ngx_http_gzip_filter_free_copy_buf(r, ctx);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	456
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	457 return NGX_ERROR;
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
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	460
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	461 static void
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	462 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	463 {
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	464 int wbits, memlevel;
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	465 ngx_http_gzip_conf_t *conf;
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 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	468
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	469 wbits = conf->wbits;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	470 memlevel = conf->memlevel;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	471
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	472 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	473
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	474 /* 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	475
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	476 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	477 wbits--;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	478 memlevel--;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	479 }
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
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	482 ctx->wbits = wbits;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	483 ctx->memlevel = memlevel;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	484
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	485 /*
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	486 * 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	487 * 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	488 * 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	489 * 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	490 * 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	491 *
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	492 * 8K is for zlib deflate_state, it takes
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	493 * *) 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	494 * *) 5920 bytes on amd64 and sparc64
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	495 */
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	496
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	497 ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9));
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	498 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	499
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	500
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	501 static ngx_int_t
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	502 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	503 {
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	504 size_t size, buffered;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	505 ngx_buf_t b, buf;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	506 ngx_chain_t cl, *ll;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	507 ngx_http_request_t *r;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	508 ngx_http_gzip_conf_t *conf;
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	509
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	510 r = ctx->request;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	511
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	512 r->connection->buffered \|= NGX_HTTP_GZIP_BUFFERED;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	513
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	514 buffered = 0;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	515 ll = &ctx->in;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	516
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	517 for (cl = ctx->in; cl; cl = cl->next) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	518 buffered += cl->buf->last - cl->buf->pos;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	519 ll = &cl->next;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	520 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	521
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	522 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	523
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	524 while (in) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	525 cl = ngx_alloc_chain_link(r->pool);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	526 if (cl == NULL) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	527 return NGX_ERROR;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	528 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	529
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	530 b = in->buf;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	531
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	532 size = b->last - b->pos;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	533 buffered += size;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	534
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	535 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	536 ctx->buffering = 0;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	537 }
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 if (ctx->buffering && size) {
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	540
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	541 buf = ngx_create_temp_buf(r->pool, size);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	542 if (buf == NULL) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	543 return NGX_ERROR;
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
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	546 buf->last = ngx_cpymem(buf->pos, b->pos, size);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	547 b->pos = b->last;
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 buf->last_buf = b->last_buf;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	550 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	551
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	552 cl->buf = buf;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	553
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	554 } else {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	555 cl->buf = b;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	556 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	557
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	558 *ll = cl;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	559 ll = &cl->next;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	560 in = in->next;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	561 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	562
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	563 *ll = NULL;
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 return ctx->buffering ? NGX_OK : NGX_DONE;
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
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	568
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	569 static ngx_int_t
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	570 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	571 ngx_http_gzip_ctx_t *ctx)
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 int rc;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	574 ngx_http_gzip_conf_t *conf;
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 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	577
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	578 ctx->preallocated = ngx_palloc(r->pool, ctx->allocated);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	579 if (ctx->preallocated == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	580 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	581 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	582
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	583 ctx->free_mem = ctx->preallocated;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	584
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	585 ctx->zstream.zalloc = ngx_http_gzip_filter_alloc;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	586 ctx->zstream.zfree = ngx_http_gzip_filter_free;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	587 ctx->zstream.opaque = ctx;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	588
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	589 rc = deflateInit2(&ctx->zstream, (int) conf->level, Z_DEFLATED,
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	590 - ctx->wbits, ctx->memlevel, Z_DEFAULT_STRATEGY);
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	591
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	592 if (rc != Z_OK) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	593 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	594 "deflateInit2() failed: %d", rc);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	595 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	596 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	597
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	598 ctx->last_out = &ctx->out;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	599 ctx->crc32 = crc32(0L, Z_NULL, 0);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	600 ctx->flush = Z_NO_FLUSH;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	601
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	602 return NGX_OK;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	603 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	604
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	605
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	606 static ngx_int_t
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	607 ngx_http_gzip_filter_gzheader(ngx_http_request_t r, ngx_http_gzip_ctx_t ctx)
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	608 {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	609 ngx_buf_t *b;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	610 ngx_chain_t *cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	611 static u_char gzheader[10] =
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	612 { 0x1f, 0x8b, Z_DEFLATED, 0, 0, 0, 0, 0, 0, 3 };
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	613
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	614 b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t));
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	615 if (b == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	616 return NGX_ERROR;
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
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	619 b->memory = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	620 b->pos = gzheader;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	621 b->last = b->pos + 10;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	622
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	623 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	624 if (cl == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	625 return NGX_ERROR;
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
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	628 cl->buf = b;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	629 cl->next = ctx->out;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	630 ctx->out = cl;
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 ctx->gzheader = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	633
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	634 return NGX_OK;
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
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 static ngx_int_t
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	639 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	640 {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	641 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	642 return NGX_OK;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	643 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	644
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	645 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	646 "gzip in: %p", ctx->in);
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 if (ctx->in == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	649 return NGX_DECLINED;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	650 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	651
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	652 if (ctx->copy_buf) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	653
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	654 /*
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	655 * 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	656 * but postpone free()ing after zlib compressing and data output
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 ctx->copy_buf->next = ctx->copied;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	660 ctx->copied = ctx->copy_buf;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	661 ctx->copy_buf = NULL;
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
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	664 ctx->in_buf = ctx->in->buf;
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	665
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	666 if (ctx->in_buf->tag == (ngx_buf_tag_t) &ngx_http_gzip_filter_module) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	667 ctx->copy_buf = ctx->in;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	668 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	669
2291 e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	670 ctx->in = ctx->in->next;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	671
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	672 ctx->zstream.next_in = ctx->in_buf->pos;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	673 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	674
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	675 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	676 "gzip in_buf:%p ni:%p ai:%ud",
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	677 ctx->in_buf,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	678 ctx->zstream.next_in, ctx->zstream.avail_in);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	679
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	680 if (ctx->in_buf->last_buf) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	681 ctx->flush = Z_FINISH;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	682
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	683 } else if (ctx->in_buf->flush) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	684 ctx->flush = Z_SYNC_FLUSH;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	685 }
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->zstream.avail_in) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	688
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	689 ctx->crc32 = crc32(ctx->crc32, ctx->zstream.next_in,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	690 ctx->zstream.avail_in);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	691
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	692 } else if (ctx->flush == Z_NO_FLUSH) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	693 return NGX_AGAIN;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	694 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	695
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	696 return NGX_OK;
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
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 static ngx_int_t
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	701 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	702 {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	703 ngx_http_gzip_conf_t *conf;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	704
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	705 if (ctx->zstream.avail_out) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	706 return NGX_OK;
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
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	709 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	710
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	711 if (ctx->free) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	712 ctx->out_buf = ctx->free->buf;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	713 ctx->free = ctx->free->next;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	714
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	715 } else if (ctx->bufs < conf->bufs.num) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	716
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	717 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	718 if (ctx->out_buf == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	719 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	720 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	721
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	722 ctx->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	723 ctx->out_buf->recycled = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	724 ctx->bufs++;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	725
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	726 } else {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	727 ctx->nomem = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	728 return NGX_DECLINED;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	729 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	730
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	731 ctx->zstream.next_out = ctx->out_buf->pos;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	732 ctx->zstream.avail_out = conf->bufs.size;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	733
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	734 return NGX_OK;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	735 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	736
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 static ngx_int_t
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	739 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	740 {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	741 int rc;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	742 ngx_chain_t *cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	743 ngx_http_gzip_conf_t *conf;
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 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	746 "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	747 ctx->zstream.next_in, ctx->zstream.next_out,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	748 ctx->zstream.avail_in, ctx->zstream.avail_out,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	749 ctx->flush, ctx->redo);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	750
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	751 rc = deflate(&ctx->zstream, ctx->flush);
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 if (rc != Z_OK && rc != Z_STREAM_END) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	754 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	755 "deflate() failed: %d, %d", ctx->flush, rc);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	756 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	757 }
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 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	760 "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	761 ctx->zstream.next_in, ctx->zstream.next_out,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	762 ctx->zstream.avail_in, ctx->zstream.avail_out,
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	763 rc);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	764
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	765 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	766 "gzip in_buf:%p pos:%p",
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	767 ctx->in_buf, ctx->in_buf->pos);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	768
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	769 if (ctx->zstream.next_in) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	770 ctx->in_buf->pos = ctx->zstream.next_in;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	771
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	772 if (ctx->zstream.avail_in == 0) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	773 ctx->zstream.next_in = NULL;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	774 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	775 }
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 ctx->out_buf->last = ctx->zstream.next_out;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	778
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	779 if (ctx->zstream.avail_out == 0) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	780
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	781 /* zlib wants to output some more gzipped data */
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 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	784 if (cl == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	785 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	786 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	787
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	788 cl->buf = ctx->out_buf;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	789 cl->next = NULL;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	790 *ctx->last_out = cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	791 ctx->last_out = &cl->next;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	792
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	793 ctx->redo = 1;
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 return NGX_AGAIN;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	796 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	797
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	798 ctx->redo = 0;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	799
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	800 if (ctx->flush == Z_SYNC_FLUSH) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	801
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	802 ctx->zstream.avail_out = 0;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	803 ctx->out_buf->flush = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	804 ctx->flush = Z_NO_FLUSH;
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 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	807 if (cl == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	808 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	809 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	810
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	811 cl->buf = ctx->out_buf;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	812 cl->next = NULL;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	813 *ctx->last_out = cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	814 ctx->last_out = &cl->next;
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 return NGX_OK;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	817 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	818
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	819 if (rc == Z_STREAM_END) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	820
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	821 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	822 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	823 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	824
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	825 return NGX_OK;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	826 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	827
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	828 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	829
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	830 if (conf->no_buffer && ctx->in == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	831
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	832 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	833 if (cl == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	834 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	835 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	836
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	837 cl->buf = ctx->out_buf;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	838 cl->next = NULL;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	839 *ctx->last_out = cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	840 ctx->last_out = &cl->next;
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 return NGX_OK;
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
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	845 return NGX_AGAIN;
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
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	849 static ngx_int_t
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	850 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	851 ngx_http_gzip_ctx_t *ctx)
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 int rc;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	854 ngx_buf_t *b;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	855 ngx_chain_t *cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	856 struct gztrailer *trailer;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	857
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	858 ctx->zin = ctx->zstream.total_in;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	859 ctx->zout = 10 + ctx->zstream.total_out + 8;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	860
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	861 rc = deflateEnd(&ctx->zstream);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	862
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	863 if (rc != Z_OK) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	864 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	865 "deflateEnd() failed: %d", rc);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	866 return NGX_ERROR;
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
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	869 ngx_pfree(r->pool, ctx->preallocated);
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 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	872 if (cl == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	873 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	874 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	875
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	876 cl->buf = ctx->out_buf;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	877 cl->next = NULL;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	878 *ctx->last_out = cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	879 ctx->last_out = &cl->next;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	880
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	881 if (ctx->zstream.avail_out >= 8) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	882 trailer = (struct gztrailer *) ctx->out_buf->last;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	883 ctx->out_buf->last += 8;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	884 ctx->out_buf->last_buf = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	885
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	886 } else {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	887 b = ngx_create_temp_buf(r->pool, 8);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	888 if (b == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	889 return NGX_ERROR;
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
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	892 b->last_buf = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	893
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	894 cl = ngx_alloc_chain_link(r->pool);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	895 if (cl == NULL) {
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	896 return NGX_ERROR;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	897 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	898
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	899 cl->buf = b;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	900 cl->next = NULL;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	901 *ctx->last_out = cl;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	902 ctx->last_out = &cl->next;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	903 trailer = (struct gztrailer *) b->pos;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	904 b->last += 8;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	905 }
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	906
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	907 #if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED)
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	908
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	909 trailer->crc32 = ctx->crc32;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	910 trailer->zlen = ctx->zin;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	911
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	912 #else
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 trailer->crc32[0] = (u_char) (ctx->crc32 & 0xff);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	915 trailer->crc32[1] = (u_char) ((ctx->crc32 >> 8) & 0xff);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	916 trailer->crc32[2] = (u_char) ((ctx->crc32 >> 16) & 0xff);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	917 trailer->crc32[3] = (u_char) ((ctx->crc32 >> 24) & 0xff);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	918
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	919 trailer->zlen[0] = (u_char) (ctx->zin & 0xff);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	920 trailer->zlen[1] = (u_char) ((ctx->zin >> 8) & 0xff);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	921 trailer->zlen[2] = (u_char) ((ctx->zin >> 16) & 0xff);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	922 trailer->zlen[3] = (u_char) ((ctx->zin >> 24) & 0xff);
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	923
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	924 #endif
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	925
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	926 ctx->zstream.avail_in = 0;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	927 ctx->zstream.avail_out = 0;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	928
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	929 ctx->done = 1;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	930
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	931 r->connection->buffered &= ~NGX_HTTP_GZIP_BUFFERED;
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	932
e9a1cddf2aaa ) split ngx_http_gzip_body_filter() Igor Sysoev <igor@sysoev.ru>* parents: 2290 diff changeset	933 return NGX_OK;
133 b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	934 }
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	935
b27548f540ad nginx-0.0.1-2003-09-24-23:51:12 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	936
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	937 static void *
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	938 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	939 {
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	940 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	941
294 5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	942 void *p;
5cfd65b8b0a7 nginx-0.0.3-2004-03-23-09:01:52 import Igor Sysoev <igor@sysoev.ru> parents: 292 diff changeset	943 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	944
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	945 alloc = items * size;
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	946
2425 3d60d55b9ad0 do not try to align to a page size, allocate just 8K, Igor Sysoev <igor@sysoev.ru> parents: 2412 diff changeset	947 if (alloc % 512 != 0 && alloc < 8192) {
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	948
346 55e496a8ece3 nginx-0.0.3-2004-06-06-23:49:18 import Igor Sysoev <igor@sysoev.ru> parents: 344 diff changeset	949 /*
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	950 * 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	951 * 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	952 */
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	953
2425 3d60d55b9ad0 do not try to align to a page size, allocate just 8K, Igor Sysoev <igor@sysoev.ru> parents: 2412 diff changeset	954 alloc = 8192;
156 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
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	957 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	958 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	959 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	960 ctx->allocated -= alloc;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	961
257 70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import Igor Sysoev <igor@sysoev.ru> parents: 243 diff changeset	962 ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ctx->request->connection->log, 0,
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	963 "gzip alloc: n:%ud s:%ud a:%ud p:%p",
257 70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import Igor Sysoev <igor@sysoev.ru> parents: 243 diff changeset	964 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	965
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	966 return p;
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
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	969 ngx_log_error(NGX_LOG_ALERT, ctx->request->connection->log, 0,
461 a88a3e4e158f nginx-0.1.5-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 455 diff changeset	970 "gzip filter failed to use preallocated memory: %ud of %ud",
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	971 items * size, ctx->allocated);
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	972
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	973 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	974
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	975 return p;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	976 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	977
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	978
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	979 static void
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	980 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	981 {
282 30310107dbc9 nginx-0.0.2-2004-03-09-22:47:07 import Igor Sysoev <igor@sysoev.ru> parents: 265 diff changeset	982 #if 0
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	983 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	984
257 70e1c7d2b83d nginx-0.0.2-2004-02-11-20:08:49 import Igor Sysoev <igor@sysoev.ru> parents: 243 diff changeset	985 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	986 "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	987 #endif
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	988 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	989
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	990
2410 bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	991 static void
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	992 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	993 ngx_http_gzip_ctx_t *ctx)
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	994 {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	995 ngx_chain_t *cl;
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 for (cl = ctx->copied; cl; cl = cl->next) {
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	998 ngx_pfree(r->pool, cl->buf->start);
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	999 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	1000
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	1001 ctx->copied = NULL;
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	1002 }
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	1003
bbfaeb220e90 postpone zlib memory allocation Igor Sysoev <igor@sysoev.ru> parents: 2292 diff changeset	1004
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1005 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1006 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	1007 {
880 3b763d36e055 axe old % log format Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	1008 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	1009
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	1010 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	1011 if (var == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1012 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1013 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1014
637 e60fe4cf1d4e nginx-0.3.40-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 597 diff changeset	1015 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	1016
177 4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	1017 return NGX_OK;
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	1018 }
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	1019
4db54fdbcbe7 nginx-0.0.1-2003-11-10-20:17:31 import Igor Sysoev <igor@sysoev.ru> parents: 166 diff changeset	1020
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1021 static ngx_int_t
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1022 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	1023 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	1024 {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1025 ngx_uint_t zint, zfrac;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1026 ngx_http_gzip_ctx_t *ctx;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1027
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1028 v->valid = 1;
1565 4c43e25d11ea fix English grammar Igor Sysoev <igor@sysoev.ru> parents: 1554 diff changeset	1029 v->no_cacheable = 0;
573 58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1030 v->not_found = 0;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1031
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1032 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	1033
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1034 if (ctx == NULL \|\| ctx->zout == 0) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1035 v->not_found = 1;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1036 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1037 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1038
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1790 diff changeset	1039 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	1040 if (v->data == NULL) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1041 return NGX_ERROR;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1042 }
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 zint = (ngx_uint_t) (ctx->zin / ctx->zout);
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1045 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	1046
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1047 if ((ctx->zin * 1000 / ctx->zout) % 10 > 4) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1048
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1049 /* 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	1050
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1051 zfrac++;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1052
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1053 if (zfrac > 99) {
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1054 zint++;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1055 zfrac = 0;
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 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1058
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1059 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	1060
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1061 return NGX_OK;
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1062 }
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1063
58475592100c nginx-0.3.8-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 553 diff changeset	1064
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1065 static void *
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1066 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	1067 {
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1068 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	1069
501 d4ea69372b94 nginx-0.1.25-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 497 diff changeset	1070 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	1071 if (conf == NULL) {
3237 2efa8d2fcde1 merge r2903, r2911, r2912, r3002: Igor Sysoev <igor@sysoev.ru> parents: 2542 diff changeset	1072 return NULL;
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1073 }
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1074
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1075 /*
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	1076 * set by ngx_pcalloc():
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	1077 *
c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 469 diff changeset	1078 * 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	1079 * conf->types = { NULL };
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	1080 * 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	1081 */
320 d621239c30f7 nginx-0.0.3-2004-04-18-23:06:02 import Igor Sysoev <igor@sysoev.ru> parents: 319 diff changeset	1082
134 d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1083 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	1084 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	1085
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1086 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	1087 conf->level = NGX_CONF_UNSET;
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1088 conf->wbits = NGX_CONF_UNSET_SIZE;
925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1089 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	1090 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	1091
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1092 return conf;
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1093 }
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
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1096 static char *
d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1097 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	1098 {
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1099 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	1100 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	1101
d57c6835225c nginx-0.0.1-2003-09-26-09:45:21 import Igor Sysoev <igor@sysoev.ru> parents: 133 diff changeset	1102 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	1103 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	1104
2412 086c20fe2e97 set default gzip_buffers to 32 4k or 16 8k Igor Sysoev <igor@sysoev.ru> parents: 2410 diff changeset	1105 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	1106 (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	1107
2542 925b5df2e0c2 fix postponed zlib memory allocation, introduced in r2411 Igor Sysoev <igor@sysoev.ru> parents: 2536 diff changeset	1108 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	1109 0);
156 afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1110 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	1111 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	1112 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	1113 MAX_MEM_LEVEL - 1);
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 573 diff changeset	1114 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	1115
2166 723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	1116 if (ngx_http_merge_types(cf, conf->types_keys, &conf->types,
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	1117 prev->types_keys, &prev->types,
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	1118 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	1119 != NGX_OK)
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	1120 {
723df5089c05 use hash in gzip_types, ssi_types, and sub_filter_types Igor Sysoev <igor@sysoev.ru> parents: 2051 diff changeset	1121 return NGX_CONF_ERROR;
452 23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1122 }
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1123
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1124 return NGX_CONF_OK;
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1125 }
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1126
23fb87bddda1 nginx-0.1.1-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	1127
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1128 static ngx_int_t
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1129 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	1130 {
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1131 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	1132 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	1133
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1134 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	1135 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	1136
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1137 return NGX_OK;
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1138 }
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1139
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 663 diff changeset	1140
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1141 static char *
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	1142 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	1143 {
2290 1a7567e5b988 change int to size_t Igor Sysoev <igor@sysoev.ru> parents: 2288 diff changeset	1144 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	1145
2290 1a7567e5b988 change int to size_t Igor Sysoev <igor@sysoev.ru> parents: 2288 diff changeset	1146 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	1147
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1148 wbits = 15;
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 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	1151
158 d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	1152 if (wsize == *np) {
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	1153 *np = wbits;
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1154
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1155 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	1156 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1157
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1158 wbits--;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1159 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1160
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1161 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	1162 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1163
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1164
497 d7c90bb5ce83 nginx-0.1.23-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 489 diff changeset	1165 static char *
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 513 diff changeset	1166 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	1167 {
2290 1a7567e5b988 change int to size_t Igor Sysoev <igor@sysoev.ru> parents: 2288 diff changeset	1168 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	1169
2290 1a7567e5b988 change int to size_t Igor Sysoev <igor@sysoev.ru> parents: 2288 diff changeset	1170 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	1171
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1172 memlevel = 9;
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 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	1175
158 d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	1176 if (hsize == *np) {
d377ee423603 nginx-0.0.1-2003-10-24-10:53:41 import Igor Sysoev <igor@sysoev.ru> parents: 157 diff changeset	1177 *np = memlevel;
430 1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1178
1fa5daf7558e nginx-0.0.11-2004-09-19-22:27:00 import Igor Sysoev <igor@sysoev.ru> parents: 416 diff changeset	1179 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	1180 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1181
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1182 memlevel--;
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1183 }
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1184
afc333135a6b nginx-0.0.1-2003-10-23-10:13:16 import Igor Sysoev <igor@sysoev.ru> parents: 155 diff changeset	1185 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	1186 }

Mercurial > hg > nginx

annotate src/http/modules/ngx_http_gzip_filter_module.c @ 3440:88741ec7731a stable-0.7