From: Nick Kew <niq@apache.org>
Date: Tue, 1 Jun 2010 23:19:21 +0000 (+0000)
Subject: Kill off edge case in mod_deflate where data may be sent before headers
X-Git-Tag: 2.3.6~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87567b7e747f3344752937454ada3e577fdbdb07;p=apache

Kill off edge case in mod_deflate where data may be sent before headers
are determined.
PR 49369 - Matthew Steele


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@950302 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 0096b4cc30..05fc9577b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,9 @@ Changes with Apache 2.3.7
      processing is completed, avoiding orphaned callback pointers.
      [Brett Gervasoni <brettg senseofsecurity.com>, Jeff Trawick]
 
+  *) mod_deflate: avoid the risk of forwarding data before headers are set.
+     PR 49369 [Matthew Steele <mdsteele google.com>]
+
   *) mod_authnz_ldap: Ensure nested groups are checked when the 
      top-level group doesn't have any direct non-group members
      of attributes in AuthLDAPGroupAttribute. [Eric Covener]
diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 30c620d338..4ea0a48cc9 100644
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -429,7 +429,7 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
 
     /* Do nothing if asked to filter nothing. */
     if (APR_BRIGADE_EMPTY(bb)) {
-        return ap_pass_brigade(f->next, bb);
+        return APR_SUCCESS;
     }
 
     c = ap_get_module_config(r->server->module_config,
@@ -1047,7 +1047,7 @@ static apr_status_t inflate_out_filter(ap_filter_t *f,
 
     /* Do nothing if asked to filter nothing. */
     if (APR_BRIGADE_EMPTY(bb)) {
-        return ap_pass_brigade(f->next, bb);
+        return APR_SUCCESS;
     }
 
     c = ap_get_module_config(r->server->module_config, &deflate_module);