You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2004/10/11 12:46:17 UTC

cvs commit: httpd-2.0/modules/filters mod_deflate.c

pquerna     2004/10/11 03:46:17

  Modified:    modules/filters mod_deflate.c
  Log:
  Use the ap_is_initial_req() function to test for a subrequest instead of using r->main.
  
  Revision  Changes    Path
  1.58      +3 -3      httpd-2.0/modules/filters/mod_deflate.c
  
  Index: mod_deflate.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_deflate.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_deflate.c	23 Jul 2004 12:40:49 -0000	1.57
  +++ mod_deflate.c	11 Oct 2004 10:46:17 -0000	1.58
  @@ -273,7 +273,7 @@
           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 @@
           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 @@
           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);
           }