[2.4.x] Merge r1935191, r1935192, r1935193, r1935926, r1935935, r1935941, r1936259, r1936260, r1936262, r1936263, r1936264, r1937041 from trunk - #703
Open
notroj wants to merge 13 commits into
Conversation
* modules/filters/mod_substitute.c (set_pattern): Guard the pre-incrementing delimiter scan loops with a NUL check, preventing a read past the end of the allocation when the from or to field has no closing delimiter. Assisted-by: Claude Sonnet 4.6 <noreply@anthropic.com> (cherry picked from commit d1e04e6)
* modules/filters/mod_substitute.c (set_max_line_length): Check that the parsed value does not exceed APR_INT64_MAX / multiplier before applying the K/M/G suffix, to avoid signed integer overflow UB. Assisted-by: Claude Sonnet 4.6 <noreply@anthropic.com> (cherry picked from commit 62c9f8f)
* modules/ssl/ssl_engine_kernel.c (set_challenge_creds): Return rv rather than APR_SUCCESS unconditionally, so credential setup failures are propagated to the ALPN selection callback. Assisted-by: Claude Sonnet 4.6 <noreply@anthropic.com> (cherry picked from commit b85e024)
* modules/metadata/mod_cern_meta.c (scan_meta_file): Return a 500 error if a framing header is found in a .meta file rather than merging it into the response headers. Assisted-by: Claude Sonnet 4.6 <noreply@anthropic.com> (cherry picked from commit 4d8d051)
* modules/ssl/ssl_engine_ocsp.c (determine_responder_uri): Check u->scheme is non-NULL before calling ap_cstr_casecmp(), since apr_uri_parse() can succeed with a NULL scheme for scheme-less URIs. Assisted-by: Claude Sonnet 4.6 <noreply@anthropic.com> (cherry picked from commit ac2deae)
for the (likely unreachable) i2d_PrivateKey() failure case. Submitted by: Sayed Kaif <metsw24 gmail.com> Github: closes apache#619 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1935941 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 4f87229)
New helper replacing atoi() with safe integer parsing via apr_strtoi64, with range validation. (readfile_heartbeats): Use hb_parse_int for busy, ready, lastseen, and port fields. (find_best_hb): Add overflow-safe saturation arithmetic for openslots accumulation and the pick loop upper bound. Submitted by: Sayed Kaif <metsw24 gmail.com> Github: closes apache#629 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1935935 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit feb1c6e)
on failure rather than -1. (sock_write): Handle short writes. (cgid_init): Fix off-by-one in socket path truncation. Assisted-by: Claude Opus 4.6 <noreply@anthropic.com> GitHub: resolves PR#669 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1935193 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 8e210c2)
allocation of core_request_config, which used sizeof(core_module). (cgid_server): Fix stale rv passed to ap_log_error for passed fd debug message. (include_cmd): Fix double registration of cleanup_script which could kill a garbage pid when get_cgi_pid failed. Check return value of send_req. Change return type to apr_status_t to match declaration in cgi_common.h Assisted-by: Claude Opus 4.6 <noreply@anthropic.com> GitHub: PR#669 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1935192 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 489f5ef)
unsigned. Define ENV_COUNT_MAX. (get_req): Add upper bounds for uri_len, args_len, and env_count. Validate per-variable length in environment reading loop. Move validation before use of loglevel. Assisted-by: Claude Opus 4.6 <noreply@anthropic.com> GitHub: PR#669 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1935191 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d7ac43a)
Don't used fixed buffer size for serial number, fail if ASN.1->BIGNUM conversion fails. Github: closes apache#680 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1935926 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 7612f2b)
space as the status-code separator, not other whitespace. * server/protocol.c (ap_send_interim_response): Reject control characters in the reason phrase of interim responses. * test/modules/proxy/test_06_interim_resp.py: New test case. Assisted-by: Claude Opus 4.6 <noreply@anthropic.com> GitHub: closes apache#702 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1937041 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit fbedef2)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
(cherry picked from commit d1e04e6)
(cherry picked from commit 62c9f8f)
(cherry picked from commit b85e024)
(cherry picked from commit 4d8d051)
(cherry picked from commit ac2deae)
(cherry picked from commit 4f87229)
(cherry picked from commit feb1c6e)
(cherry picked from commit 8e210c2)
(cherry picked from commit 489f5ef)
(cherry picked from commit d7ac43a)
(cherry picked from commit 7612f2b)
(cherry picked from commit fbedef2)