]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
3 weeks agofr doc XML files updates.
Lucien Gentis [Sat, 22 Nov 2025 09:57:36 +0000 (09:57 +0000)] 
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

3 weeks agoMerge of /httpd/httpd/trunk:r1924267,1927235,1927647,1927792,1929517,1929527
Stefan Eissing [Thu, 20 Nov 2025 13:13:18 +0000 (13:13 +0000)] 
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

3 weeks agoMerged /httpd/httpd/trunk:r1929514,1929883
Stefan Eissing [Thu, 20 Nov 2025 13:00:23 +0000 (13:00 +0000)] 
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

3 weeks agovote/promote
Eric Covener [Tue, 18 Nov 2025 18:15:01 +0000 (18:15 +0000)] 
vote/promote

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

5 weeks ago* Vote
Ruediger Pluem [Tue, 11 Nov 2025 07:08:39 +0000 (07:08 +0000)] 
* Vote

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

5 weeks agoPropose x1.
Joe Orton [Mon, 10 Nov 2025 16:43:29 +0000 (16:43 +0000)] 
Propose x1.

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

5 weeks agofr doc rebuild (including "favicon.ico --> favicon.png)
Lucien Gentis [Sat, 8 Nov 2025 14:30:33 +0000 (14:30 +0000)] 
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

5 weeks agofr doc XML files updates.
Lucien Gentis [Sat, 8 Nov 2025 14:20:51 +0000 (14:20 +0000)] 
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

5 weeks agoMerge r1929582 from trunk:
Joe Orton [Fri, 7 Nov 2025 13:59:48 +0000 (13:59 +0000)] 
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

5 weeks agoRegenerate docs.
Joe Orton [Fri, 7 Nov 2025 10:52:00 +0000 (10:52 +0000)] 
Regenerate docs.

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

5 weeks agoMerge r1927885, r1927916, r1928022 from trunk:
Ruediger Pluem [Fri, 7 Nov 2025 08:32:34 +0000 (08:32 +0000)] 
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

5 weeks agoMerge r1873397 from trunk:
Ruediger Pluem [Fri, 7 Nov 2025 08:23:08 +0000 (08:23 +0000)] 
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

5 weeks ago* Vote and promote
Ruediger Pluem [Fri, 7 Nov 2025 08:17:35 +0000 (08:17 +0000)] 
* Vote and promote

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

5 weeks agoMerged, add missing changes-entries file.
Joe Orton [Thu, 6 Nov 2025 09:23:17 +0000 (09:23 +0000)] 
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

5 weeks agoMerge r1929308, r1929333, r1929361, r1929503 from trunk:
Joe Orton [Thu, 6 Nov 2025 09:09:18 +0000 (09:09 +0000)] 
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

5 weeks agovote/promote
Eric Covener [Wed, 5 Nov 2025 13:13:14 +0000 (13:13 +0000)] 
vote/promote

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

5 weeks agovote/promote
Eric Covener [Tue, 4 Nov 2025 17:03:30 +0000 (17:03 +0000)] 
vote/promote

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

6 weeks agoupdate backport revisions
Stefan Eissing [Tue, 4 Nov 2025 16:54:48 +0000 (16:54 +0000)] 
update backport revisions

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

6 weeks agopropose backport
Stefan Eissing [Tue, 4 Nov 2025 15:51:05 +0000 (15:51 +0000)] 
propose backport

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

6 weeks agopropose backport
Stefan Eissing [Tue, 4 Nov 2025 14:52:55 +0000 (14:52 +0000)] 
propose backport

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

6 weeks agoMerge /httpd/httpd/trunk:r1927807,1927874,1928039,1928839,1928861
Stefan Eissing [Tue, 4 Nov 2025 14:51:48 +0000 (14:51 +0000)] 
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

6 weeks ago* Vote
Ruediger Pluem [Fri, 31 Oct 2025 12:34:54 +0000 (12:34 +0000)] 
* Vote

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

7 weeks agoVote, propose.
Joe Orton [Tue, 28 Oct 2025 15:40:27 +0000 (15:40 +0000)] 
Vote, propose.

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

7 weeks ago* These backports are ready
Ruediger Pluem [Fri, 24 Oct 2025 15:06:15 +0000 (15:06 +0000)] 
* 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

2 months agoAdd a missing PR reference.
Joe Orton [Thu, 16 Oct 2025 16:27:43 +0000 (16:27 +0000)] 
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

2 months agoUpdate the favicon in the doc to the new leaf logo.
Christophe Jaillet [Thu, 2 Oct 2025 19:59:36 +0000 (19:59 +0000)] 
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

2 months ago* Add comment
Ruediger Pluem [Thu, 2 Oct 2025 12:56:05 +0000 (12:56 +0000)] 
* Add comment

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

2 months agoVotes.
Joe Orton [Tue, 30 Sep 2025 07:24:43 +0000 (07:24 +0000)] 
Votes.

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

2 months agoadd r1928839 to mod_md backport
Stefan Eissing [Mon, 29 Sep 2025 15:10:16 +0000 (15:10 +0000)] 
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

2 months ago* Propose
Ruediger Pluem [Thu, 18 Sep 2025 06:48:36 +0000 (06:48 +0000)] 
* Propose

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

3 months agofr doc rebuild.
Lucien Gentis [Sat, 6 Sep 2025 14:12:21 +0000 (14:12 +0000)] 
fr doc rebuild.

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

3 months agofr doc XML file update.
Lucien Gentis [Sat, 6 Sep 2025 14:10:42 +0000 (14:10 +0000)] 
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

3 months agotypo correction.
Lucien Gentis [Sat, 6 Sep 2025 13:36:38 +0000 (13:36 +0000)] 
typo correction.

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

3 months agoMerge r1928084 from trunk:
Eric Covener [Fri, 29 Aug 2025 12:21:10 +0000 (12:21 +0000)] 
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

3 months agoMerge r1928078 from trunk:
Eric Covener [Fri, 29 Aug 2025 12:17:01 +0000 (12:17 +0000)] 
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

3 months ago* Vote
Ruediger Pluem [Wed, 27 Aug 2025 10:00:08 +0000 (10:00 +0000)] 
* Vote

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

3 months ago* Add new proposal
Ruediger Pluem [Wed, 27 Aug 2025 09:56:56 +0000 (09:56 +0000)] 
* Add new proposal

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

3 months agoadd tailscale doc removal to mod_md backport
Stefan Eissing [Wed, 27 Aug 2025 07:56:03 +0000 (07:56 +0000)] 
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

3 months ago* Add proposal
Ruediger Pluem [Tue, 26 Aug 2025 18:26:36 +0000 (18:26 +0000)] 
* Add proposal

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

3 months agofr doc rebuild.
Lucien Gentis [Sat, 23 Aug 2025 13:03:47 +0000 (13:03 +0000)] 
fr doc rebuild.

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

3 months agofr doc XML file update.
Lucien Gentis [Sat, 23 Aug 2025 13:02:35 +0000 (13:02 +0000)] 
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

3 months agoadd 1927874 to mod_md backport
Stefan Eissing [Tue, 19 Aug 2025 09:37:31 +0000 (09:37 +0000)] 
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

3 months agoTrivial typo correction
Rich Bowen [Mon, 18 Aug 2025 19:22:58 +0000 (19:22 +0000)] 
Trivial typo correction

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

4 months agopropose mod_md for back port
Stefan Eissing [Fri, 15 Aug 2025 11:25:17 +0000 (11:25 +0000)] 
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

4 months ago* Vote
Ruediger Pluem [Fri, 15 Aug 2025 07:09:49 +0000 (07:09 +0000)] 
* Vote

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

4 months agopropose backport of r1927792
Stefan Eissing [Thu, 14 Aug 2025 07:55:07 +0000 (07:55 +0000)] 
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

4 months agopropose backport
Stefan Eissing [Wed, 6 Aug 2025 14:05:40 +0000 (14:05 +0000)] 
propose backport

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

4 months agopublishing release httpd-2.4.65
Eric Covener [Wed, 23 Jul 2025 12:06:16 +0000 (12:06 +0000)] 
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

4 months agofr doc rebuild.
Lucien Gentis [Mon, 21 Jul 2025 11:19:22 +0000 (11:19 +0000)] 
fr doc rebuild.

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

4 months agofr doc XML file update.
Lucien Gentis [Mon, 21 Jul 2025 11:18:31 +0000 (11:18 +0000)] 
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

4 months agofix `rewritecond expr` regression in 2.4.64
Eric Covener [Mon, 21 Jul 2025 11:12:44 +0000 (11:12 +0000)] 
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

4 months agoxforms
Eric Covener [Fri, 18 Jul 2025 19:50:45 +0000 (19:50 +0000)] 
xforms

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

4 months agoMerge r1927320 from trunk:
Eric Covener [Fri, 18 Jul 2025 19:48:49 +0000 (19:48 +0000)] 
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

4 months agoImprove compatibility with older python.
Rainer Jung [Fri, 18 Jul 2025 17:08:43 +0000 (17:08 +0000)] 
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

5 months agopropose 1927235 for backport
Stefan Eissing [Tue, 15 Jul 2025 06:37:36 +0000 (06:37 +0000)] 
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

5 months agofr doc rebuild.
Lucien Gentis [Sat, 12 Jul 2025 13:23:19 +0000 (13:23 +0000)] 
fr doc rebuild.

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

5 months agofr doc XML file update.
Lucien Gentis [Sat, 12 Jul 2025 13:21:59 +0000 (13:21 +0000)] 
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

5 months agoadd credit
Eric Covener [Fri, 11 Jul 2025 01:20:00 +0000 (01:20 +0000)] 
add credit

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

5 months agopublishing release httpd-2.4.64
Eric Covener [Thu, 10 Jul 2025 11:57:06 +0000 (11:57 +0000)] 
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

5 months agoMerge r1927054 from trunk:
Eric Covener [Mon, 7 Jul 2025 15:40:38 +0000 (15:40 +0000)] 
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

5 months agobackport 1927038 from trunk
Eric Covener [Mon, 7 Jul 2025 12:12:49 +0000 (12:12 +0000)] 
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

5 months agobackport 1927037 from trunk
Eric Covener [Mon, 7 Jul 2025 12:09:30 +0000 (12:09 +0000)] 
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

5 months agobackport 1927036 from trunk
Eric Covener [Mon, 7 Jul 2025 12:05:49 +0000 (12:05 +0000)] 
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

5 months agobackport 1927035 from trunk
Eric Covener [Mon, 7 Jul 2025 12:04:49 +0000 (12:04 +0000)] 
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

5 months agobackport 1927034 from trunk
Eric Covener [Mon, 7 Jul 2025 12:03:42 +0000 (12:03 +0000)] 
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

5 months agobackport 1927033 from trunk
Eric Covener [Mon, 7 Jul 2025 12:02:22 +0000 (12:02 +0000)] 
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

5 months agobackport 1927032 from trunk
Eric Covener [Mon, 7 Jul 2025 12:01:02 +0000 (12:01 +0000)] 
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

5 months agofix header merging
Eric Covener [Mon, 7 Jul 2025 11:59:38 +0000 (11:59 +0000)] 
fix header merging

Reviewed By: rpluem, jorton, ylavic

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

5 months agomake update-changes
Eric Covener [Mon, 7 Jul 2025 11:33:53 +0000 (11:33 +0000)] 
make update-changes

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

5 months agoported
Eric Covener [Mon, 7 Jul 2025 11:33:25 +0000 (11:33 +0000)] 
ported

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

5 months agoport r1922115 from trunk
Eric Covener [Mon, 7 Jul 2025 11:33:13 +0000 (11:33 +0000)] 
port r1922115 from trunk

   *) mod_proxy_ajp: Use iobuffersize set on worker level for the IO buffer
      size.

