/[Apache-SVN]/httpd/httpd/trunk/modules/filters/mod_deflate.c
ViewVC logotype

Contents of /httpd/httpd/trunk/modules/filters/mod_deflate.c

Parent Directory Parent Directory | Revision Log Revision Log


Revision 821471 - (show annotations)
Sun Oct 4 07:37:28 2009 UTC (7 weeks, 4 days ago) by sf
File MIME type: text/plain
File size: 50211 byte(s)
core, mod_deflate, mod_sed: Reduce memory usage by reusing bucket
brigades in several places
1 /* Licensed to the Apache Software Foundation (ASF) under one or more
2 * contributor license agreements. See the NOTICE file distributed with
3 * this work for additional information regarding copyright ownership.
4 * The ASF licenses this file to You under the Apache License, Version 2.0
5 * (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16
17 /*
18 * mod_deflate.c: Perform deflate content-encoding on the fly
19 *
20 * Written by Ian Holsman, Justin Erenkrantz, and Nick Kew
21 */
22
23 /*
24 * Portions of this software are based upon zlib code by Jean-loup Gailly
25 * (zlib functions gz_open and gzwrite, check_header)
26 */
27
28 /* zlib flags */
29 #define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */
30 #define HEAD_CRC 0x02 /* bit 1 set: header CRC present */
31 #define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */
32 #define ORIG_NAME 0x08 /* bit 3 set: original file name present */
33 #define COMMENT 0x10 /* bit 4 set: file comment present */
34 #define RESERVED 0xE0 /* bits 5..7: reserved */
35
36
37 #include "httpd.h"
38 #include "http_config.h"
39 #include "http_log.h"
40 #include "apr_lib.h"
41 #include "apr_strings.h"
42 #include "apr_general.h"
43 #include "util_filter.h"
44 #include "apr_buckets.h"
45 #include "http_request.h"
46 #define APR_WANT_STRFUNC
47 #include "apr_want.h"
48
49 #include "zlib.h"
50
51 static const char deflateFilterName[] = "DEFLATE";
52 module AP_MODULE_DECLARE_DATA deflate_module;
53
54 typedef struct deflate_filter_config_t
55 {
56 int windowSize;
57 int memlevel;
58 int compressionlevel;
59 apr_size_t bufferSize;
60 char *note_ratio_name;
61 char *note_input_name;
62 char *note_output_name;
63 } deflate_filter_config;
64
65 /* RFC 1952 Section 2.3 defines the gzip header:
66 *
67 * +---+---+---+---+---+---+---+---+---+---+
68 * |ID1|ID2|CM |FLG| MTIME |XFL|OS |
69 * +---+---+---+---+---+---+---+---+---+---+
70 */
71 static const char gzip_header[10] =
72 { '\037', '\213', Z_DEFLATED, 0,
73 0, 0, 0, 0, /* mtime */
74 0, 0x03 /* Unix OS_CODE */
75 };
76
77 /* magic header */
78 static const char deflate_magic[2] = { '\037', '\213' };
79
80 /* windowsize is negative to suppress Zlib header */
81 #define DEFAULT_COMPRESSION Z_DEFAULT_COMPRESSION
82 #define DEFAULT_WINDOWSIZE -15
83 #define DEFAULT_MEMLEVEL 9
84 #define DEFAULT_BUFFERSIZE 8096
85
86
87 /* Check whether a request is gzipped, so we can un-gzip it.
88 * If a request has multiple encodings, we need the gzip
89 * to be the outermost non-identity encoding.
90 */
91 static int check_gzip(request_rec *r, apr_table_t *hdrs1, apr_table_t *hdrs2)
92 {
93 int found = 0;
94 apr_table_t *hdrs = hdrs1;
95 const char *encoding = apr_table_get(hdrs, "Content-Encoding");
96
97 if (!encoding && (hdrs2 != NULL)) {
98 /* the output filter has two tables and a content_encoding to check */
99 encoding = apr_table_get(hdrs2, "Content-Encoding");
100 hdrs = hdrs2;
101 if (!encoding) {
102 encoding = r->content_encoding;
103 hdrs = NULL;
104 }
105 }
106 if (encoding && *encoding) {
107
108 /* check the usual/simple case first */
109 if (!strcasecmp(encoding, "gzip")
110 || !strcasecmp(encoding, "x-gzip")) {
111 found = 1;
112 if (hdrs) {
113 apr_table_unset(hdrs, "Content-Encoding");
114 }
115 else {
116 r->content_encoding = NULL;
117 }
118 }
119 else if (ap_strchr_c(encoding, ',') != NULL) {
120 /* If the outermost encoding isn't gzip, there's nowt
121 * we can do. So only check the last non-identity token
122 */
123 char *new_encoding = apr_pstrdup(r->pool, encoding);
124 char *ptr;
125 for(;;) {
126 char *token = ap_strrchr(new_encoding, ',');
127 if (!token) { /* gzip:identity or other:identity */
128 if (!strcasecmp(new_encoding, "gzip")
129 || !strcasecmp(new_encoding, "x-gzip")) {
130 found = 1;
131 if (hdrs) {
132 apr_table_unset(hdrs, "Content-Encoding");
133 }
134 else {
135 r->content_encoding = NULL;
136 }
137 }
138 break; /* seen all tokens */
139 }
140 for (ptr=token+1; apr_isspace(*ptr); ++ptr);
141 if (!strcasecmp(ptr, "gzip")
142 || !strcasecmp(ptr, "x-gzip")) {
143 *token = '\0';
144 if (hdrs) {
145 apr_table_setn(hdrs, "Content-Encoding", new_encoding);
146 }
147 else {
148 r->content_encoding = new_encoding;
149 }
150 found = 1;
151 }
152 else if (!ptr[0] || !strcasecmp(ptr, "identity")) {
153 *token = '\0';
154 continue; /* strip the token and find the next one */
155 }
156 break; /* found a non-identity token */
157 }
158 }
159 }
160 /*
161 * If we have dealt with the headers above but content_encoding was set
162 * before sync it with the new value in the hdrs table as
163 * r->content_encoding takes precedence later on in the http_header_filter
164 * and hence would destroy what we have just set in the hdrs table.
165 */
166 if (hdrs && r->content_encoding) {
167 r->content_encoding = apr_table_get(hdrs, "Content-Encoding");
168 }
169 return found;
170 }
171
172 /* Outputs a long in LSB order to the given file
173 * only the bottom 4 bits are required for the deflate file format.
174 */
175 static void putLong(unsigned char *string, unsigned long x)
176 {
177 string[0] = (unsigned char)(x & 0xff);
178 string[1] = (unsigned char)((x & 0xff00) >> 8);
179 string[2] = (unsigned char)((x & 0xff0000) >> 16);
180 string[3] = (unsigned char)((x & 0xff000000) >> 24);
181 }
182
183 /* Inputs a string and returns a long.
184 */
185 static unsigned long getLong(unsigned char *string)
186 {
187 return ((unsigned long)string[0])
188 | (((unsigned long)string[1]) << 8)
189 | (((unsigned long)string[2]) << 16)
190 | (((unsigned long)string[3]) << 24);
191 }
192
193 static void *create_deflate_server_config(apr_pool_t *p, server_rec *s)
194 {
195 deflate_filter_config *c = apr_pcalloc(p, sizeof *c);
196
197 c->memlevel = DEFAULT_MEMLEVEL;
198 c->windowSize = DEFAULT_WINDOWSIZE;
199 c->bufferSize = DEFAULT_BUFFERSIZE;
200 c->compressionlevel = DEFAULT_COMPRESSION;
201
202 return c;
203 }
204
205 static const char *deflate_set_window_size(cmd_parms *cmd, void *dummy,
206 const char *arg)
207 {
208 deflate_filter_config *c = ap_get_module_config(cmd->server->module_config,
209 &deflate_module);
210 int i;
211
212 i = atoi(arg);
213
214 if (i < 1 || i > 15)
215 return "DeflateWindowSize must be between 1 and 15";
216
217 c->windowSize = i * -1;
218
219 return NULL;
220 }
221
222 static const char *deflate_set_buffer_size(cmd_parms *cmd, void *dummy,
223 const char *arg)
224 {
225 deflate_filter_config *c = ap_get_module_config(cmd->server->module_config,
226 &deflate_module);
227 int n = atoi(arg);
228
229 if (n <= 0) {
230 return "DeflateBufferSize should be positive";
231 }
232
233 c->bufferSize = (apr_size_t)n;
234
235 return NULL;
236 }
237 static const char *deflate_set_note(cmd_parms *cmd, void *dummy,
238 const char *arg1, const char *arg2)
239 {
240 deflate_filter_config *c = ap_get_module_config(cmd->server->module_config,
241 &deflate_module);
242
243 if (arg2 == NULL) {
244 c->note_ratio_name = apr_pstrdup(cmd->pool, arg1);
245 }
246 else if (!strcasecmp(arg1, "ratio")) {
247 c->note_ratio_name = apr_pstrdup(cmd->pool, arg2);
248 }
249 else if (!strcasecmp(arg1, "input")) {
250 c->note_input_name = apr_pstrdup(cmd->pool, arg2);
251 }
252 else if (!strcasecmp(arg1, "output")) {
253 c->note_output_name = apr_pstrdup(cmd->pool, arg2);
254 }
255 else {
256 return apr_psprintf(cmd->pool, "Unknown note type %s", arg1);
257 }
258
259 return NULL;
260 }
261
262 static const char *deflate_set_memlevel(cmd_parms *cmd, void *dummy,
263 const char *arg)
264 {
265 deflate_filter_config *c = ap_get_module_config(cmd->server->module_config,
266 &deflate_module);
267 int i;
268
269 i = atoi(arg);
270
271 if (i < 1 || i > 9)
272 return "DeflateMemLevel must be between 1 and 9";
273
274 c->memlevel = i;
275
276 return NULL;
277 }
278
279 static const char *deflate_set_compressionlevel(cmd_parms *cmd, void *dummy,
280 const char *arg)
281 {
282 deflate_filter_config *c = ap_get_module_config(cmd->server->module_config,
283 &deflate_module);
284 int i;
285
286 i = atoi(arg);
287
288 if (i < 1 || i > 9)
289 return "Compression Level must be between 1 and 9";
290
291 c->compressionlevel = i;
292
293 return NULL;
294 }
295
296 typedef struct deflate_ctx_t
297 {
298 z_stream stream;
299 unsigned char *buffer;
300 unsigned long crc;
301 apr_bucket_brigade *bb, *proc_bb;
302 int (*libz_end_func)(z_streamp);
303 unsigned char *validation_buffer;
304 apr_size_t validation_buffer_length;
305 int inflate_init;
306 } deflate_ctx;
307
308 /* Number of validation bytes (CRC and length) after the compressed data */
309 #define VALIDATION_SIZE 8
310 /* Do not update ctx->crc, see comment in flush_libz_buffer */
311 #define NO_UPDATE_CRC 0
312 /* Do update ctx->crc, see comment in flush_libz_buffer */
313 #define UPDATE_CRC 1
314
315 static int flush_libz_buffer(deflate_ctx *ctx, deflate_filter_config *c,
316 struct apr_bucket_alloc_t *bucket_alloc,
317 int (*libz_func)(z_streamp, int), int flush,
318 int crc)
319 {
320 int zRC = Z_OK;
321 int done = 0;
322 unsigned int deflate_len;
323 apr_bucket *b;
324
325 for (;;) {
326 deflate_len = c->bufferSize - ctx->stream.avail_out;
327
328 if (deflate_len != 0) {
329 /*
330 * Do we need to update ctx->crc? Usually this is the case for
331 * inflate action where we need to do a crc on the output, whereas
332 * in the deflate case we need to do a crc on the input
333 */
334 if (crc) {
335 ctx->crc = crc32(ctx->crc, (const Bytef *)ctx->buffer,
336 deflate_len);
337 }
338 b = apr_bucket_heap_create((char *)ctx->buffer,
339 deflate_len, NULL,
340 bucket_alloc);
341 APR_BRIGADE_INSERT_TAIL(ctx->bb, b);
342 ctx->stream.next_out = ctx->buffer;
343 ctx->stream.avail_out = c->bufferSize;
344 }
345
346 if (done)
347 break;
348
349 zRC = libz_func(&ctx->stream, flush);
350
351 /*
352 * We can ignore Z_BUF_ERROR because:
353 * When we call libz_func we can assume that
354 *
355 * - avail_in is zero (due to the surrounding code that calls
356 * flush_libz_buffer)
357 * - avail_out is non zero due to our actions some lines above
358 *
359 * So the only reason for Z_BUF_ERROR is that the internal libz
360 * buffers are now empty and thus we called libz_func one time
361 * too often. This does not hurt. It simply says that we are done.
362 */
363 if (zRC == Z_BUF_ERROR) {
364 zRC = Z_OK;
365 break;
366 }
367
368 done = (ctx->stream.avail_out != 0 || zRC == Z_STREAM_END);
369
370 if (zRC != Z_OK && zRC != Z_STREAM_END)
371 break;
372 }
373 return zRC;
374 }
375
376 static apr_status_t deflate_ctx_cleanup(void *data)
377 {
378 deflate_ctx *ctx = (deflate_ctx *)data;
379
380 if (ctx)
381 ctx->libz_end_func(&ctx->stream);
382 return APR_SUCCESS;
383 }
384
385 /* ETag must be unique among the possible representations, so a change
386 * to content-encoding requires a corresponding change to the ETag.
387 * This routine appends -transform (e.g., -gzip) to the entity-tag
388 * value inside the double-quotes if an ETag has already been set
389 * and its value already contains double-quotes. PR 39727
390 */
391 static void deflate_check_etag(request_rec *r, const char *transform)
392 {
393 const char *etag = apr_table_get(r->headers_out, "ETag");
394 apr_size_t etaglen;
395
396 if ((etag && ((etaglen = strlen(etag)) > 2))) {
397 if (etag[etaglen - 1] == '"') {
398 apr_size_t transformlen = strlen(transform);
399 char *newtag = apr_palloc(r->pool, etaglen + transformlen + 2);
400 char *d = newtag;
401 char *e = d + etaglen - 1;
402 const char *s = etag;
403
404 for (; d < e; ++d, ++s) {
405 *d = *s; /* copy etag to newtag up to last quote */
406 }
407 *d++ = '-'; /* append dash to newtag */
408 s = transform;
409 e = d + transformlen;
410 for (; d < e; ++d, ++s) {
411 *d = *s; /* copy transform to newtag */
412 }
413 *d++ = '"'; /* append quote to newtag */
414 *d = '\0'; /* null terminate newtag */
415
416 apr_table_setn(r->headers_out, "ETag", newtag);
417 }
418 }
419 }
420
421 static apr_status_t deflate_out_filter(ap_filter_t *f,
422 apr_bucket_brigade *bb)
423 {
424 apr_bucket *e;
425 request_rec *r = f->r;
426 deflate_ctx *ctx = f->ctx;
427 int zRC;
428 deflate_filter_config *c;
429
430 /* Do nothing if asked to filter nothing. */
431 if (APR_BRIGADE_EMPTY(bb)) {
432 return ap_pass_brigade(f->next, bb);
433 }
434
435 c = ap_get_module_config(r->server->module_config,
436 &deflate_module);
437
438 /* If we don't have a context, we need to ensure that it is okay to send
439 * the deflated content. If we have a context, that means we've done
440 * this before and we liked it.
441 * This could be not so nice if we always fail. But, if we succeed,
442 * we're in better shape.
443 */
444 if (!ctx) {
445 char *token;
446 const char *encoding;
447
448 /*
449 * Only work on main request, not subrequests,
450 * that are not a 204 response with no content
451 * and are not tagged with the no-gzip env variable
452 * and not a partial response to a Range request.
453 */
454 if ((r->main != NULL) || (r->status == HTTP_NO_CONTENT) ||
455 apr_table_get(r->subprocess_env, "no-gzip") ||
456 apr_table_get(r->headers_out, "Content-Range")
457 ) {
458 ap_remove_output_filter(f);
459 return ap_pass_brigade(f->next, bb);
460 }
461
462 /* Some browsers might have problems with content types
463 * other than text/html, so set gzip-only-text/html
464 * (with browsermatch) for them
465 */
466 if (r->content_type == NULL
467 || strncmp(r->content_type, "text/html", 9)) {
468 const char *env_value = apr_table_get(r->subprocess_env,
469 "gzip-only-text/html");
470 if ( env_value && (strcmp(env_value,"1") == 0) ) {
471 ap_remove_output_filter(f);
472 return ap_pass_brigade(f->next, bb);
473 }
474 }
475
476 /* Let's see what our current Content-Encoding is.
477 * If it's already encoded, don't compress again.
478 * (We could, but let's not.)
479 */
480 encoding = apr_table_get(r->headers_out, "Content-Encoding");
481 if (encoding) {
482 const char *err_enc;
483
484 err_enc = apr_table_get(r->err_headers_out, "Content-Encoding");
485 if (err_enc) {
486 encoding = apr_pstrcat(r->pool, encoding, ",", err_enc, NULL);
487 }
488 }
489 else {
490 encoding = apr_table_get(r->err_headers_out, "Content-Encoding");
491 }
492
493 if (r->content_encoding) {
494 encoding = encoding ? apr_pstrcat(r->pool, encoding, ",",
495 r->content_encoding, NULL)
496 : r->content_encoding;
497 }
498
499 if (encoding) {
500 const char *tmp = encoding;
501
502 token = ap_get_token(r->pool, &tmp, 0);
503 while (token && *token) {
504 /* stolen from mod_negotiation: */
505 if (strcmp(token, "identity") && strcmp(token, "7bit") &&
506 strcmp(token, "8bit") && strcmp(token, "binary")) {
507
508 ap_remove_output_filter(f);
509 return ap_pass_brigade(f->next, bb);
510 }
511
512 /* Otherwise, skip token */
513 if (*tmp) {
514 ++tmp;
515 }
516 token = (*tmp) ? ap_get_token(r->pool, &tmp, 0) : NULL;
517 }
518 }
519
520 /* Even if we don't accept this request based on it not having
521 * the Accept-Encoding, we need to note that we were looking
522 * for this header and downstream proxies should be aware of that.
523 */
524 apr_table_mergen(r->headers_out, "Vary", "Accept-Encoding");
525
526 /* force-gzip will just force it out regardless if the browser
527 * can actually do anything with it.
528 */
529 if (!apr_table_get(r->subprocess_env, "force-gzip")) {
530 const char *accepts;
531 /* if they don't have the line, then they can't play */
532 accepts = apr_table_get(r->headers_in, "Accept-Encoding");
533 if (accepts == NULL) {
534 ap_remove_output_filter(f);
535 return ap_pass_brigade(f->next, bb);
536 }
537
538 token = ap_get_token(r->pool, &accepts, 0);
539 while (token && token[0] && strcasecmp(token, "gzip")) {
540 /* skip parameters, XXX: ;q=foo evaluation? */
541 while (*accepts == ';') {
542 ++accepts;
543 token = ap_get_token(r->pool, &accepts, 1);
544 }
545
546 /* retrieve next token */
547 if (*accepts == ',') {
548 ++accepts;
549 }
550 token = (*accepts) ? ap_get_token(r->pool, &accepts, 0) : NULL;
551 }
552
553 /* No acceptable token found. */
554 if (token == NULL || token[0] == '\0') {
555 ap_remove_output_filter(f);
556 return ap_pass_brigade(f->next, bb);
557 }
558 }
559
560 /* At this point we have decided to filter the content, so change
561 * important content metadata before sending any response out.
562 */
563
564 /* If the entire Content-Encoding is "identity", we can replace it. */
565 if (!encoding || !strcasecmp(encoding, "identity")) {
566 apr_table_setn(r->headers_out, "Content-Encoding", "gzip");
567 }
568 else {
569 apr_table_mergen(r->headers_out, "Content-Encoding", "gzip");
570 }
571 /* Fix r->content_encoding if it was set before */
572 if (r->content_encoding) {
573 r->content_encoding = apr_table_get(r->headers_out,
574 "Content-Encoding");
575 }
576 apr_table_unset(r->headers_out, "Content-Length");
577 apr_table_unset(r->headers_out, "Content-MD5");
578 deflate_check_etag(r, "gzip");
579
580 /* For a 304 response, only change the headers */
581 if (r->status == HTTP_NOT_MODIFIED) {
582 ap_remove_output_filter(f);
583 return ap_pass_brigade(f->next, bb);
584 }
585
586 ctx = f->ctx = apr_pcalloc(r->pool, sizeof(*ctx));
587 ctx->bb = apr_brigade_create(r->pool, f->c->bucket_alloc);
588 ctx->buffer = apr_palloc(r->pool, c->bufferSize);
589 ctx->libz_end_func = deflateEnd;
590
591 zRC = deflateInit2(&ctx->stream, c->compressionlevel, Z_DEFLATED,
592 c->windowSize, c->memlevel,
593 Z_DEFAULT_STRATEGY);
594
595 if (zRC != Z_OK) {
596 deflateEnd(&ctx->stream);
597 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
598 "unable to init Zlib: "
599 "deflateInit2 returned %d: URL %s",
600 zRC, r->uri);
601 /*
602 * Remove ourselves as it does not make sense to return:
603 * We are not able to init libz and pass data down the chain
604 * uncompressed.
605 */
606 ap_remove_output_filter(f);
607 return ap_pass_brigade(f->next, bb);
608 }
609 /*
610 * Register a cleanup function to ensure that we cleanup the internal
611 * libz resources.
612 */
613 apr_pool_cleanup_register(r->pool, ctx, deflate_ctx_cleanup,
614 apr_pool_cleanup_null);
615
616 /* add immortal gzip header */
617 e = apr_bucket_immortal_create(gzip_header, sizeof gzip_header,
618 f->c->bucket_alloc);
619 APR_BRIGADE_INSERT_TAIL(ctx->bb, e);
620
621 /* initialize deflate output buffer */
622 ctx->stream.next_out = ctx->buffer;
623 ctx->stream.avail_out = c->bufferSize;
624 }
625
626 while (!APR_BRIGADE_EMPTY(bb))
627 {
628 const char *data;
629 apr_bucket *b;
630 apr_size_t len;
631
632 e = APR_BRIGADE_FIRST(bb);
633
634 if (APR_BUCKET_IS_EOS(e)) {
635 char *buf;
636
637 ctx->stream.avail_in = 0; /* should be zero already anyway */
638 /* flush the remaining data from the zlib buffers */
639 flush_libz_buffer(ctx, c, f->c->bucket_alloc, deflate, Z_FINISH,
640 NO_UPDATE_CRC);
641
642 buf = apr_palloc(r->pool, VALIDATION_SIZE);
643 putLong((unsigned char *)&buf[0], ctx->crc);
644 putLong((unsigned char *)&buf[4], ctx->stream.total_in);
645
646 b = apr_bucket_pool_create(buf, VALIDATION_SIZE, r->pool,
647 f->c->bucket_alloc);
648 APR_BRIGADE_INSERT_TAIL(ctx->bb, b);
649 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
650 "Zlib: Compressed %ld to %ld : URL %s",
651 ctx->stream.total_in, ctx->stream.total_out, r->uri);
652
653 /* leave notes for logging */
654 if (c->note_input_name) {
655 apr_table_setn(r->notes, c->note_input_name,
656 (ctx->stream.total_in > 0)
657 ? apr_off_t_toa(r->pool,
658 ctx->stream.total_in)
659 : "-");
660 }
661
662 if (c->note_output_name) {
663 apr_table_setn(r->notes, c->note_output_name,
664 (ctx->stream.total_in > 0)
665 ? apr_off_t_toa(r->pool,
666 ctx->stream.total_out)
667 : "-");
668 }
669
670 if (c->note_ratio_name) {
671 apr_table_setn(r->notes, c->note_ratio_name,
672 (ctx->stream.total_in > 0)
673 ? apr_itoa(r->pool,
674 (int)(ctx->stream.total_out
675 * 100
676 / ctx->stream.total_in))
677 : "-");
678 }
679
680 deflateEnd(&ctx->stream);
681 /* No need for cleanup any longer */
682 apr_pool_cleanup_kill(r->pool, ctx, deflate_ctx_cleanup);
683
684 /* Remove EOS from the old list, and insert into the new. */
685 APR_BUCKET_REMOVE(e);
686 APR_BRIGADE_INSERT_TAIL(ctx->bb, e);
687
688 /* Okay, we've seen the EOS.
689 * Time to pass it along down the chain.
690 */
691 return ap_pass_brigade(f->next, ctx->bb);
692 }
693
694 if (APR_BUCKET_IS_FLUSH(e)) {
695 apr_status_t rv;
696
697 /* flush the remaining data from the zlib buffers */
698 zRC = flush_libz_buffer(ctx, c, f->c->bucket_alloc, deflate,
699 Z_SYNC_FLUSH, NO_UPDATE_CRC);
700 if (zRC != Z_OK) {
701 return APR_EGENERAL;
702 }
703
704 /* Remove flush bucket from old brigade anf insert into the new. */
705 APR_BUCKET_REMOVE(e);
706 APR_BRIGADE_INSERT_TAIL(ctx->bb, e);
707 rv = ap_pass_brigade(f->next, ctx->bb);
708 if (rv != APR_SUCCESS) {
709 return rv;
710 }
711 continue;
712 }
713
714 if (APR_BUCKET_IS_METADATA(e)) {
715 /*
716 * Remove meta data bucket from old brigade and insert into the
717 * new.
718 */
719 APR_BUCKET_REMOVE(e);
720 APR_BRIGADE_INSERT_TAIL(ctx->bb, e);
721 continue;
722 }
723
724 /* read */
725 apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
726
727 /* This crc32 function is from zlib. */
728 ctx->crc = crc32(ctx->crc, (const Bytef *)data, len);
729
730 /* write */
731 ctx->stream.next_in = (unsigned char *)data; /* We just lost const-ness,
732 * but we'll just have to
733 * trust zlib */
734 ctx->stream.avail_in = len;
735
736 while (ctx->stream.avail_in != 0) {
737 if (ctx->stream.avail_out == 0) {
738 apr_status_t rv;
739
740 ctx->stream.next_out = ctx->buffer;
741 len = c->bufferSize - ctx->stream.avail_out;
742
743 b = apr_bucket_heap_create((char *)ctx->buffer, len,
744 NULL, f->c->bucket_alloc);
745 APR_BRIGADE_INSERT_TAIL(ctx->bb, b);
746 ctx->stream.avail_out = c->bufferSize;
747 /* Send what we have right now to the next filter. */
748 rv = ap_pass_brigade(f->next, ctx->bb);
749 if (rv != APR_SUCCESS) {
750 return rv;
751 }
752 }
753
754 zRC = deflate(&(ctx->stream), Z_NO_FLUSH);
755
756 if (zRC != Z_OK) {
757 return APR_EGENERAL;
758 }
759 }
760
761 apr_bucket_delete(e);
762 }
763
764 apr_brigade_cleanup(bb);
765 return APR_SUCCESS;
766 }
767
768 /* This is the deflate input filter (inflates). */
769 static apr_status_t deflate_in_filter(ap_filter_t *f,
770 apr_bucket_brigade *bb,
771 ap_input_mode_t mode,
772 apr_read_type_e block,
773 apr_off_t readbytes)
774 {
775 apr_bucket *bkt;
776 request_rec *r = f->r;
777 deflate_ctx *ctx = f->ctx;
778 int zRC;
779 apr_status_t rv;
780 deflate_filter_config *c;
781
782 /* just get out of the way of things we don't want. */
783 if (mode != AP_MODE_READBYTES) {
784 return ap_get_brigade(f->next, bb, mode, block, readbytes);
785 }
786
787 c = ap_get_module_config(r->server->module_config, &deflate_module);
788
789 if (!ctx) {
790 char deflate_hdr[10];
791 apr_size_t len;
792
793 /* only work on main request/no subrequests */
794 if (!ap_is_initial_req(r)) {
795 ap_remove_input_filter(f);
796 return ap_get_brigade(f->next, bb, mode, block, readbytes);
797 }
798
799 /* We can't operate on Content-Ranges */
800 if (apr_table_get(r->headers_in, "Content-Range") != NULL) {
801 ap_remove_input_filter(f);
802 return ap_get_brigade(f->next, bb, mode, block, readbytes);
803 }
804
805 /* Check whether request body is gzipped.
806 *
807 * If it is, we're transforming the contents, invalidating
808 * some request headers including Content-Encoding.
809 *
810 * If not, we just remove ourself.
811 */
812 if (check_gzip(r, r->headers_in, NULL) == 0) {
813 ap_remove_input_filter(f);
814 return ap_get_brigade(f->next, bb, mode, block, readbytes);
815 }
816
817 f->ctx = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx));
818 ctx->bb = apr_brigade_create(r->pool, f->c->bucket_alloc);
819 ctx->proc_bb = apr_brigade_create(r->pool, f->c->bucket_alloc);
820 ctx->buffer = apr_palloc(r->pool, c->bufferSize);
821
822 rv = ap_get_brigade(f->next, ctx->bb, AP_MODE_READBYTES, block, 10);
823 if (rv != APR_SUCCESS) {
824 return rv;
825 }
826
827 apr_table_unset(r->headers_in, "Content-Length");
828 apr_table_unset(r->headers_in, "Content-MD5");
829
830 len = 10;
831 rv = apr_brigade_flatten(ctx->bb, deflate_hdr, &len);
832 if (rv != APR_SUCCESS) {
833 return rv;
834 }
835
836 /* We didn't get the magic bytes. */
837 if (len != 10 ||
838 deflate_hdr[0] != deflate_magic[0] ||
839 deflate_hdr[1] != deflate_magic[1]) {
840 return APR_EGENERAL;
841 }
842
843 /* We can't handle flags for now. */
844 if (deflate_hdr[3] != 0) {
845 return APR_EGENERAL;
846 }
847
848 zRC = inflateInit2(&ctx->stream, c->windowSize);
849
850 if (zRC != Z_OK) {
851 f->ctx = NULL;
852 inflateEnd(&ctx->stream);
853 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
854 "unable to init Zlib: "
855 "inflateInit2 returned %d: URL %s",
856 zRC, r->uri);
857 ap_remove_input_filter(f);
858 return ap_get_brigade(f->next, bb, mode, block, readbytes);
859 }
860
861 /* initialize deflate output buffer */
862 ctx->stream.next_out = ctx->buffer;
863 ctx->stream.avail_out = c->bufferSize;
864
865 apr_brigade_cleanup(ctx->bb);
866 }
867
868 if (APR_BRIGADE_EMPTY(ctx->proc_bb)) {
869 rv = ap_get_brigade(f->next, ctx->bb, mode, block, readbytes);
870
871 if (rv != APR_SUCCESS) {
872 /* What about APR_EAGAIN errors? */
873 inflateEnd(&ctx->stream);
874 return rv;
875 }
876
877 for (bkt = APR_BRIGADE_FIRST(ctx->bb);
878 bkt != APR_BRIGADE_SENTINEL(ctx->bb);
879 bkt = APR_BUCKET_NEXT(bkt))
880 {
881 const char *data;
882 apr_size_t len;
883
884 /* If we actually see the EOS, that means we screwed up! */
885 if (APR_BUCKET_IS_EOS(bkt)) {
886 inflateEnd(&ctx->stream);
887 return APR_EGENERAL;
888 }
889
890 if (APR_BUCKET_IS_FLUSH(bkt)) {
891 apr_bucket *tmp_heap;
892 zRC = inflate(&(ctx->stream), Z_SYNC_FLUSH);
893 if (zRC != Z_OK) {
894 inflateEnd(&ctx->stream);
895 return APR_EGENERAL;
896 }
897
898 ctx->stream.next_out = ctx->buffer;
899 len = c->bufferSize - ctx->stream.avail_out;
900
901 ctx->crc = crc32(ctx->crc, (const Bytef *)ctx->buffer, len);
902 tmp_heap = apr_bucket_heap_create((char *)ctx->buffer, len,
903 NULL, f->c->bucket_alloc);
904 APR_BRIGADE_INSERT_TAIL(ctx->proc_bb, tmp_heap);
905 ctx->stream.avail_out = c->bufferSize;
906
907 /* Move everything to the returning brigade. */
908 APR_BUCKET_REMOVE(bkt);
909 APR_BRIGADE_CONCAT(bb, ctx->bb);
910 break;
911 }
912
913 /* read */
914 apr_bucket_read(bkt, &data, &len, APR_BLOCK_READ);
915
916 /* pass through zlib inflate. */
917 ctx->stream.next_in = (unsigned char *)data;
918 ctx->stream.avail_in = len;
919
920 zRC = Z_OK;
921
922 while (ctx->stream.avail_in != 0) {
923 if (ctx->stream.avail_out == 0) {
924 apr_bucket *tmp_heap;
925 ctx->stream.next_out = ctx->buffer;
926 len = c->bufferSize - ctx->stream.avail_out;
927
928 ctx->crc = crc32(ctx->crc, (const Bytef *)ctx->buffer, len);
929 tmp_heap = apr_bucket_heap_create((char *)ctx->buffer, len,
930 NULL, f->c->bucket_alloc);
931 APR_BRIGADE_INSERT_TAIL(ctx->proc_bb, tmp_heap);
932 ctx->stream.avail_out = c->bufferSize;
933 }
934
935 zRC = inflate(&ctx->stream, Z_NO_FLUSH);
936
937 if (zRC == Z_STREAM_END) {
938 break;
939 }
940
941 if (zRC != Z_OK) {
942 inflateEnd(&ctx->stream);
943 return APR_EGENERAL;
944 }
945 }
946 if (zRC == Z_STREAM_END) {
947 apr_bucket *tmp_heap, *eos;
948
949 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
950 "Zlib: Inflated %ld to %ld : URL %s",
951 ctx->stream.total_in, ctx->stream.total_out,
952 r->uri);
953
954 len = c->bufferSize - ctx->stream.avail_out;
955
956 ctx->crc = crc32(ctx->crc, (const Bytef *)ctx->buffer, len);
957 tmp_heap = apr_bucket_heap_create((char *)ctx->buffer, len,
958 NULL, f->c->bucket_alloc);
959 APR_BRIGADE_INSERT_TAIL(ctx->proc_bb, tmp_heap);
960 ctx->stream.avail_out = c->bufferSize;
961
962 /* Is the remaining 8 bytes already in the avail stream? */
963 if (ctx->stream.avail_in >= 8) {
964 unsigned long compCRC, compLen;
965 compCRC = getLong(ctx->stream.next_in);
966 if (ctx->crc != compCRC) {
967 inflateEnd(&ctx->stream);
968 return APR_EGENERAL;
969 }
970 ctx->stream.next_in += 4;
971 compLen = getLong(ctx->stream.next_in);
972 if (ctx->stream.total_out != compLen) {
973 inflateEnd(&ctx->stream);
974 return APR_EGENERAL;
975 }
976 }
977 else {
978 /* FIXME: We need to grab the 8 verification bytes
979 * from the wire! */
980 inflateEnd(&ctx->stream);
981 return APR_EGENERAL;
982 }
983
984 inflateEnd(&ctx->stream);
985
986 eos = apr_bucket_eos_create(f->c->bucket_alloc);
987 APR_BRIGADE_INSERT_TAIL(ctx->proc_bb, eos);
988 break;
989 }
990
991 }
992 apr_brigade_cleanup(ctx->bb);
993 }
994
995 /* If we are about to return nothing for a 'blocking' read and we have
996 * some data in our zlib buffer, flush it out so we can return something.
997 */
998 if (block == APR_BLOCK_READ &&
999 APR_BRIGADE_EMPTY(ctx->proc_bb) &&
1000 ctx->stream.avail_out < c->bufferSize) {
1001 apr_bucket *tmp_heap;
1002 apr_size_t len;
1003 ctx->stream.next_out = ctx->buffer;
1004 len = c->bufferSize - ctx->stream.avail_out;
1005
1006 ctx->crc = crc32(ctx->crc, (const Bytef *)ctx->buffer, len);
1007 tmp_heap = apr_bucket_heap_create((char *)ctx->buffer, len,
1008 NULL, f->c->bucket_alloc);
1009 APR_BRIGADE_INSERT_TAIL(ctx->proc_bb, tmp_heap);
1010 ctx->stream.avail_out = c->bufferSize;
1011 }
1012
1013 if (!APR_BRIGADE_EMPTY(ctx->proc_bb)) {
1014 /* May return APR_INCOMPLETE which is fine by us. */
1015 apr_brigade_partition(ctx->proc_bb, readbytes, &bkt);
1016
1017 APR_BRIGADE_CONCAT(bb, ctx->proc_bb);
1018 apr_brigade_split_ex(bb, bkt, ctx->proc_bb);
1019 }
1020
1021 return APR_SUCCESS;
1022 }
1023
1024
1025 /* Filter to inflate for a content-transforming proxy. */
1026 static apr_status_t inflate_out_filter(ap_filter_t *f,
1027 apr_bucket_brigade *bb)
1028 {
1029 int zlib_method;
1030 int zlib_flags;
1031 apr_bucket *e;
1032 request_rec *r = f->r;
1033 deflate_ctx *ctx = f->ctx;
1034 int zRC;
1035 apr_status_t rv;
1036 deflate_filter_config *c;
1037
1038 /* Do nothing if asked to filter nothing. */
1039 if (APR_BRIGADE_EMPTY(bb)) {
1040 return ap_pass_brigade(f->next, bb);
1041 }
1042
1043 c = ap_get_module_config(r->server->module_config, &deflate_module);
1044
1045 if (!ctx) {
1046
1047 /*
1048 * Only work on main request, not subrequests,
1049 * that are not a 204 response with no content
1050 * and not a partial response to a Range request,
1051 * and only when Content-Encoding ends in gzip.
1052 */
1053 if (!ap_is_initial_req(r) || (r->status == HTTP_NO_CONTENT) ||
1054 (apr_table_get(r->headers_out, "Content-Range") != NULL) ||
1055 (check_gzip(r, r->headers_out, r->err_headers_out) == 0)
1056 ) {
1057 ap_remove_output_filter(f);
1058 return ap_pass_brigade(f->next, bb);
1059 }
1060
1061 /*
1062 * At this point we have decided to filter the content, so change
1063 * important content metadata before sending any response out.
1064 * Content-Encoding was already reset by the check_gzip() call.
1065 */
1066 apr_table_unset(r->headers_out, "Content-Length");
1067 apr_table_unset(r->headers_out, "Content-MD5");
1068 deflate_check_etag(r, "gunzip");
1069
1070 /* For a 304 response, only change the headers */
1071 if (r->status == HTTP_NOT_MODIFIED) {
1072 ap_remove_output_filter(f);
1073 return ap_pass_brigade(f->next, bb);
1074 }
1075
1076 f->ctx = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx));
1077 ctx->bb = apr_brigade_create(r->pool, f->c->bucket_alloc);
1078 ctx->buffer = apr_palloc(r->pool, c->bufferSize);
1079 ctx->libz_end_func = inflateEnd;
1080 ctx->validation_buffer = NULL;
1081 ctx->validation_buffer_length = 0;
1082
1083 zRC = inflateInit2(&ctx->stream, c->windowSize);
1084
1085 if (zRC != Z_OK) {
1086 f->ctx = NULL;
1087 inflateEnd(&ctx->stream);
1088 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
1089 "unable to init Zlib: "
1090 "inflateInit2 returned %d: URL %s",
1091 zRC, r->uri);
1092 /*
1093 * Remove ourselves as it does not make sense to return:
1094 * We are not able to init libz and pass data down the chain
1095 * compressed.
1096 */
1097 ap_remove_output_filter(f);
1098 return ap_pass_brigade(f->next, bb);
1099 }
1100
1101 /*
1102 * Register a cleanup function to ensure that we cleanup the internal
1103 * libz resources.
1104 */
1105 apr_pool_cleanup_register(r->pool, ctx, deflate_ctx_cleanup,
1106 apr_pool_cleanup_null);
1107
1108 /* initialize inflate output buffer */
1109 ctx->stream.next_out = ctx->buffer;
1110 ctx->stream.avail_out = c->bufferSize;
1111
1112 ctx->inflate_init = 0;
1113 }
1114
1115 while (!APR_BRIGADE_EMPTY(bb))
1116 {
1117 const char *data;
1118 apr_bucket *b;
1119 apr_size_t len;
1120
1121 e = APR_BRIGADE_FIRST(bb);
1122
1123 if (APR_BUCKET_IS_EOS(e)) {
1124 /*
1125 * We are really done now. Ensure that we never return here, even
1126 * if a second EOS bucket falls down the chain. Thus remove
1127 * ourselves.
1128 */
1129 ap_remove_output_filter(f);
1130 /* should be zero already anyway */
1131 ctx->stream.avail_in = 0;
1132 /*
1133 * Flush the remaining data from the zlib buffers. It is correct
1134 * to use Z_SYNC_FLUSH in this case and not Z_FINISH as in the
1135 * deflate case. In the inflate case Z_FINISH requires to have a
1136 * large enough output buffer to put ALL data in otherwise it
1137 * fails, whereas in the deflate case you can empty a filled output
1138 * buffer and call it again until no more output can be created.
1139 */
1140 flush_libz_buffer(ctx, c, f->c->bucket_alloc, inflate, Z_SYNC_FLUSH,
1141 UPDATE_CRC);
1142 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
1143 "Zlib: Inflated %ld to %ld : URL %s",
1144 ctx->stream.total_in, ctx->stream.total_out, r->uri);
1145
1146 if (ctx->validation_buffer_length == VALIDATION_SIZE) {
1147 unsigned long compCRC, compLen;
1148 compCRC = getLong(ctx->validation_buffer);
1149 if (ctx->crc != compCRC) {
1150 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
1151 "Zlib: Checksum of inflated stream invalid");
1152 return APR_EGENERAL;
1153 }
1154 ctx->validation_buffer += VALIDATION_SIZE / 2;
1155 compLen = getLong(ctx->validation_buffer);
1156 if (ctx->stream.total_out != compLen) {
1157 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
1158 "Zlib: Length of inflated stream invalid");
1159 return APR_EGENERAL;
1160 }
1161 }
1162 else {
1163 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
1164 "Zlib: Validation bytes not present");
1165 return APR_EGENERAL;
1166 }
1167
1168 inflateEnd(&ctx->stream);
1169 /* No need for cleanup any longer */
1170 apr_pool_cleanup_kill(r->pool, ctx, deflate_ctx_cleanup);
1171
1172 /* Remove EOS from the old list, and insert into the new. */
1173 APR_BUCKET_REMOVE(e);
1174 APR_BRIGADE_INSERT_TAIL(ctx->bb, e);
1175
1176 /*
1177 * Okay, we've seen the EOS.
1178 * Time to pass it along down the chain.
1179 */
1180 return ap_pass_brigade(f->next, ctx->bb);
1181 }
1182
1183 if (APR_BUCKET_IS_FLUSH(e)) {
1184 apr_status_t rv;
1185
1186 /* flush the remaining data from the zlib buffers */
1187 zRC = flush_libz_buffer(ctx, c, f->c->bucket_alloc, inflate,
1188 Z_SYNC_FLUSH, UPDATE_CRC);
1189 if (zRC != Z_OK) {
1190 return APR_EGENERAL;
1191 }
1192
1193 /* Remove flush bucket from old brigade anf insert into the new. */
1194 APR_BUCKET_REMOVE(e);
1195 APR_BRIGADE_INSERT_TAIL(ctx->bb, e);
1196 rv = ap_pass_brigade(f->next, ctx->bb);
1197 if (rv != APR_SUCCESS) {
1198 return rv;
1199 }
1200 continue;
1201 }
1202
1203 if (APR_BUCKET_IS_METADATA(e)) {
1204 /*
1205 * Remove meta data bucket from old brigade and insert into the
1206 * new.
1207 */
1208 APR_BUCKET_REMOVE(e);
1209 APR_BRIGADE_INSERT_TAIL(ctx->bb, e);
1210 continue;
1211 }
1212
1213 /* read */
1214 apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
1215
1216 /* first bucket contains zlib header */
1217 if (!ctx->inflate_init++) {
1218 if (len < 10) {
1219 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
1220 "Insufficient data for inflate");
1221 return APR_EGENERAL;
1222 }
1223 else {
1224 zlib_method = data[2];
1225 zlib_flags = data[3];
1226 if (zlib_method != Z_DEFLATED) {
1227 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
1228 "inflate: data not deflated!");
1229 ap_remove_output_filter(f);
1230 return ap_pass_brigade(f->next, bb);
1231 }
1232 if (data[0] != deflate_magic[0] ||
1233 data[1] != deflate_magic[1] ||
1234 (zlib_flags & RESERVED) != 0) {
1235 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
1236 "inflate: bad header");
1237 return APR_EGENERAL ;
1238 }
1239 data += 10 ;
1240 len -= 10 ;
1241 }
1242 if (zlib_flags & EXTRA_FIELD) {
1243 unsigned int bytes = (unsigned int)(data[0]);
1244 bytes += ((unsigned int)(data[1])) << 8;
1245 bytes += 2;
1246 if (len < bytes) {
1247 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
1248 "inflate: extra field too big (not "
1249 "supported)");
1250 return APR_EGENERAL;
1251 }
1252 data += bytes;
1253 len -= bytes;
1254 }
1255 if (zlib_flags & ORIG_NAME) {
1256 while (len-- && *data++);
1257 }
1258 if (zlib_flags & COMMENT) {
1259 while (len-- && *data++);
1260 }
1261 if (zlib_flags & HEAD_CRC) {
1262 len -= 2;
1263 data += 2;
1264 }
1265 }
1266
1267 /* pass through zlib inflate. */
1268 ctx->stream.next_in = (unsigned char *)data;
1269 ctx->stream.avail_in = len;
1270
1271 if (ctx->validation_buffer) {
1272 if (ctx->validation_buffer_length < VALIDATION_SIZE) {
1273 apr_size_t copy_size;
1274
1275 copy_size = VALIDATION_SIZE - ctx->validation_buffer_length;
1276 if (copy_size > ctx->stream.avail_in)
1277 copy_size = ctx->stream.avail_in;
1278 memcpy(ctx->validation_buffer + ctx->validation_buffer_length,
1279 ctx->stream.next_in, copy_size);
1280 /* Saved copy_size bytes */
1281 ctx->stream.avail_in -= copy_size;
1282 ctx->validation_buffer_length += copy_size;
1283 }
1284 if (ctx->stream.avail_in) {
1285 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
1286 "Zlib: %d bytes of garbage at the end of "
1287 "compressed stream.", ctx->stream.avail_in);
1288 /*
1289 * There is nothing worth consuming for zlib left, because it is
1290 * either garbage data or the data has been copied to the
1291 * validation buffer (processing validation data is no business
1292 * for zlib). So set ctx->stream.avail_in to zero to indicate
1293 * this to the following while loop.
1294 */
1295 ctx->stream.avail_in = 0;
1296 }
1297 }
1298
1299 zRC = Z_OK;
1300
1301 while (ctx->stream.avail_in != 0) {
1302 if (ctx->stream.avail_out == 0) {
1303
1304 ctx->stream.next_out = ctx->buffer;
1305 len = c->bufferSize - ctx->stream.avail_out;
1306
1307 ctx->crc = crc32(ctx->crc, (const Bytef *)ctx->buffer, len);
1308 b = apr_bucket_heap_create((char *)ctx->buffer, len,
1309 NULL, f->c->bucket_alloc);
1310 APR_BRIGADE_INSERT_TAIL(ctx->bb, b);
1311 ctx->stream.avail_out = c->bufferSize;
1312 /* Send what we have right now to the next filter. */
1313 rv = ap_pass_brigade(f->next, ctx->bb);
1314 if (rv != APR_SUCCESS) {
1315 return rv;
1316 }
1317 }
1318
1319 zRC = inflate(&ctx->stream, Z_NO_FLUSH);
1320
1321 if (zRC == Z_STREAM_END) {
1322 /*
1323 * We have inflated all data. Now try to capture the
1324 * validation bytes. We may not have them all available
1325 * right now, but capture what is there.
1326 */
1327 ctx->validation_buffer = apr_pcalloc(f->r->pool,
1328 VALIDATION_SIZE);
1329 if (ctx->stream.avail_in > VALIDATION_SIZE) {
1330 ctx->validation_buffer_length = VALIDATION_SIZE;
1331 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
1332 "Zlib: %d bytes of garbage at the end of "
1333 "compressed stream.",
1334 ctx->stream.avail_in - VALIDATION_SIZE);
1335 } else if (ctx->stream.avail_in > 0) {
1336 ctx->validation_buffer_length = ctx->stream.avail_in;
1337 }
1338 if (ctx->validation_buffer_length)
1339 memcpy(ctx->validation_buffer, ctx->stream.next_in,
1340 ctx->validation_buffer_length);
1341 break;
1342 }
1343
1344 if (zRC != Z_OK) {
1345 return APR_EGENERAL;
1346 }
1347 }
1348
1349 apr_bucket_delete(e);
1350 }
1351
1352 apr_brigade_cleanup(bb);
1353 return APR_SUCCESS;
1354 }
1355
1356 #define PROTO_FLAGS AP_FILTER_PROTO_CHANGE|AP_FILTER_PROTO_CHANGE_LENGTH
1357 static void register_hooks(apr_pool_t *p)
1358 {
1359 ap_register_output_filter(deflateFilterName, deflate_out_filter, NULL,
1360 AP_FTYPE_CONTENT_SET);
1361 ap_register_output_filter("INFLATE", inflate_out_filter, NULL,
1362 AP_FTYPE_RESOURCE-1);
1363 ap_register_input_filter(deflateFilterName, deflate_in_filter, NULL,
1364 AP_FTYPE_CONTENT_SET);
1365 }
1366
1367 static const command_rec deflate_filter_cmds[] = {
1368 AP_INIT_TAKE12("DeflateFilterNote", deflate_set_note, NULL, RSRC_CONF,
1369 "Set a note to report on compression ratio"),
1370 AP_INIT_TAKE1("DeflateWindowSize", deflate_set_window_size, NULL,
1371 RSRC_CONF, "Set the Deflate window size (1-15)"),
1372 AP_INIT_TAKE1("DeflateBufferSize", deflate_set_buffer_size, NULL, RSRC_CONF,
1373 "Set the Deflate Buffer Size"),
1374 AP_INIT_TAKE1("DeflateMemLevel", deflate_set_memlevel, NULL, RSRC_CONF,
1375 "Set the Deflate Memory Level (1-9)"),
1376 AP_INIT_TAKE1("DeflateCompressionLevel", deflate_set_compressionlevel, NULL, RSRC_CONF,
1377 "Set the Deflate Compression Level (1-9)"),
1378 {NULL}
1379 };
1380
1381 module AP_MODULE_DECLARE_DATA deflate_module = {
1382 STANDARD20_MODULE_STUFF,
1383 NULL, /* dir config creater */
1384 NULL, /* dir merger --- default is to override */
1385 create_deflate_server_config, /* server config */
1386 NULL, /* merge server config */
1387 deflate_filter_cmds, /* command table */
1388 register_hooks /* register hooks */
1389 };

Properties

Name Value
svn:eol-style native

apache@apache.org
ViewVC Help
Powered by ViewVC 1.1.2