You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2007/10/01 12:40:08 UTC
svn commit: r580916 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/filters/mod_deflate.c
Author: niq
Date: Mon Oct 1 03:40:00 2007
New Revision: 580916
URL: http://svn.apache.org/viewvc?rev=580916&view=rev
Log:
Backport r580598: fix inflate_out filter initialisation in mod_deflate.
PR 43512
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/filters/mod_deflate.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=580916&r1=580915&r2=580916&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Oct 1 03:40:00 2007
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.7
+ *) mod_deflate: initialise inflate-out filter correctly when the
+ first brigade contains no data buckets.
+ PR 43512 [Nick Kew]
+
*) mod_proxy_ajp: Ignore any ajp13 flush packets received before
we send the response headers. See Tomcat PR 43478.
[Jim Jagielski]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=580916&r1=580915&r2=580916&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Oct 1 03:40:00 2007
@@ -79,12 +79,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_deflate: initialise inflate-out filter correctly when the
- first brigade contains no data buckets.
- PR 43512
- http://svn.apache.org/viewvc?view=rev&revision=580598
- +1: niq, wrowe, rpluem
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/mod_deflate.c?rev=580916&r1=580915&r2=580916&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/mod_deflate.c Mon Oct 1 03:40:00 2007
@@ -293,6 +293,7 @@
int (*libz_end_func)(z_streamp);
unsigned char *validation_buffer;
apr_size_t validation_buffer_length;
+ int inflate_init;
} deflate_ctx;
/* Number of validation bytes (CRC and length) after the compressed data */
@@ -983,7 +984,6 @@
{
int zlib_method;
int zlib_flags;
- int inflate_init = 1;
apr_bucket *e;
request_rec *r = f->r;
deflate_ctx *ctx = f->ctx;
@@ -1067,7 +1067,7 @@
ctx->stream.next_out = ctx->buffer;
ctx->stream.avail_out = c->bufferSize;
- inflate_init = 0;
+ ctx->inflate_init = 0;
}
while (!APR_BRIGADE_EMPTY(bb))
@@ -1172,7 +1172,7 @@
apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
/* first bucket contains zlib header */
- if (!inflate_init++) {
+ if (!ctx->inflate_init++) {
if (len < 10) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"Insufficient data for inflate");