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 78d5c616bef97f761aac5798ea8e144ec4d16987..e7ac218afdc018c78a7e3b31cf8c2ed5ac46ada8 100644 (file)
--- 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 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;
     }