Submitted By: Jari Ahonen <jah@progress.com>
Reviewed By: rpluem, ylavic, covener

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

5 months agovote/promote simple fix
Eric Covener [Mon, 7 Jul 2025 11:31:50 +0000 (11:31 +0000)] 
vote/promote simple fix

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

5 months agoMerge r1926110, r1926111 from trunk:
Ruediger Pluem [Mon, 7 Jul 2025 10:18:22 +0000 (10:18 +0000)] 
Merge r1926110, r1926111 from trunk:

Correctly check return value of getline

In case of an error (e.g. file not found or readable) getline returns -1 which
causes an endless loop. Leave the loop in such cases.

* Correctly handle filenames that contain spaces

Reviewed by: rpluem, ylavic, jorton

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

5 months ago1 done, 1 vote.
Joe Orton [Mon, 7 Jul 2025 09:28:16 +0000 (09:28 +0000)] 
1 done, 1 vote.

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

5 months agoMerge r1926720, r1926722 from trunk:
Joe Orton [Mon, 7 Jul 2025 09:15:21 +0000 (09:15 +0000)] 
Merge r1926720, r1926722 from trunk:

* modules/ssl/ssl_private.h: For OpenSSL >= 3.5.0 drop $SSLKEYLOGFILE
  handling inside mod_ssl where OpenSSL is built to handle that
  internally in libssl.

