]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
2 years agovote
Jim Jagielski [Sun, 21 Aug 2022 20:23:54 +0000 (20:23 +0000)] 
vote

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

2 years ago* Vote
Ruediger Pluem [Wed, 17 Aug 2022 06:53:15 +0000 (06:53 +0000)] 
* Vote

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

2 years ago* Add proposal
Ruediger Pluem [Wed, 17 Aug 2022 06:32:47 +0000 (06:32 +0000)] 
* Add proposal

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

3 years agobackport proposal for PR66190 fix. [skip ci]
Stefan Eissing [Tue, 2 Aug 2022 08:39:52 +0000 (08:39 +0000)] 
backport proposal for PR66190 fix. [skip ci]

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

3 years ago *) tests: adding proxy test cases from trunk.
Stefan Eissing [Tue, 2 Aug 2022 08:17:03 +0000 (08:17 +0000)] 
  *) tests: adding proxy test cases from trunk.

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

3 years ago *) test: backporting improved nghttp output parsing.
Stefan Eissing [Thu, 14 Jul 2022 09:37:43 +0000 (09:37 +0000)] 
  *) test: backporting improved nghttp output parsing.
     test/modules/http2 adding trailer tests.

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

3 years agoMake pytest error whitelist a bit more explicit
Rainer Jung [Mon, 11 Jul 2022 14:06:29 +0000 (14:06 +0000)] 
Make pytest error whitelist a bit more explicit
and add OSSL 3 variants.

This fixes an error in test_101_ssl_reneg.py
due to the function name no longer being part
of the error message log when we use OSSL 3.

Backport of r1902660 and partial backport
of r1897257.

pytest is probably CTR, though not mentioned
in the CTR list in STATUS.

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

3 years agoMerge r1895982, r1898965, r1900545, r1902482 from trunk: [under CTR for Travis changes]
Joe Orton [Wed, 6 Jul 2022 13:33:12 +0000 (13:33 +0000)] 
Merge r1895982, r1898965, r1900545, r1902482 from trunk: [under CTR for Travis changes]

Add Travis job against OpenSSL 3 with -Werror but with deprecation
warnings disabled.
Be careful to remove the previous OpenSSL install prefix is rebuilding.

Update to test against OpenSSL 3.0.2.

Update to testing against OpenSSL 3.0.3.

Update to test with OpenSSL 3.0.5.

Submitted by: jorton

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

3 years agoTrigger ci.
Yann Ylavic [Thu, 30 Jun 2022 15:00:40 +0000 (15:00 +0000)] 
Trigger ci.

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

3 years agoUpdate proposal.
Rainer Jung [Tue, 21 Jun 2022 10:30:45 +0000 (10:30 +0000)] 
Update proposal.
[skip ci]

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

3 years agoPropose.
Rainer Jung [Mon, 20 Jun 2022 21:07:17 +0000 (21:07 +0000)] 
Propose.

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

3 years agoEasy proposals to synch with trunk
Christophe Jaillet [Sun, 12 Jun 2022 17:58:54 +0000 (17:58 +0000)] 
Easy proposals to synch with trunk

[skip ci]

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

3 years agopublishing release httpd-2.4.54
Stefan Eissing [Wed, 8 Jun 2022 08:47:50 +0000 (08:47 +0000)] 
publishing release httpd-2.4.54

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

3 years agoDoc xforms
Jim Jagielski [Mon, 6 Jun 2022 14:38:15 +0000 (14:38 +0000)] 
Doc xforms

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

3 years agoMerge r1901645 from trunk:
Eric Covener [Sat, 4 Jun 2022 20:21:24 +0000 (20:21 +0000)] 
Merge r1901645 from trunk:

fixed in 1.7 SVN but not released

just in case we reroll.

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

3 years agoMerge r1901633 from trunk:
Eric Covener [Sat, 4 Jun 2022 15:38:03 +0000 (15:38 +0000)] 
Merge r1901633 from trunk:

-qinitauto=FE conflicts with -qcheck=unset

maintainer mode only

