Commit f941713e authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* 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
parent 5c6ccb0e

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
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]










































server/core.c



+3
−4



























Changes for server/core.c: 3 added lines, 4 removed lines.



Original line number
Diff line number
Diff line







@@ -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;









    }