* Add proposal [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910325 13f79535-47bb-0310-9956-ffa450edef68

Merge r1910253 from trunk:

there is a separate `connectiontimeout`

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910254 13f79535-47bb-0310-9956-ffa450edef68

Backport proposal.

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910223 13f79535-47bb-0310-9956-ffa450edef68

Propose some easy backports to synch with trunk.

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910221 13f79535-47bb-0310-9956-ffa450edef68

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910205 13f79535-47bb-0310-9956-ffa450edef68

fr doc XML files updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910204 13f79535-47bb-0310-9956-ffa450edef68

tests: allow for alternate exit code by curl on HTTP/2 errors

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910170 13f79535-47bb-0310-9956-ffa450edef68

CI: same issue in HTTP2 test runner with cache APR build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910168 13f79535-47bb-0310-9956-ffa450edef68

tests, sync tests from trunk with skips for features/fixes awaiting backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910167 13f79535-47bb-0310-9956-ffa450edef68

propose backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910158 13f79535-47bb-0310-9956-ffa450edef68

Merge r1909989 from trunk:

  *) mod_proxy_http2: fix retry handling to not leak temporary errors.
     On detecting that that an existing connection was shutdown by the other
     side, a 503 response leaked even though the request was retried on a
     fresh connection.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909992 13f79535-47bb-0310-9956-ffa450edef68

* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909985 13f79535-47bb-0310-9956-ffa450edef68

backport proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909983 13f79535-47bb-0310-9956-ffa450edef68

The default value of FlushMaxThreshold is defined as AP_FLUSH_MAX_THRESHOLD, which is 65535.

(r1909959 in trunk)

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909960 13f79535-47bb-0310-9956-ffa450edef68

Merge r1909833 from trunk:

a few tweaks to SetEnvIfExpr doc

From a question on IRC, show a backreference example.
Fix a bad copy/paste where a link to <if> was present.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909834 13f79535-47bb-0310-9956-ffa450edef68

propose h2 backport for r1909769.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909771 13f79535-47bb-0310-9956-ffa450edef68

backport proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909697 13f79535-47bb-0310-9956-ffa450edef68

Add proposal for DeflateAlterETag fix.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909605 13f79535-47bb-0310-9956-ffa450edef68

enable github workflows for testing http2 and mod_tls

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909588 13f79535-47bb-0310-9956-ffa450edef68

tests, synching changes/additions from trunk in http2 tests

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909587 13f79535-47bb-0310-9956-ffa450edef68

  *) tests: backport changes to make pytest tests work
     again, fixing mainly cgi vs. multipart issues.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909564 13f79535-47bb-0310-9956-ffa450edef68

Backport of r1909558 from trunk:

  *) mod_tls: updating to rustls-ffi version 0.9.2 or higher.
     Checking in configure for proper version installed. Code
     fixes for changed clienthello member name.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909561 13f79535-47bb-0310-9956-ffa450edef68

CI tests are failing (since r1909135), set a lower timeout since
the default is a rather extreme 6hrs. Worst cases seem to be
around 10 minutes currently. [skip ci]

Merges r1909242 trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909371 13f79535-47bb-0310-9956-ffa450edef68

Repurpose test for apr-1.8.x (1.7.x being tested elsewhere already).

ci: Upgrade to latest apr-1.7.4.

Merges r1908415, r1909369 trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909370 13f79535-47bb-0310-9956-ffa450edef68

* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909277 13f79535-47bb-0310-9956-ffa450edef68

