* 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/trunk@327179 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index c8f24017ff7af3ed1e856cb601845cd75f623d5b..645318a4d3fcbe3d4e850f20dc3c4fa03158ba62 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,12 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) core: AddOutputFilterByType is ignored for proxied requests. PR31226.
+     [Joe Orton, Ruediger Pluem]
+
   *) Preserve the Content-Length header for a proxied HEAD request.
      PR 18757 [Greg Ames]
-  
+
   *) mod_cache: Create new filters CACHE_OUT_SUBREQ / CACHE_SAVE_SUBREQ which
      only differ by the type from CACHE_OUT / CACHE_SAVE to ensure that
      subrequests to non local resources work again. [Ruediger Pluem]

diff --git a/server/core.c b/server/core.c
index 188bdab45e549a43b831bfb1a758292199c8681e..dc8adeffb8727f2c09d1cfb5eae406801f22f01f 100644 (file)
--- 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;
     }