causes a warning for every compiler invocation.  If automatics are initialized
by -qinitauto, use before being assigned cannot be detected with -qcheck=unset
(part of all)

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

3 years agofr doc rebuild.
Lucien Gentis [Sat, 4 Jun 2022 15:28:19 +0000 (15:28 +0000)] 
fr doc rebuild.

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

3 years agofr doc XML files updates.
Lucien Gentis [Sat, 4 Jun 2022 15:27:23 +0000 (15:27 +0000)] 
fr doc XML files updates.

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

3 years agoMerge r1901619 from trunk:
Eric Covener [Sat, 4 Jun 2022 12:07:17 +0000 (12:07 +0000)] 
Merge r1901619 from trunk:

force to 0 on 1.6 on Windows

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

3 years agoadd md_tailscale.c to command line build
Gregg Lewis Smith [Fri, 3 Jun 2022 20:41:57 +0000 (20:41 +0000)] 
add md_tailscale.c to command line build
per r1900316

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

3 years ago update transformations.
Nilgun Belma Buguner [Fri, 3 Jun 2022 17:12:39 +0000 (17:12 +0000)] 
 update transformations.

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

3 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Fri, 3 Jun 2022 17:11:48 +0000 (17:11 +0000)] 
update for sync with English docs.

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

3 years agotypo [skip ci]
Giovanni Bechis [Fri, 3 Jun 2022 15:29:31 +0000 (15:29 +0000)] 
typo [skip ci]

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

3 years agoCompile CHANGES.
Stefan Eissing [Fri, 3 Jun 2022 14:37:23 +0000 (14:37 +0000)] 
Compile CHANGES.
[skip ci]

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

3 years agoupdate after backport
Stefan Eissing [Fri, 3 Jun 2022 08:27:35 +0000 (08:27 +0000)] 
update after backport
[skip ci]

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

3 years agoMerge Pull 321 (trunk: r1874005, r1877261, r1901470):
Stefan Eissing [Fri, 3 Jun 2022 08:27:07 +0000 (08:27 +0000)] 
Merge Pull 321 (trunk: r1874005, r1877261, r1901470):

  *) mod_ssl: SSLFIPS compatible with OpenSSL 3.0.  PR 66063.
     [Petr Sumbera <petr.sumbera oracle.com>, Yann Ylavic]

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

3 years agoupdate after backport
Stefan Eissing [Fri, 3 Jun 2022 08:21:13 +0000 (08:21 +0000)] 
update after backport
[skip ci]

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

3 years agoMerge pull 319 (trunk: r1901420, r1901446, r1901485, r1901486):
Stefan Eissing [Fri, 3 Jun 2022 08:20:42 +0000 (08:20 +0000)] 
Merge pull 319 (trunk: r1901420, r1901446, r1901485, r1901486):

  *) mod_proxy_http: Avoid 417 responses for non forwardable 100-continue.
     PR 65666.  [Yann Ylavic]

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

3 years agovote [skip ci]
Giovanni Bechis [Fri, 3 Jun 2022 07:42:23 +0000 (07:42 +0000)] 
vote [skip ci]

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

3 years agoRemove backported items
Christophe Jaillet [Thu, 2 Jun 2022 20:03:36 +0000 (20:03 +0000)] 
Remove backported items

[skip ci]

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

3 years agoMerge r1756843, r1897890, r1898731, r1900064, r1900077 from trunk
Christophe Jaillet [Thu, 2 Jun 2022 20:02:50 +0000 (20:02 +0000)] 
Merge r1756843, r1897890, r1898731, r1900064, r1900077 from trunk

   * mod_auth_digest: Fix some missed "strcasecmp <--> ap_cstr_casecmp" conversions
   * mod_dav: fix a typo
   * mod_lua: Avoid "may be uninitialized" warning
   * ab: Fix alignment in an 'if' block.
   * mod_authz_dbd: fix select-groups example, bz 66010

Submitted by: jailletc36, rpluem, rpluem, jailletc36, gbechis
Reviewed by: jailletc36, ylavic, rpluem
Backported by: jailletc36

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