* Add proposal [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909276 13f79535-47bb-0310-9956-ffa450edef68

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909220 13f79535-47bb-0310-9956-ffa450edef68

fr doc XML file update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909219 13f79535-47bb-0310-9956-ffa450edef68

Propose backport of r1909215.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909216 13f79535-47bb-0310-9956-ffa450edef68

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909159 13f79535-47bb-0310-9956-ffa450edef68

fr doc XML files updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909158 13f79535-47bb-0310-9956-ffa450edef68

Merge r1909067 from trunk:

* Clarify performance topic

Reviewed by: ruediger

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909087 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909086 13f79535-47bb-0310-9956-ffa450edef68

Merge r1909084 from trunk:

just request_uri

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909085 13f79535-47bb-0310-9956-ffa450edef68

Merge r1909073 from trunk:

PR66563: escaping of url releated server vars

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909075 13f79535-47bb-0310-9956-ffa450edef68

Followup to r1908937:

Fix the second location where ../../server needs to be added to the include path as mod_rewrite now requires test_char.h.

Submitted by: Steve Bush <Steven.BUSH@3ds.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909061 13f79535-47bb-0310-9956-ffa450edef68

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909026 13f79535-47bb-0310-9956-ffa450edef68

fr doc XML file update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909025 13f79535-47bb-0310-9956-ffa450edef68

xforms

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909015 13f79535-47bb-0310-9956-ffa450edef68

use anchors

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909014 13f79535-47bb-0310-9956-ffa450edef68

publishing release httpd-2.4.57

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909000 13f79535-47bb-0310-9956-ffa450edef68

* mod_rewrite now requires test_char.h. Hence add ../../server to the include path

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908937 13f79535-47bb-0310-9956-ffa450edef68

Merge r1908933 from trunk:

* Use latest released versions of APR and APR-UTIL for building
Submitted by: rpluem
Reviewed by: ruediger

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908934 13f79535-47bb-0310-9956-ffa450edef68

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908900 13f79535-47bb-0310-9956-ffa450edef68

fr doc XML files updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908899 13f79535-47bb-0310-9956-ffa450edef68

Trigger ci.

Merges r1908885 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908886 13f79535-47bb-0310-9956-ffa450edef68

Try running CI for 2.* tags. [skip ci]

Merges r1908835 trunk.
Submitted by: jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908884 13f79535-47bb-0310-9956-ffa450edef68

Sync CHANGES.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908866 13f79535-47bb-0310-9956-ffa450edef68

Merge r1908827, r1908838 from trunk:

mod_proxy: Check for space/ctrls in nocanon path/urls before forwarding.

Follow up to r1908827: CHANGES entry.
Submitted by: ylavic
Reviewed by: ylavic, rpluem, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908865 13f79535-47bb-0310-9956-ffa450edef68

Merge r1908341, r1908628, r1908629 from trunk:

Do not double encode encoded slashes

In case that AllowEncodedSlashes is set to NoDecode do not double encode
encoded slashes in the URL sent by the reverse proxy to the backend.

* include/ap_mmn.h: Document the addition of ap_proxy_canonenc_ex to the API.

* modules/proxy/mod_proxy.h: Declare ap_proxy_canonenc_ex and define flag
      values.

* modules/proxy/proxy_util.c: Implement ap_proxy_canonenc_ex by modifying
      ap_proxy_canonenc accordingly and reimplement ap_proxy_canonenc to
      use ap_proxy_canonenc_ex with the appropriate flag.

* modules/http2/mod_proxy_http2.c, modules/proxy/mod_proxy_*.c: Set the
      correct flag based on the AllowEncodedSlashes configuration and use
      ap_proxy_canonenc_ex instead of ap_proxy_canonenc.

* Whitespace fixes. No functional change.

* Fix typo

Reviewed by: rpluem, ylavic, covener

Github: closes #351

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908864 13f79535-47bb-0310-9956-ffa450edef68

make update-changes

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908863 13f79535-47bb-0310-9956-ffa450edef68

vote/promote/remove

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908862 13f79535-47bb-0310-9956-ffa450edef68

Backport recent rewrite trunk features
https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/348.diff

Submitted by: covener
Reviewed by: covener, ylavic, rpluem

Github: closes #348

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908859 13f79535-47bb-0310-9956-ffa450edef68

update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908853 13f79535-47bb-0310-9956-ffa450edef68

Merge r1908691 from trunk:

  *) mod_http2: fixed a crash during connection termination. See PR 66539.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908852 13f79535-47bb-0310-9956-ffa450edef68