* modules/ssl/ssl_private.h: Fix logic in r1926720 HAVE_OPENSSL_KEYLOG macro,
  thanks to rpluem.

Reviewed by: rpluem
Submitted by: jorton
Reviewed by: jorton, rpluem, ylavic
Github: closes #538

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

5 months agoVote/promote
Yann Ylavic [Thu, 3 Jul 2025 10:27:13 +0000 (10:27 +0000)] 
Vote/promote

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

5 months ago* Vote
Ruediger Pluem [Mon, 30 Jun 2025 13:45:15 +0000 (13:45 +0000)] 
* Vote

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

5 months agoPropose x1.
Joe Orton [Fri, 27 Jun 2025 12:41:04 +0000 (12:41 +0000)] 
Propose x1.

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

6 months agoBackported in r1926328.
Yann Ylavic [Tue, 10 Jun 2025 11:04:25 +0000 (11:04 +0000)] 
Backported in r1926328.

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

6 months agomod_asis: Fix the log level of the message AH01236
Yann Ylavic [Tue, 10 Jun 2025 11:04:01 +0000 (11:04 +0000)] 
mod_asis: Fix the log level of the message AH01236

Change the log level from ERROR to DEBUG.

The message \"mod_asis: ap_pass_brigade failed for file ...\" was logged with
the level ERROR. This log level is inappropriate here, because a client can
trigger this log message by aborting the request.

