Re: svn commit: r1707087 - /httpd/httpd/trunk/modules/debugging/mod_bucketeer.c

[Jacob Champion]

On 10/06/2015 09:30 AM, yla...@apache.org wrote:
Author: ylavic
Date: Tue Oct  6 16:30:53 2015
New Revision: 1707087
URL: http://svn.apache.org/viewvc?rev=1707087&view=rev
Log:
mod_bucketeer: cleanup properly on EOS and write.

Hey Yann,

I've started testing reallyall builds of trunk, which are currently 
segfaulting in the middle of mod_info tests. A bisect points to this 
commit to mod_bucketeer, back in 2015. Reverting it makes everything run 
smoothly.

Any idea what's going wrong? Seems like mod_bucketeer is messing with 
the brigade in a way mod_info doesn't expect.

--Jacob


Modified:
    httpd/httpd/trunk/modules/debugging/mod_bucketeer.c

Modified: httpd/httpd/trunk/modules/debugging/mod_bucketeer.c
URL: 
http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/debugging/mod_bucketeer.c?rev=1707087&r1=1707086&r2=1707087&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/debugging/mod_bucketeer.c (original)
+++ httpd/httpd/trunk/modules/debugging/mod_bucketeer.c Tue Oct  6 16:30:53 2015
@@ -95,6 +95,7 @@ static apr_status_t bucketeer_out_filter
             /* Okay, we've seen the EOS.
              * Time to pass it along down the chain.
              */
+            ap_remove_output_filter(f);
             return ap_pass_brigade(f->next, ctx->bb);
         }

@@ -145,6 +146,7 @@ static apr_status_t bucketeer_out_filter
                         if (rv) {
                             return rv;
                         }
+                        apr_brigade_cleanup(ctx->bb);
                     }
                 }
             }