3 years ago* Vote and promote [skip ci]
Ruediger Pluem [Thu, 2 Jun 2022 11:37:53 +0000 (11:37 +0000)] 
* Vote and promote [skip ci]

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

3 years agoSync CHANGES [skip ci]
Yann Ylavic [Thu, 2 Jun 2022 09:59:22 +0000 (09:59 +0000)] 
Sync CHANGES [skip ci]

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

3 years agoMerge of r1901549 from trunk:
Stefan Eissing [Thu, 2 Jun 2022 09:41:28 +0000 (09:41 +0000)] 
Merge of r1901549 from trunk:

  *) mod_md: update version after release on github.

[skip ci]

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

3 years agoMerge of r1901546 from trunk:
Stefan Eissing [Thu, 2 Jun 2022 09:19:37 +0000 (09:19 +0000)] 
Merge of r1901546 from trunk:

update of mod_md change description.
[skip ci]

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

3 years agomod_proxy_ajp: T-E has precedence over C-L.
Yann Ylavic [Wed, 1 Jun 2022 13:48:21 +0000 (13:48 +0000)] 
mod_proxy_ajp: T-E has precedence over C-L.

Merge r1901521 from trunk.
Submitted by: rpluem

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

3 years agoPropose [skip ci]
Yann Ylavic [Wed, 1 Jun 2022 13:15:19 +0000 (13:15 +0000)] 
Propose [skip ci]

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

3 years agoSync docs again [skip ci]
Yann Ylavic [Wed, 1 Jun 2022 13:12:08 +0000 (13:12 +0000)] 
Sync docs again [skip ci]

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

3 years agoMerge r1901512 from trunk:
Eric Covener [Wed, 1 Jun 2022 12:58:38 +0000 (12:58 +0000)] 
Merge r1901512 from trunk:

add  LWP::Protocol::AnyEvent::http

it can be used to workaround a bug with hitting mod_echo_post

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

3 years agoMerge r1901510 from trunk:
Eric Covener [Wed, 1 Jun 2022 12:53:42 +0000 (12:53 +0000)] 
Merge r1901510 from trunk:

mention limit

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

3 years agoMerge r1901506 from trunk:
Eric Covener [Wed, 1 Jun 2022 12:50:40 +0000 (12:50 +0000)] 
Merge r1901506 from trunk:

limit mod_sed memory use

Resync mod_sed.c with trunk due to merge conflicts.

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

3 years agoMerge r1901504 from trunk:
Eric Covener [Wed, 1 Jun 2022 12:38:03 +0000 (12:38 +0000)] 
Merge r1901504 from trunk:

mod_isapi: use consistent filename

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

3 years agoMerge r1901502 from trunk:
Eric Covener [Wed, 1 Jun 2022 12:36:39 +0000 (12:36 +0000)] 
Merge r1901502 from trunk:

use filters consistently

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

3 years agoMerge r1901500 from trunk:
Eric Covener [Wed, 1 Jun 2022 12:34:16 +0000 (12:34 +0000)] 
Merge r1901500 from trunk:

handle large writes in ap_rputs

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

3 years agoMerge r1901497 from trunk:
Eric Covener [Wed, 1 Jun 2022 12:31:48 +0000 (12:31 +0000)] 
Merge r1901497 from trunk:

use a liberal default limit for LimitRequestBody of 1GB

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

3 years agoMerge r1901496 from trunk:
Eric Covener [Wed, 1 Jun 2022 12:31:19 +0000 (12:31 +0000)] 
Merge r1901496 from trunk:

cast first

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

3 years agoMerge r1901494 from trunk:
Eric Covener [Wed, 1 Jun 2022 12:21:45 +0000 (12:21 +0000)] 
Merge r1901494 from trunk:

fix types

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

3 years agoSync docs [skip ci]
Yann Ylavic [Wed, 1 Jun 2022 11:51:42 +0000 (11:51 +0000)] 
Sync docs [skip ci]

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

3 years agoNote about Absolute URL redirects w.r.t. query-string in mod_rewrite [skip ci]
Yann Ylavic [Wed, 1 Jun 2022 11:50:37 +0000 (11:50 +0000)] 
Note about Absolute URL redirects w.r.t. query-string in mod_rewrite [skip ci]

