From: Paul Querna <pquerna@apache.org>
Date: Mon, 11 Oct 2004 10:46:17 +0000 (+0000)
Subject: Use the ap_is_initial_req() function to test for a subrequest instead of using r... 
X-Git-Tag: 2.1.1~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb9af18e1edcc20238f3cb2fc8cbcab12479d78d;p=thirdparty%2Fapache%2Fhttpd.git

Use the ap_is_initial_req() function to test for a subrequest instead of using r->main.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105403 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 768498f272e..4567b5cc96b 100644
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -273,7 +273,7 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
         const char *encoding;
 
         /* only work on main request/no subrequests */
-        if (r->main) {
+        if (!ap_is_initial_req(r)) {
             ap_remove_output_filter(f);
             return ap_pass_brigade(f->next, bb);
         }
@@ -644,7 +644,7 @@ static apr_status_t deflate_in_filter(ap_filter_t *f,
         apr_size_t len;
 
         /* only work on main request/no subrequests */
-        if (r->main) {
+        if (!ap_is_initial_req(r)) {
             ap_remove_input_filter(f);
             return ap_get_brigade(f->next, bb, mode, block, readbytes);
         }
@@ -908,7 +908,7 @@ static apr_status_t inflate_out_filter(ap_filter_t *f,
         const char *encoding;
 
         /* only work on main request/no subrequests */
-        if (r->main) {
+        if (!ap_is_initial_req(r)) {
             ap_remove_output_filter(f);
             return ap_pass_brigade(f->next, bb);
         }