From: Ruediger Pluem <rpluem@apache.org>
Date: Sun, 23 Oct 2005 14:14:45 +0000 (+0000)
Subject: Merge r327179 from trunk:
X-Git-Tag: 2.1.9~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69ce4c1478c08652bde3e6ba930b4742d2f45632;p=thirdparty%2Fapache%2Fhttpd.git

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@327793 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 78d5c616bef..e7ac218afdc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
diff --git a/server/core.c b/server/core.c
index 188bdab45e5..dc8adeffb87 100644
--- a/server/core.c
+++ b/server/core.c
@@ -3102,11 +3102,10 @@ void ap_add_output_filters_by_type(request_rec *r)
     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;
     }