Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.4.x mod_deflate cleanups #423

Closed
wants to merge 6 commits into from
Closed

Conversation

notroj
Copy link
Collaborator

@notroj notroj commented Mar 18, 2024

No description provided.

covener and others added 6 commits March 18, 2024 16:06
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1619448 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 3093948)
- 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).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1619486 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 2b94587)
  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)

Github: closes apache#280

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1895552 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 6aef687)
  apr_bucket_read() errors.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1894152 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit c1a2dfc)
Submitted by: Eric Norris <enorris etsy.com>
Github: closes apache#387

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1914800 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 4889f66)
asfgit pushed a commit that referenced this pull request Mar 26, 2024
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
@notroj notroj closed this Mar 26, 2024
@notroj notroj deleted the 2.4.x-deflate-cleanups branch March 26, 2024 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants