]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1619448, r1619486, r1895552, r1894152, r1914800 from trunk:
authorJoe Orton <jorton@apache.org>
Tue, 26 Mar 2024 15:00:06 +0000 (15:00 +0000)
committerJoe Orton <jorton@apache.org>
Tue, 26 Mar 2024 15:00:06 +0000 (15:00 +0000)
commit5905f0fbd4f742941f8daa5da7ad9df021920a6f
treed48d02fef0efab728196ae438ee474c18d6bd9e6
parent9ab08c31305a7dc8b22e75acd38dc67bcac96078
Merge r1619448, r1619486, r1895552, r1894152, r1914800 from trunk:

leave a hint while scrolling through inflate() calls

mod_deflate:
- fix signed/unsigned (int/size_t) comparisons,
- add consume_buffer() to factorize code used multiple times,
- cleanup passed brigade (don't rely on next output filters to do it).

* modules/filters/mod_deflate.c (deflate_in_filter): Handle FLUSH in
  the input brigade even if done inflating (ctx->done is true), but
  don't try to flush the inflate stream in that case.  (Caught by
  Coverity)

* modules/filters/mod_deflate.c (deflate_out_filter): Catch
  apr_bucket_read() errors.

mod_deflate: remove filter after seeing EOS

Github: closes #423
Submitted by: covener, ylavic, jorton, Eric Norris <enorris etsy.com>
Reviewed by: jorton, gbechis, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916557 13f79535-47bb-0310-9956-ffa450edef68
changes-entries/deflate-cleanups.txt [new file with mode: 0644]
modules/filters/mod_deflate.c