1x vote.

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

Happy New Year 2026

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

update STATUS after merge

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

Merge  /httpd/httpd/trunk:r1930444

  *) mod_http2: update to version 2.0.37
     Prevent double purge of a stream, resulting in a double free.
     Fixes PR 69899.

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

* Vote

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

fr doc rebuild.

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

XML files updates.

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

One more backport.

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

* Vote

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

Merge r1929706, r1930012 from trunk: [docs CTR]

feat: add vnd.sqlite3 mime type and extensions

Submitted by: Alexandru Mărășteanu <hello alexei.ro>
Github: closes #563

feat: add HEIC, HEIF and related mime types

See https://en.wikipedia.org/wiki/High_Efficiency_Image_File_Format

Submitted by: Alexandru Mărășteanu <hello alexei.ro>
Github: closes #580

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

Just one wafer-thin backport.

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

Merge r1915443, r1915459 from trunk: [docs only]

Clarifies advice around quoting regular expressions.

Submitted by: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com>

Remove redundant slash from example - mod_proxy doc

Submitted by: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com>

Submitted by: rbowen
Github: closes #463

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

2x simple backports.

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

Vote, promote x2.

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

* Vote

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1930514 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@1930513 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@1930512 13f79535-47bb-0310-9956-ffa450edef68

* Vote

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

propose r1930444 for backport

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

Merge /httpd/httpd/trunk:r1930379

Add forgotten MDCACertificateFile directive in documentation.

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

Merge /httpd/httpd/trunk:r1930363

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

publishing release httpd-2.4.66

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

xforms

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

Merge r1930164 from trunk:

don't use request notes for suexec

also, stop accepting the obscure "note" option in
RequestHeader, it is only documented/described as being
meant for Header (output filter).

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

Merge r1930163 from trunk:

envvars from HTTP headers low precedence

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

Merge r1930162 from trunk:

cover mixed slashes, simplify

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

Merge r1930161 from trunk:

don't pass args for SSI request

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

Propose backport x 1

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

make update-changes

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

1x done.

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

Merge r1929631 from trunk:

* modules/ssl/ssl_engine_kernel.c (ssl_check_vhost_sni_policy):
  Fix handling of STRICT mode.

Reviewed by: jorton, rpluem, covener

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1929913 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@1929912 13f79535-47bb-0310-9956-ffa450edef68

Merge of /httpd/httpd/trunk:r1924267,1927235,1927647,1927792,1929517,1929527

All accpeted backport proposals for mod_http2

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

Merged /httpd/httpd/trunk:r1929514,1929883

Update mod_md to v2.6.6

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

vote/promote

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

* Vote

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

Propose x1.

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

fr doc rebuild (including "favicon.ico --> favicon.png)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1929602 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@1929600 13f79535-47bb-0310-9956-ffa450edef68

Merge r1929582 from trunk:

docs: Update compatibility note for SSLVHostSNIPolicy

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

Regenerate docs.

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

Merge r1927885, r1927916, r1928022 from trunk:

Make the value set for the socket option TCP_DEFER_ACCEPT configurable

* include/ap_listen.h:
  - Add prototype for ap_set_listentcpdeferaccept
  - Wire in new directive ListenTCPDeferAccept

* include/mpm_common.h:
  Define the previous static value as default value via DEFAULT_TCP_DEFER_ACCEPT

* server/listen.c:
  - Add static int ap_listentcpdeferaccept
  - ap_apply_accept_filter: Use value of ap_listenbacklog for setting TCP_DEFER_ACCEPT
  - ap_listen_pre_config: Set default value
  - Add ap_set_listentcpdeferaccept

* Follow up to r1927885: Use correct configuration variable. Thanks to @ylavic
  for finding this.

* Follow up to r1927885: Changelog entry and documentation

Reviewed by: rpluem, jorton, covener

Github: closes #555

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

Merge r1873397 from trunk:

PR62989: DOCTYPE tags in server-generated HTML.

Submitted By: Andra Farkas <deepbluemistake gmail.com>, Giovanni Bechis <giovanni paclan.it>
Reviewed by: rpluem, jorton, covener

Github: closes #553

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

* Vote and promote

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

Merged, add missing changes-entries file.

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

Merge r1929308, r1929333, r1929361, r1929503 from trunk:

mod_ssl: Add SSLVHostSNIPolicy directive to set the compatibility
level required for VirtualHost matching.

For "secure" and "authonly" modes, a hash of the policy-relevant vhost
configuration is created and stored in the post_config hooks, reducing
the runtime code complexity (and overhead).

* modules/ssl/ssl_engine_kernel.c (ssl_check_vhost_sni_policy): New
  function, replacing ssl_server_compatible et al.

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLVHostSNIPolicy): New
  function.