Most other modules don't log at all or use the log level DEBUG when
ap_pass_brigade() fails.

Submitted by: Michael Kaufmann <mail michael-kaufmann.ch>
Github: closes #527

Add a change entry to give credits to the author.

Merges r1924954, r1926191 trunk
Submitted by: jorton, jailletc36
Reviewed by: jailletc36, rpluem, ylavic

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

6 months agoBackported in r1926325.
Yann Ylavic [Tue, 10 Jun 2025 11:02:06 +0000 (11:02 +0000)] 
Backported in r1926325.

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

6 months agoSync CHANGES.
Yann Ylavic [Tue, 10 Jun 2025 11:01:25 +0000 (11:01 +0000)] 
Sync CHANGES.

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

6 months agomod_session_dbd: set_cookie_name: ensure correct format
Yann Ylavic [Tue, 10 Jun 2025 11:00:37 +0000 (11:00 +0000)] 
mod_session_dbd: set_cookie_name: ensure correct format

If args is an empty string, apr_strtok will return NULL and *last will never get set which results in a SIGSEGV in apr_isspace check

Submitted by: Thomas Meyer <thomas@m3y3r.de>

Github: closes #503

Follow-up to r1922931.

In set_cookie_name() and set_cookie_name2(), now that the empty 'name' argument is explicitly handled, the error message in check_string() can be simplified because the cookie name can't be empty anymore when this function is called.

Add a change entry to give credits to the author.

Merges r1922931, r1926188, r1926189 trunk
Submitted by: covener, jailletc36, jailletc36
Reviewed by: jailletc36, rpluem, ylavic

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

6 months agoBackported in r1926323.
Yann Ylavic [Tue, 10 Jun 2025 10:58:50 +0000 (10:58 +0000)] 
Backported in r1926323.

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

6 months agoavoid ap_set_content_type when processing a _Request_Header set|edit|unset Content...
Yann Ylavic [Tue, 10 Jun 2025 10:58:15 +0000 (10:58 +0000)] 
avoid ap_set_content_type when processing a _Request_Header set|edit|unset Content-Type.

identified by ylavic

Merges r1820750 from trunk
Submitted by: covener
Reviewed by: covener, rpluem, jorton

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

6 months agoBackported in r1926321.
Yann Ylavic [Tue, 10 Jun 2025 10:55:14 +0000 (10:55 +0000)] 
Backported in r1926321.

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

6 months agomod_ssl: Remove warning over potential uninitialised value
Yann Ylavic [Tue, 10 Jun 2025 10:54:44 +0000 (10:54 +0000)] 
mod_ssl: Remove warning over potential uninitialised value
for ssl protocol prior to protocol selection.

Merges r1924757 trunk
Submitted by: minfrin
Reviewed by: minfrin, rpluem, covener

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