Merge r1901487 from trunk.
Submitted by: ylavic

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

3 years agoPropose, vote [skip ci]
Yann Ylavic [Wed, 1 Jun 2022 11:26:11 +0000 (11:26 +0000)] 
Propose, vote [skip ci]

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

3 years agoRemove duplicate CHANGES entry, slightly reformat others.
Rainer Jung [Wed, 1 Jun 2022 11:06:17 +0000 (11:06 +0000)] 
Remove duplicate CHANGES entry, slightly reformat others.
[skip ci]

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

3 years agocleanup after backport [skip ci]
Stefan Eissing [Wed, 1 Jun 2022 07:51:27 +0000 (07:51 +0000)] 
cleanup after backport [skip ci]

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

3 years agoMerge r1901461 from trunk via #320:
Stefan Eissing [Wed, 1 Jun 2022 07:51:04 +0000 (07:51 +0000)] 
Merge r1901461 from trunk via #320:

  *) mod_proxy: ap_proxy_create_hdrbrgd() to clear hop-by-hop first and fixup last.

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

3 years agovote and promote [skip ci]
Stefan Eissing [Wed, 1 Jun 2022 07:49:30 +0000 (07:49 +0000)] 
vote and promote [skip ci]

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

3 years ago* Vote [skip ci]
Ruediger Pluem [Wed, 1 Jun 2022 06:41:54 +0000 (06:41 +0000)] 
* Vote [skip ci]

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

3 years agoPropose [skip ci]
Yann Ylavic [Tue, 31 May 2022 16:03:45 +0000 (16:03 +0000)] 
Propose [skip ci]

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

3 years agoVote
Christophe Jaillet [Wed, 25 May 2022 19:59:32 +0000 (19:59 +0000)] 
Vote

[skip ci]

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

3 years agoEasy proposals
Christophe Jaillet [Wed, 25 May 2022 19:49:59 +0000 (19:49 +0000)] 
Easy proposals

[skip ci]

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

3 years agoupdate after backport [skip ci]
Stefan Eissing [Wed, 25 May 2022 12:10:29 +0000 (12:10 +0000)] 
update after backport [skip ci]

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

3 years agovote and promote [skip ci]
Stefan Eissing [Wed, 25 May 2022 12:10:08 +0000 (12:10 +0000)] 
vote and promote [skip ci]

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

3 years agoMerge /httpd/httpd/trunk:r1899858,1899865,1899884,1900991
Stefan Eissing [Wed, 25 May 2022 12:09:36 +0000 (12:09 +0000)] 
Merge /httpd/httpd/trunk:r1899858,1899865,1899884,1900991

  *) mpm_event, mpm_worker: Handle children killed pathologically.

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

3 years agoMerge of r1901088 from trunk:
Stefan Eissing [Wed, 25 May 2022 11:49:56 +0000 (11:49 +0000)] 
Merge of r1901088 from trunk:

  *) mod_proxy_connect: Ensure that the configured timeout is set on the
     backend socket.
     Trunk version of patch:
        https://svn.apache.org/r1901088
     Backport version for 2.4.x of patch:
      Trunk version of patch works
      svn merge -c 1901088 ^/httpd/httpd/trunk .

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

3 years agovote and promote [skip ci]
Stefan Eissing [Wed, 25 May 2022 11:47:59 +0000 (11:47 +0000)] 
vote and promote [skip ci]

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

3 years agoMerge /httpd/httpd/trunk:r1901230
Stefan Eissing [Wed, 25 May 2022 11:45:05 +0000 (11:45 +0000)] 
Merge /httpd/httpd/trunk:r1901230

  *) mod_md: a logic bug in sending long OCSP HTTP request bodies was fixed.
     This did not happen in normal use as request sizes for OSCP queries
     never exceed that length.

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

3 years agoBackported in r1901203 [skip ci]
Yann Ylavic [Tue, 24 May 2022 09:08:07 +0000 (09:08 +0000)] 
Backported in r1901203 [skip ci]

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

3 years agoSync CHANGES [skip ci]
Yann Ylavic [Tue, 24 May 2022 09:07:27 +0000 (09:07 +0000)] 
Sync CHANGES [skip ci]

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

3 years agoab: Allow for TLSv1.3 when the SSL library supports it.
Yann Ylavic [Tue, 24 May 2022 09:06:42 +0000 (09:06 +0000)] 
ab: Allow for TLSv1.3 when the SSL library supports it.

When TLS1_3_VERSION is defined by the SSL library, bump the maximum TLS
protocol to that and use it for "-f ALL" or "-f TLSv1.3".

This mixes proposed patches from BZ 63594 and 64699.

BZ: 63594, 64699

Merge r1900157 from trunk:

Submitted by: abhilash <abhilash1232 gmail.com>
Submitted by: xiaolongx.jiang intel.com
Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton

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

3 years agoBackported in r1901201 [skip ci]
Yann Ylavic [Tue, 24 May 2022 09:03:58 +0000 (09:03 +0000)] 
Backported in r1901201 [skip ci]

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

3 years agocore: Disable TCP_NOPUSH optimization on OSX. BZ 66019.
Yann Ylavic [Tue, 24 May 2022 09:03:30 +0000 (09:03 +0000)] 
core: Disable TCP_NOPUSH optimization on OSX. BZ 66019.

OSX supports TCP_NOPUSH but does not release the data retained (in TCP stack)
when the option is unset. It seems that unsetting it before the last write
does not help either so just disable the optimization for OSX in the core
output filter to avoid uncontrollable transmission delays.

* server/core_filters.c():
  Add the sock_nopush() helper that does nothing on OSX and platforms not
  supporting TCP_NOPUSH or TCP_CORK.

* server/core_filters.c(send_brigade_nonblocking):
  Use sock_nopush() instead of apr_socket_opt_set() for APR_TCP_NOPUSH option.

Merge r1900100 from trunk.

Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton

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

3 years agoBackported in r1901199 [skip ci]
Yann Ylavic [Tue, 24 May 2022 09:00:51 +0000 (09:00 +0000)] 
Backported in r1901199 [skip ci]

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

3 years agompm_event: Fix accounting of active/total processes on ungraceful restart.
Yann Ylavic [Tue, 24 May 2022 09:00:19 +0000 (09:00 +0000)] 
mpm_event: Fix accounting of active/total processes on ungraceful restart.

Children processes terminated by ap_{reclaim,relieve}_child_processes() were
were not un-accounted for total_daemons and active_daemons, which was done in
server_main_loop() only. This led to perform_idle_server_maintenance() thinking
it was over the limit of children processes and never create new ones.

Have this accounting right in event_note_child_{started,stopped}() which is
called both at runtime and reload time.

* server/mpm/event/event.c(struct event_retained_data):
  Rename field max_daemons_limit to max_daemon_used to better describe what
  it's about and to align with AP_MPMQ_MAX_DAEMON_USED.

* server/mpm/event/event.c(event_note_child_stopped):
  Renamed from event_note_child_killed() to clarify that it's not only called
  when a child is killed (i.e. on restart) but whenever a child has stopped.

* server/mpm/event/event.c(event_note_child_stopped):
  Move decrementing {active,total}_daemons and marking child's threads as
  SERVER_DEAD from server_main_loop() so that it's done both at runtime and
  reload time. Log the current number/state of daemons at APLOG_DEBUG level
  for each child stopped.

* server/mpm/event/event.c(event_note_child_started):
  Move incrementing {active,total}_daemons from make_child() for symmetry,
  given that make_child() calls event_note_child_started(). Log the current
  number/state of daemons at APLOG_DEBUG level for each child started.

* server/mpm/event/event.c(perform_idle_server_maintenance):
  Fix possible miscounting of retained->max_daemon_used accross the multiple
  calls to perform_idle_server_maintenance() if ListenCoresBucketsRatio > 0.
  Pass an int *max_daemon_used which starts at zero and is bumped consistently
  for all the buckets, while retained->max_daemon_used is updated only after
  all the buckets have been maintained.