* modules/ssl/ssl_engine_init.c (md5_strarray_cmp, md5_strarray_hash,
  hash_sni_policy_pk, hash_sni_policy_auth, create_sni_policy_hash):
  New functions.
  (ssl_init_Module): Invoke create_sni_policy_hash to store the hash
  for every SSLSrvConfigRec.

* modules/ssl/ssl_private.h (SSLModConfigRec): Add snivh_policy field.
  (SSLSrvConfigRec): Add sni_policy_hash field.

PR: 69743
GitHub: closes #562
Reviewed by: jorton, rpluem, covener

Docs changes:
misplaced tags in english version and fr doc XML file update.
Update docs on SSLVhostSNIPolicy to cover the impact on
non-SNI connections. Reorder the table for clarity.

Submitted by: jorton, Aaron Ogburn <aogburn redhat.com>, rpluem, lgentis

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

vote/promote

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

vote/promote

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

update backport revisions

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

propose backport

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

propose backport

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

Merge /httpd/httpd/trunk:r1927807,1927874,1928039,1928839,1928861

mod_md: update to version 2.6.2

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

* Vote

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

Vote, propose.

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

* These backports are ready

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

Add a missing PR reference.

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

Update the favicon in the doc to the new leaf logo.

Take the one used on w.a.o which is a png file, instead of the previous ico file.

(r1928911 on trunk)

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

* Add comment

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

Votes.

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

add r1928839 to mod_md backport

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

* Propose

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1928270 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@1928269 13f79535-47bb-0310-9956-ffa450edef68

typo correction.

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

Merge r1928084 from trunk:

helps to re-read the PR.

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

Merge r1928078 from trunk:

reorder, tweak wording

help emphasize the moral of PR69698, that continued lines
win out over comments.

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

* Vote

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

* Add new proposal

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

add tailscale doc removal to mod_md backport

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

* Add proposal

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1927972 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@1927971 13f79535-47bb-0310-9956-ffa450edef68

add 1927874 to mod_md backport

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

Trivial typo correction

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

propose mod_md for back port

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

* Vote

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

propose backport of r1927792

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

propose backport

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

publishing release httpd-2.4.65

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1927367 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@1927366 13f79535-47bb-0310-9956-ffa450edef68

fix `rewritecond expr` regression in 2.4.64

  *) SECURITY: CVE-2025-54090: Apache HTTP Server: 'RewriteCond expr'
     always evaluates to true in 2.4.64 (cve.mitre.org)
     A bug in Apache HTTP Server 2.4.64 results in all "RewriteCond
     expr ..." tests evaluating as "true".
     Users are recommended to upgrade to version 2.4.65, which fixes
     the issue.

Reviewed By: covener, ylavic, gbechis, jorton

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

xforms

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

Merge r1927320 from trunk:

mentioned dropped 'sslengine optional'

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

Improve compatibility with older python.

According to python 3.11.0 changelog, "datetime.UTC"
was added as an alias for "datetime.timezone.utc".

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

propose 1927235 for backport

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1927151 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@1927150 13f79535-47bb-0310-9956-ffa450edef68

add credit

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

publishing release httpd-2.4.64

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

Merge r1927054 from trunk:

avoid compile error with curl < 7.44.0

Reviewed By: covener, ylavic, gbechis

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

backport 1927038 from trunk

  improve h2 header error handling

Rewviewed By: icing, covener, rpluem

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

backport 1927037 from trunk

  remove antiquated 'SSLEngine optional' TLS upgrade

Reviewed By: rpluem, jorton, covener

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

backport 1927036 from trunk

  tolerate missing host header in h2 proxy

Reviewed By: jorton, icing, rpluem

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

backport 1927035 from trunk

  update SNI validation

Reviewed By: rpluem, jorton, covener, ylavic

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

backport 1927034 from trunk

  escape ssl vars

Reviewed By: rpluem, jorton, covener, ylavic

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

backport 1927033 from trunk

  expand UNC checking

Reviewed By: covener, jfclere, rpluem

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

backport 1927032 from trunk

  header only

Reviewed By: rpluem, jorton, ylavic

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