Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Message-ID: <20051023141452.56151.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r327793 - in /httpd/httpd/branches/2.2.x: CHANGES
 server/core.c
Date: Sun, 23 Oct 2005 14:14:51 -0000
To: cvs@httpd.apache.org
From: rpluem@apache.org

Author: rpluem
Date: Sun Oct 23 07:14:45 2005
New Revision: 327793

URL: http://svn.apache.org/viewcvs?rev=327793&view=rev
Log:
Merge r327179 from trunk:

* Fix PR31226 (AddOutputFilterByType deflate not active with mod_proxy), by
  allowing ap_add_output_filters_by_type to handle proxied requests.
  Basic tests by jorton and me show that this works, nobody can actually
  remember why this limitation was introduced at all (r94028) and the mailing
  list archives also gave no hint.

Submitted by: Joe Orton

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/server/core.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=327793&r1=327792&r2=327793&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sun Oct 23 07:14:45 2005
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.1.9
 
+  *) core: AddOutputFilterByType is ignored for proxied requests. PR31226.
+     [Joe Orton, Ruediger Pluem]
+
   *) mod_proxy_http: Prevent data corruption of POST request bodies when
      client accesses proxied resources with SSL. PR37145.
      [Ruediger Pluem, William Rowe]

Modified: httpd/httpd/branches/2.2.x/server/core.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/core.c?rev=327793&r1=327792&r2=327793&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/core.c (original)
+++ httpd/httpd/branches/2.2.x/server/core.c Sun Oct 23 07:14:45 2005
@@ -3102,11 +3102,10 @@
     conf = (core_dir_config *)ap_get_module_config(r->per_dir_config,
                                                    &core_module);
 
-    /* We can't do anything with proxy requests, no content-types or if
-     * we don't have a filter configured.
+    /* We can't do anything with no content-type or if we don't have a
+     * filter configured.
      */
-    if (r->proxyreq != PROXYREQ_NONE || !r->content_type ||
-        !conf->ct_output_filters) {
+    if (!r->content_type || !conf->ct_output_filters) {
         return;
     }