* Vote and comment [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908851 13f79535-47bb-0310-9956-ffa450edef68

Propose r1908827.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908848 13f79535-47bb-0310-9956-ffa450edef68

* Vote, promote and comment [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908832 13f79535-47bb-0310-9956-ffa450edef68

Votes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908825 13f79535-47bb-0310-9956-ffa450edef68

vote/propose

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908823 13f79535-47bb-0310-9956-ffa450edef68

remove backported

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908815 13f79535-47bb-0310-9956-ffa450edef68

Backport recent rewrite trunk features
https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/348.diff

Submitted by: covener
Reviewed by: covener, ylavic, rpluem

Github: closes #348

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908814 13f79535-47bb-0310-9956-ffa450edef68

* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908694 13f79535-47bb-0310-9956-ffa450edef68

Proposing backport of r1908691.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908692 13f79535-47bb-0310-9956-ffa450edef68

CHANGES: Missing empty line.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908634 13f79535-47bb-0310-9956-ffa450edef68

* Vote and promote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908632 13f79535-47bb-0310-9956-ffa450edef68

* Add proposal [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908630 13f79535-47bb-0310-9956-ffa450edef68

review items fixed in PR

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908617 13f79535-47bb-0310-9956-ffa450edef68

Add small backport docs nits.

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908612 13f79535-47bb-0310-9956-ffa450edef68

Add missing info about changed default value for
LimitRequestBody to changelog for 2.4.54.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908568 13f79535-47bb-0310-9956-ffa450edef68

ci: Disable MOD_TLS test suite for now (never passing).

Merges r1908561 trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908562 13f79535-47bb-0310-9956-ffa450edef68

Update ErrorLogFormat proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908559 13f79535-47bb-0310-9956-ffa450edef68

Vote (+ comment).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908555 13f79535-47bb-0310-9956-ffa450edef68

make update-changes

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908541 13f79535-47bb-0310-9956-ffa450edef68

remove backported

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908540 13f79535-47bb-0310-9956-ffa450edef68

Merge r1907505, r1908186 from trunk:

* In the reverse proxy case r->filename might contain a query string if
  the nocanon option was used with ProxyPass.
  If this is the case cut off the query string as the last parameter in
  this query string might end up on an extension we take care about, but
  we only want to match against path components not against query
  parameters.

* Add CHANGES entry for r1907505 [skip ci]

Reviewed By: rpluem, ylavic, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908538 13f79535-47bb-0310-9956-ffa450edef68

Merge r1908302 from trunk:

move B=xx example to the bottom

show example with quoted flags and a space

Reviewed By: ylavic, rpluem, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908536 13f79535-47bb-0310-9956-ffa450edef68

vote/promote

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908535 13f79535-47bb-0310-9956-ffa450edef68

vote/promote

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908534 13f79535-47bb-0310-9956-ffa450edef68

propose rewrite flexibility improvements

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908533 13f79535-47bb-0310-9956-ffa450edef68

re-run failing tests with -v

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908532 13f79535-47bb-0310-9956-ffa450edef68

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908499 13f79535-47bb-0310-9956-ffa450edef68

XML file update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908498 13f79535-47bb-0310-9956-ffa450edef68

Votes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908411 13f79535-47bb-0310-9956-ffa450edef68

Propose backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908409 13f79535-47bb-0310-9956-ffa450edef68

* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908371 13f79535-47bb-0310-9956-ffa450edef68

Merge r1908302 from trunk:

move B=xx example to the bottom

show example with quoted flags and a space

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908303 13f79535-47bb-0310-9956-ffa450edef68

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908286 13f79535-47bb-0310-9956-ffa450edef68

fr doc XML files updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908285 13f79535-47bb-0310-9956-ffa450edef68

Update proposal (reset vote)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908258 13f79535-47bb-0310-9956-ffa450edef68

Add merge info.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908247 13f79535-47bb-0310-9956-ffa450edef68

Fix proxy backend connection reuse tests.
Use one curl exec with multiple URLs instead of separate
curl calls, so that we make sure we use the same
connection to the web server ending up in the same
httpd child process.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908246 13f79535-47bb-0310-9956-ffa450edef68

Support splitting mutiple outputs when using curl with
multiple URLs. E.g. provide a JSON array with the
individual JSON responses as items.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908245 13f79535-47bb-0310-9956-ffa450edef68

Make test more robust, log might have a short delay.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908244 13f79535-47bb-0310-9956-ffa450edef68

Fix tests test_202_trailer.py::TestTrailers::test_h2_202_03b
and test_202_trailer.py::TestTrailers::test_h2_202_04 by adding
an explicit Content-Type header to the nghttp call.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908221 13f79535-47bb-0310-9956-ffa450edef68

* Add proposal [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908189 13f79535-47bb-0310-9956-ffa450edef68

* Add proposal [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908187 13f79535-47bb-0310-9956-ffa450edef68

unmangle the example config for CVE-2023-2569

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908165 13f79535-47bb-0310-9956-ffa450edef68

publishing release httpd-2.4.56

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908159 13f79535-47bb-0310-9956-ffa450edef68

* Vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1908120 13f79535-47bb-0310-9956-ffa450edef68