mod_deflate: remove filter after seeing EOS

notroj · notroj · commit 9e376267f94a · 2024-03-18T16:14:45.000Z
Submitted by: Eric Norris <enorris etsy.com> Github: closes #387 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1914800 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 4889f66)
diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
@@ -940,6 +940,10 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
             }
 
             deflateEnd(&ctx->stream);
+
+            /* We've ended the libz stream, so remove ourselves. */
+            ap_remove_output_filter(f);
+
             /* No need for cleanup any longer */
             apr_pool_cleanup_kill(r->pool, ctx, deflate_ctx_cleanup);
 

Original file line number	Diff line number	Diff line change
`@@ -940,6 +940,10 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,`
`940`	`940`	`}`
`941`	`941`
`942`	`942`	`deflateEnd(&ctx->stream);`
	`943`	`+`
	`944`	`+ /* We've ended the libz stream, so remove ourselves. */`
	`945`	`+ ap_remove_output_filter(f);`
	`946`	`+`
`943`	`947`	`/* No need for cleanup any longer */`
`944`	`948`	`apr_pool_cleanup_kill(r->pool, ctx, deflate_ctx_cleanup);`
`945`	`949`