6 months agoBackported in r1926319.
Yann Ylavic [Tue, 10 Jun 2025 10:52:22 +0000 (10:52 +0000)] 
Backported in r1926319.

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

6 months agoRemove awk dependency when building using CMake. Before this awk was required
Yann Ylavic [Tue, 10 Jun 2025 10:51:35 +0000 (10:51 +0000)] 
Remove awk dependency when building using CMake. Before this awk was required
for -DWITH_MODULES option.

* build/build-modules-c.cmake:
  (generate_builtin_modules_c): Function to generate modules.c.

* CMakeLists.txt
  (): Use generate_builtin_modules_c() instead of `awk -f build/build-modules-c.awk`
  to generate modules.c file.

* README.cmake:
  (Prerequisites, How to build): Do not mention awk as prerequisite.

Follow-up to r1919413: CMake: Use configure_file() instead of file(write)
to generate modules.c file because configure_file() doesn't change
timestamp of file if contents is the the same.

Follow-up to r1919587: CMake: Fix type in variable name (MODULES_SYNMBOLS -> MODULES_SYMBOLS)

Merges r1919413, r1919587, r1919602 from trunk
Submitted by: ivan
Reviewed by: CTR

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

6 months agoBackported in r1926317.
Yann Ylavic [Tue, 10 Jun 2025 10:44:49 +0000 (10:44 +0000)] 
Backported in r1926317.

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

6 months agoMerge r1912460, r1925743 from trunk:
Yann Ylavic [Tue, 10 Jun 2025 10:43:58 +0000 (10:43 +0000)] 
Merge r1912460, r1925743 from trunk:

mod_proxy: Consistently close the socket on failure to reuse the connection.

proxy_connection_create() and ap_proxy_connect_backend() sometimes close the
connection on failure, sometimes not. Always close it.

mod_proxy: restore reuse of ProxyRemote connections when possible.

Fixes a regression from 2.4.59 (r1913907).

For a reverse proxy setup with a worker (enablereuse=on) and a
forward/CONNECT ProxyRemote to reach it, an open connection/tunnel
to/through the remote proxy for the same origin server (and using the
same proxy auth) should be reusable. Avoid closing them like r1913534
did.

* modules/proxy/proxy_util.c:
  Rename the struct to remote_connect_info since it's only used for
  connecting through remote CONNECT proxies. Axe the use_http_connect
  field, always true.

* modules/proxy/proxy_util.c(ap_proxy_connection_reusable):
  Remote CONNECT (forward) proxy connections can be reused if the auth
  and origin server infos are the same, so conn->forward != NULL is not
  a condition to prevent reusability.

* modules/proxy/proxy_util.c(ap_proxy_determine_connection):
  Fix the checks around conn->forward reuse and connection cleanup if
  that's not possible.

Submitted by: jfclere, ylavic
Reviewed by: ylavic, jfclere, rpluem

Github: closes #532

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

6 months agovote x 3, promote x 2
Yann Ylavic [Tue, 10 Jun 2025 10:32:25 +0000 (10:32 +0000)] 
vote x 3, promote x 2

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

6 months ago* Vote
Ruediger Pluem [Tue, 10 Jun 2025 09:54:20 +0000 (09:54 +0000)] 
* Vote

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

6 months ago* Vote and promote
Ruediger Pluem [Tue, 10 Jun 2025 08:32:51 +0000 (08:32 +0000)] 
* Vote and promote

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

6 months agofr doc rebuild.
Lucien Gentis [Sat, 7 Jun 2025 12:45:14 +0000 (12:45 +0000)] 
fr doc rebuild.

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

6 months agofr doc XML file update.
Lucien Gentis [Sat, 7 Jun 2025 12:43:50 +0000 (12:43 +0000)] 
fr doc XML file update.

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

6 months agofr doc XML files updates.
Lucien Gentis [Sat, 7 Jun 2025 12:40:45 +0000 (12:40 +0000)] 
fr doc XML files updates.

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

6 months agoProposal
Christophe Jaillet [Fri, 6 Jun 2025 20:35:07 +0000 (20:35 +0000)] 
Proposal

No vote from me, not able to test.

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

6 months agoPropose an easy vote
Christophe Jaillet [Fri, 6 Jun 2025 20:28:11 +0000 (20:28 +0000)] 
Propose an easy vote

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

6 months agoPropose an easy vote
Christophe Jaillet [Fri, 6 Jun 2025 20:23:10 +0000 (20:23 +0000)] 
Propose an easy vote

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