* server/mpm/event/event.c(perform_idle_server_maintenance):
  Use event_note_child_stopped() to handle exited children processes.

Follow up to r1899777: CHANGES entry.

mpm_event: Follow up to r1899777: Fix max_daemon_used.

Merge r1899777, r1899786, r1899812 from trunk.
Fixes: BZ 66004
Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton

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

3 years agoBackported in r1901196 [skip ci]
Yann Ylavic [Tue, 24 May 2022 08:56:14 +0000 (08:56 +0000)] 
Backported in r1901196 [skip ci]

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

3 years ago*) core: make ap_escape_quotes() work correctly on strings
Yann Ylavic [Tue, 24 May 2022 08:55:16 +0000 (08:55 +0000)] 
*) core: make ap_escape_quotes() work correctly on strings
   with more than MAX_INT/2 characters, counting quotes double.
   Credit to <generalbugs@zippenhop.com> for finding this.

*) core: improved checks in ap_escape_quotes() for
   extra long strings (or resulting strings) that
   exceed ptrdiff_t ranges.

Merge r1899609, r1899905 from trunk.
Reviewed by: icing, rpluem, ylavic
Submitted by: icing, ylavic

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

3 years agoVotes, promotes, [skip ci]
Joe Orton [Mon, 23 May 2022 09:27:17 +0000 (09:27 +0000)] 
Votes, promotes, [skip ci]

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

3 years ago* Vote [skip ci]
Ruediger Pluem [Mon, 23 May 2022 07:33:54 +0000 (07:33 +0000)] 
* Vote [skip ci]

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

3 years ago* Propose [skip ci]
Ruediger Pluem [Mon, 23 May 2022 07:16:01 +0000 (07:16 +0000)] 
* Propose [skip ci]

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

3 years agofr doc rebuild.
Lucien Gentis [Sat, 21 May 2022 15:09:33 +0000 (15:09 +0000)] 
fr doc rebuild.

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

3 years agofr doc XML files updates.
Lucien Gentis [Sat, 21 May 2022 15:08:32 +0000 (15:08 +0000)] 
fr doc XML files updates.

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

3 years agoMerge r1901071 from trunk:
Eric Covener [Thu, 19 May 2022 18:44:15 +0000 (18:44 +0000)] 
Merge r1901071 from trunk:

escaping doesn't actually happen by default

otherwise, we would not have [B] and two internal escape functions.

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

3 years agoSync CHANGES entries [skip ci].
Yann Ylavic [Wed, 18 May 2022 12:48:33 +0000 (12:48 +0000)] 
Sync CHANGES entries [skip ci].

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

3 years agoAdd back changes-entries/mod_proxy_log_backend_port.txt
Rainer Jung [Tue, 17 May 2022 18:28:08 +0000 (18:28 +0000)] 
Add back changes-entries/mod_proxy_log_backend_port.txt
which was removed erroneously by r1901009.

It is needed to document the changes applied by
r1900957 (backport of r1900028).

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

3 years agoMerge r1900356 from trunk:
Jim Jagielski [Tue, 17 May 2022 18:19:36 +0000 (18:19 +0000)] 
Merge r1900356 from trunk:

  *) mod_http2: remove unused and insecure code. Fixes PR66037.
     Thanks to Ronald Crane (Zippenhop LLC) for reporting this.

Submitted by: icing
Reviewed by: jailletc36, icing, rpluem

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

3 years agoMerge r from trunk:
Jim Jagielski [Tue, 17 May 2022 18:17:44 +0000 (18:17 +0000)] 
Merge r from trunk:

Submitted by: icing, rpluem, ylavic
Reviewed by: jim

Github: closes #317

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

3 years agoMerge r1900335 from trunk:
Jim Jagielski [Tue, 17 May 2022 18:14:29 +0000 (18:14 +0000)] 
Merge r1900335 from trunk:

Harden mod_session and avoid overflow in case of indecently large session
Submitted by: jailletc36
Reviewed by: jailletc36, rpluem, ylavic

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

