svn commit: r327179 - in /httpd/httpd/trunk: CHANGES server/core.c

[rp...@apache.org]

Author: rpluem
Date: Fri Oct 21 06:41:25 2005
New Revision: 327179

URL: http://svn.apache.org/viewcvs?rev=327179&view=rev
Log:
* 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/trunk/CHANGES
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=327179&r1=327178&r2=327179&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Oct 21 06:41:25 2005
@@ -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]

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/core.c?rev=327179&r1=327178&r2=327179&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Fri Oct 21 06:41:25 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;
     }