3 years agoMerge from trunk:
Jim Jagielski [Tue, 17 May 2022 18:13:11 +0000 (18:13 +0000)] 
Merge from trunk:
Submitted by: jim
Reviewed by: 1900340

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

3 years agoNote missing link [skip ci]
Yann Ylavic [Tue, 17 May 2022 16:01:10 +0000 (16:01 +0000)] 
Note missing link [skip ci]

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

3 years agoMore proposals [skip ci]
Yann Ylavic [Tue, 17 May 2022 15:56:17 +0000 (15:56 +0000)] 
More proposals [skip ci]

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

3 years agoNote associated PR [skip ci]
Yann Ylavic [Tue, 17 May 2022 15:47:31 +0000 (15:47 +0000)] 
Note associated PR [skip ci]

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

3 years agoPropose [skip ci]
Yann Ylavic [Tue, 17 May 2022 15:43:34 +0000 (15:43 +0000)] 
Propose [skip ci]

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

3 years agoAdd missing revision in merge command [skip ci].
Yann Ylavic [Tue, 17 May 2022 15:27:39 +0000 (15:27 +0000)] 
Add missing revision in merge command [skip ci].

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

3 years agoVote, promote [skip ci].
Yann Ylavic [Tue, 17 May 2022 15:26:33 +0000 (15:26 +0000)] 
Vote, promote [skip ci].

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

3 years agoMerge /httpd/httpd/trunk:r1899841
Stefan Eissing [Tue, 17 May 2022 13:32:43 +0000 (13:32 +0000)] 
Merge  /httpd/httpd/trunk:r1899841

mod_heartmonitor: Fix setting and comparison of IPs fields.

Setting or comparing hm_server_t and hm_slot_server_t IPs should not be base
on MAXIPSIZE since the former is potentially a smaller const char*.

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

3 years agoRemove backported entry
Rainer Jung [Mon, 16 May 2022 12:40:52 +0000 (12:40 +0000)] 
Remove backported entry

[skip ci]

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

3 years agomod_proxy: Add backend port to log messages to
Rainer Jung [Mon, 16 May 2022 12:39:54 +0000 (12:39 +0000)] 
mod_proxy: Add backend port to log messages to
ease identification of involved service.

Merge r1900028 from trunk.
Submitted by: rjung
Reviewed by: rjung, jim, rpluem

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

3 years agoMerge /httpd/httpd/trunk:r1900875
Stefan Eissing [Mon, 16 May 2022 11:38:37 +0000 (11:38 +0000)] 
Merge /httpd/httpd/trunk:r1900875

  *) test: switch rustls-ffi to v0.9.0 which gets
     rid of the cbindgen dependency.

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

3 years agoMerge /httpd/httpd/trunk:r1900852,1900887
Stefan Eissing [Mon, 16 May 2022 11:36:20 +0000 (11:36 +0000)] 
Merge  /httpd/httpd/trunk:r1900852,1900887

  *) mod_md: the `MDCertificateAuthority` directive can take more than one URL/name of
     an ACME CA. This gives a failover for renewals when several consecutive attempts
     to get a certificate failed.
     A new directive was added: `MDRetryDelay` sets the delay of retries.
     A new directive was added: `MDRetryFailover` sets the number of errored
     attempts before an alternate CA is selected for certificate renewals.

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

3 years ago* Promote [skip ci]
Ruediger Pluem [Mon, 16 May 2022 07:43:03 +0000 (07:43 +0000)] 
* Promote [skip ci]

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

3 years ago* Vote and comment [skip ci]
Ruediger Pluem [Mon, 16 May 2022 07:41:15 +0000 (07:41 +0000)] 
* Vote and comment [skip ci]

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

3 years ago* Vote [skip ci]
Ruediger Pluem [Mon, 16 May 2022 07:06:29 +0000 (07:06 +0000)] 
* Vote [skip ci]

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

3 years agoRemove backported entry
Christophe Jaillet [Fri, 13 May 2022 17:06:09 +0000 (17:06 +0000)] 
Remove backported entry

[skip ci]

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