]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
3 years ago+1
Yann Ylavic [Thu, 13 Jan 2022 14:07:21 +0000 (14:07 +0000)] 
+1

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

3 years agoMerge r1893410, r1893411, r1893414, r1893473, r1893476, r1893478, r1896746, r1896758...
Yann Ylavic [Thu, 13 Jan 2022 14:05:37 +0000 (14:05 +0000)] 
Merge r1893410, r1893411, r1893414, r1893473, r1893476, r1893478, r1896746, r1896758, r1896759, r1896784, r1896785, r1896890, r1896891 from trunk:

ci: print error_log on perl-framework failure.

ci: show non-traceX logs only.

ci: show >debug logs only.

test -n wants a single argument.

More of test -n wants a single argument.

No nullglob with ls..

Try to get more perl-framework traces for the ocsp failure on travis.

Let's see if mod_dumpio gives more ocsp hints..

Revert r1896758 and r1896746 (travis debug temporaries). [skip ci]

Ignore debug logs when checking segfaults. [skip ci]

ocsp failure debugging, still.

OCSP test should pass now, revert r1896785.

Revert r1896715 and r1896740 to restore OCPS test.

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

3 years ago* Add proposal [skip ci]
Ruediger Pluem [Thu, 13 Jan 2022 10:35:50 +0000 (10:35 +0000)] 
* Add proposal [skip ci]

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

3 years agoPropose pcre2 support for backport
William A. Rowe Jr [Thu, 13 Jan 2022 03:28:31 +0000 (03:28 +0000)] 
Propose pcre2 support for backport

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

3 years agoMerge r1896715, r1896740 from trunk:
Joe Orton [Thu, 6 Jan 2022 09:29:15 +0000 (09:29 +0000)] 
Merge r1896715, r1896740 from trunk:

Temporarily disable the OCSP test.

Try disabling OCSP test before running it (duh).

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

3 years agoFix a typo.
Christophe Jaillet [Sun, 26 Dec 2021 11:10:14 +0000 (11:10 +0000)] 
Fix a typo.
Prefer <code> to <var> when giving the value of a parameter
Add a missing space
Add a missing link

r1896413 in trunk

+ synch with trunk

[skip ci]

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

3 years agoFix a typo and add a missing link to a directive
Christophe Jaillet [Sun, 26 Dec 2021 10:16:52 +0000 (10:16 +0000)] 
Fix a typo and add a missing link to a directive

r1896411 on trunk

[skip ci]

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

3 years agoFix some typo.
Christophe Jaillet [Sun, 26 Dec 2021 09:59:00 +0000 (09:59 +0000)] 
Fix some typo.

Add some missing spaces spotted here and there to better comply with coding style.

mod_md is CTR.
r1896409 on trunk

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

3 years agoBackport CTR changes for mod_tls and /test/*
Christophe Jaillet [Sat, 25 Dec 2021 19:14:30 +0000 (19:14 +0000)] 
Backport CTR changes for mod_tls and /test/*

This is only typo fixes.

r1896386 + r1896393 in trunk

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

3 years agoFix typos in CHANGES
Christophe Jaillet [Sat, 25 Dec 2021 13:42:49 +0000 (13:42 +0000)] 
Fix typos in CHANGES

[skip ci]

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

3 years agoRebuild doc
Christophe Jaillet [Sat, 25 Dec 2021 09:14:26 +0000 (09:14 +0000)] 
Rebuild doc

[skip ci]

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

3 years agoImprove mod_tls documentation layout
Christophe Jaillet [Sat, 25 Dec 2021 09:12:00 +0000 (09:12 +0000)] 
Improve mod_tls documentation layout

Merge 18963721896373189637418963771896378 from trunk

[skip ci]

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

3 years agoAdd a few missing hyper links and use <em> for parameters that need to be replaced...
Christophe Jaillet [Fri, 24 Dec 2021 15:04:55 +0000 (15:04 +0000)] 
Add a few missing hyper links and use <em> for parameters that need to be replaced with actual values

r1896363 in trunk

[skip ci]

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

3 years agoCredits [skip ci]
Yann Ylavic [Tue, 21 Dec 2021 18:23:10 +0000 (18:23 +0000)] 
Credits [skip ci]

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

3 years agoRestore a 2.4.30 CHANGES entry unintentionally axed by r1824866 [skip ci].
Yann Ylavic [Tue, 21 Dec 2021 17:01:27 +0000 (17:01 +0000)] 
Restore a 2.4.30 CHANGES entry unintentionally axed by r1824866 [skip ci].

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

3 years agopublishing release httpd-2.4.52
Stefan Eissing [Mon, 20 Dec 2021 09:44:06 +0000 (09:44 +0000)] 
publishing release httpd-2.4.52

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

3 years agofr doc rebuild.
Lucien Gentis [Sat, 18 Dec 2021 14:54:26 +0000 (14:54 +0000)] 
fr doc rebuild.

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

3 years agofr doc XML file update.
Lucien Gentis [Sat, 18 Dec 2021 14:53:39 +0000 (14:53 +0000)] 
fr doc XML file update.

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

3 years agofr doc rebuild.
Lucien Gentis [Sat, 18 Dec 2021 12:13:24 +0000 (12:13 +0000)] 
fr doc rebuild.

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

3 years agofr doc XML file update.
Lucien Gentis [Sat, 18 Dec 2021 12:12:12 +0000 (12:12 +0000)] 
fr doc XML file update.

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

3 years agoAdd some installation information, if it can help s.o.
Christophe Jaillet [Sat, 18 Dec 2021 11:28:31 +0000 (11:28 +0000)] 
Add some installation information, if it can help s.o.

[skip ci]

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

3 years agoAdd a compatibility note for MDExternalAccountBinding
Christophe Jaillet [Fri, 17 Dec 2021 19:59:32 +0000 (19:59 +0000)] 
Add a compatibility note for MDExternalAccountBinding
(r1896105 in trunk)

+ backport part of r1890574 to fix some typo
+ backport r1874331 to s/https:/TLS/

[skip ci]

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

3 years agoTweak CHANGES wording on autoconf fix and credit jfclere. [skip ci]
Joe Orton [Fri, 17 Dec 2021 09:52:08 +0000 (09:52 +0000)] 
Tweak CHANGES wording on autoconf fix and credit jfclere. [skip ci]

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

3 years agoSync docs [skip ci].
Yann Ylavic [Thu, 16 Dec 2021 15:10:18 +0000 (15:10 +0000)] 
Sync docs [skip ci].

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

3 years agoMerge r1896062 from trunk: [skip ci]
Yann Ylavic [Thu, 16 Dec 2021 15:08:41 +0000 (15:08 +0000)] 
Merge r1896062 from trunk: [skip ci]

Improve ProxyPass mapping= docs.

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

3 years agodocs update. convenience.map now generated in utf-8.
Stefan Eissing [Thu, 16 Dec 2021 13:44:25 +0000 (13:44 +0000)] 
docs update. convenience.map now generated in utf-8.

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

3 years agoMerge r1896048 from trunk: [skip ci]
Yann Ylavic [Thu, 16 Dec 2021 12:26:46 +0000 (12:26 +0000)] 
Merge r1896048 from trunk: [skip ci]

docs/mod_proxy.xml: syntax.

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

3 years agocleanup after backport. [skip ci]
Stefan Eissing [Thu, 16 Dec 2021 11:24:32 +0000 (11:24 +0000)] 
cleanup after backport. [skip ci]

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

3 years agoMerge of r1895981,r1895986 from trunk:
Stefan Eissing [Thu, 16 Dec 2021 11:23:49 +0000 (11:23 +0000)] 
Merge of r1895981,r1895986 from trunk:

  *) mod_proxy: Don't prevent forwarding URIs w/ no hostname.
                (fix for r1895955 already in 2.4.x)

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

3 years agovote and promote. [skip ci]
Stefan Eissing [Thu, 16 Dec 2021 11:23:14 +0000 (11:23 +0000)] 
vote and promote. [skip ci]

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

3 years agocleanup after backport. [skip ci]
Stefan Eissing [Thu, 16 Dec 2021 11:16:14 +0000 (11:16 +0000)] 
cleanup after backport. [skip ci]

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

3 years agoMerge r1895970 from trunk:
Stefan Eissing [Thu, 16 Dec 2021 11:15:47 +0000 (11:15 +0000)] 
Merge r1895970 from trunk:

  *) mod_lua: Improve error handling

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

3 years agovote and promote. [skip ci]
Stefan Eissing [Thu, 16 Dec 2021 11:09:40 +0000 (11:09 +0000)] 
vote and promote. [skip ci]

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

3 years agoMerge r1895973 from trunk: (CTR for Travis changes)
Joe Orton [Thu, 16 Dec 2021 09:25:18 +0000 (09:25 +0000)] 
Merge r1895973 from trunk: (CTR for Travis changes)

Test against OpenSSL 3.0.1.

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

3 years ago* Vote [skip ci]
Ruediger Pluem [Thu, 16 Dec 2021 08:02:26 +0000 (08:02 +0000)] 
* Vote [skip ci]

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

3 years ago* Propose. Yann let me know to add him to +1 [skip ci]
Ruediger Pluem [Wed, 15 Dec 2021 14:51:14 +0000 (14:51 +0000)] 
* Propose. Yann let me know to add him to +1 [skip ci]

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

3 years agoMove to SHOWSTOPPERS (-1 ongoing in current 2.4.x code) [skip ci]
Yann Ylavic [Wed, 15 Dec 2021 14:01:03 +0000 (14:01 +0000)] 
Move to SHOWSTOPPERS (-1 ongoing in current 2.4.x code) [skip ci]

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

3 years agoPropose [skip ci]
Yann Ylavic [Wed, 15 Dec 2021 13:53:15 +0000 (13:53 +0000)] 
Propose [skip ci]

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

3 years ago *) test: adding building of librustls in case TEST_MOD_TLS is set.
Stefan Eissing [Wed, 15 Dec 2021 13:28:17 +0000 (13:28 +0000)] 
 *) test: adding building of librustls in case TEST_MOD_TLS is set.

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

3 years ago *) test: adding and enabling travis tests for modules core, http2, md and tls.
Stefan Eissing [Wed, 15 Dec 2021 10:14:23 +0000 (10:14 +0000)] 
  *) test: adding and enabling travis tests for modules core, http2, md and tls.

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

3 years agoBackported [skip ci]
Yann Ylavic [Tue, 14 Dec 2021 15:38:25 +0000 (15:38 +0000)] 
Backported [skip ci]

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

3 years agoMerge r1895914, r1895921 from trunk:
Yann Ylavic [Tue, 14 Dec 2021 15:35:56 +0000 (15:35 +0000)] 
Merge r1895914, r1895921 from trunk:

  *) http: Enforce that fully qualified uri-paths not to be forward-proxied
     have an http(s) scheme, and that the ones to be forward proxied have a
     hostname, per HTTP specifications.
     trunk patch: http://svn.apache.org/r1895914
                  http://svn.apache.org/r1895921
     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/286.patch
     backport PR: https://github.com/apache/httpd/pull/286
     +1: ylavic, minfrin, gbechis

mod_proxy: Detect unix: scheme syntax errors at load time.

* modules/proxy/mod_proxy.c(add_pass, add_member, set_proxy_param,
                            proxysection):
  Check return value of ap_proxy_de_socketfy().

* modules/proxy/proxy_util.c(ap_proxy_get_worker_ex):
  Check return value of ap_proxy_de_socketfy().

http: Enforce that fully qualified uri-paths not to be forward-proxied
      have an http(s) scheme, and that the ones to be forward proxied have a
      hostname, per HTTP specifications.

The early checks avoid failing the request later on and thus save cycles
for those invalid cases.

Submitted by: ylavic
Reviewed by: ylavic, minfrin, gbechis
Closes #286

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

3 years agoPromote [skip ci]
Yann Ylavic [Tue, 14 Dec 2021 15:26:04 +0000 (15:26 +0000)] 
Promote [skip ci]

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

3 years agovote [skip ci]
Giovanni Bechis [Tue, 14 Dec 2021 14:48:35 +0000 (14:48 +0000)] 
vote [skip ci]

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

3 years agoVote.
Graham Leggett [Tue, 14 Dec 2021 12:37:06 +0000 (12:37 +0000)] 
Vote.

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

3 years ago *) test: added modules/core test cases from trunk.
Stefan Eissing [Tue, 14 Dec 2021 11:41:12 +0000 (11:41 +0000)] 
  *) test: added modules/core test cases from trunk.

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

3 years ago *) test: adding modules/tls test cases from trunk.
Stefan Eissing [Tue, 14 Dec 2021 11:40:07 +0000 (11:40 +0000)] 
  *) test: adding modules/tls test cases from trunk.

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

3 years ago *) test: adding modules/md test suite
Stefan Eissing [Tue, 14 Dec 2021 11:33:27 +0000 (11:33 +0000)] 
  *) test: adding modules/md test suite

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

3 years ago *) test: ignoring generated config.ini
Stefan Eissing [Tue, 14 Dec 2021 11:27:39 +0000 (11:27 +0000)] 
  *) test: ignoring generated config.ini

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

3 years ago * test: updated pytest test/modules/http2 suite from trunk
Stefan Eissing [Tue, 14 Dec 2021 11:26:52 +0000 (11:26 +0000)] 
  * test: updated pytest test/modules/http2 suite from trunk
    with skips for cases where backports have not been done.

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

3 years agoupdate after backport. [skip ci]
Stefan Eissing [Tue, 14 Dec 2021 09:58:50 +0000 (09:58 +0000)] 
update after backport. [skip ci]

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

3 years agoMerge r1889494,r1892563,r1892917 from trunk:
Stefan Eissing [Tue, 14 Dec 2021 09:58:22 +0000 (09:58 +0000)] 
Merge r1889494,r1892563,r1892917 from trunk:

     - mod_proxy_balancer: add missing spaces in HTML output
     - mod_proxy_http: Avoid a double call to apr_table_get()
     - mod_ssl: Fix some typo and doxygen issues
     [Jean-Frederic Clere]

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

3 years agovote and promote. [skip ci]
Stefan Eissing [Tue, 14 Dec 2021 09:57:08 +0000 (09:57 +0000)] 
vote and promote. [skip ci]

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

3 years agoUpdate mergeinfo after latest backports [skip ci]
Yann Ylavic [Tue, 14 Dec 2021 00:35:53 +0000 (00:35 +0000)] 
Update mergeinfo after latest backports [skip ci]

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

3 years agoPropose, vote [skip ci]
Yann Ylavic [Tue, 14 Dec 2021 00:18:05 +0000 (00:18 +0000)] 
Propose, vote [skip ci]

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

3 years agoUpdate proposal.
Christophe Jaillet [Mon, 13 Dec 2021 20:44:43 +0000 (20:44 +0000)] 
Update proposal.

Note for me: always try building before submitting. It is not because a
patch looks trivial and applies cleanly, that it builds  :(

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

3 years agoBackport: 283/head
Graham Leggett [Mon, 13 Dec 2021 19:30:46 +0000 (19:30 +0000)] 
Backport:

  *) OpenSSL autoconf detection improvement
     trunk patch: http://svn.apache.org/r1834497
     2.4.x patch: svn merge -c 1834497 ^/httpd/httpd/trunk .
     +1: jorton, ylavic, minfrin

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

3 years agoVote and promote.
Graham Leggett [Mon, 13 Dec 2021 19:28:14 +0000 (19:28 +0000)] 
Vote and promote.

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

3 years agoMerge r1895787, r1895905 from trunk: [under CTR for Travis changes]
Joe Orton [Mon, 13 Dec 2021 16:46:38 +0000 (16:46 +0000)] 
Merge r1895787, r1895905 from trunk: [under CTR for Travis changes]

Add Travis build job building/testing mod_ssl against OpenSSL 3.

Add Travis job for 2.4.x against OpenSSL 3, using APR 1.7/apr-util 1.6.
Disable TEST_MALLOC (enabled by accident) for OpenSSL 3 / trunk job.
Restrict OpenSSL 3 / apr trunk build to non-2.4.x.

Github: closes #285

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

3 years agoMerge r1890477, r1895895, r1895907 from trunk: [skip ci]
Yann Ylavic [Mon, 13 Dec 2021 16:42:05 +0000 (16:42 +0000)] 
Merge r1890477, r1895895, r1895907 from trunk: [skip ci]

Add mapping = servlet / encoded

Improve docs for ProxyPass mapping= parameter.

Add a note about aliging mapping= with the backend's.

Submitted by: jfclere, ylavic, ylavic

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

3 years agoVote [skip ci]
Yann Ylavic [Mon, 13 Dec 2021 16:34:51 +0000 (16:34 +0000)] 
Vote [skip ci]

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

3 years agoPropose one, defer one. [skip ci]
Joe Orton [Mon, 13 Dec 2021 16:12:13 +0000 (16:12 +0000)] 
Propose one, defer one. [skip ci]

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

3 years agoBackport.
Graham Leggett [Mon, 13 Dec 2021 15:46:50 +0000 (15:46 +0000)] 
Backport.

  *) mod_proxy_connect, mod_proxy: Do not change the status code after we
     already sent it to the client.
     Trunk version of patch:
        https://svn.apache.org/r1895715
     Backport version for 2.4.x of patch:
       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/283.diff
     Can be applied via apply_backport_pr.sh 283
     +1: rpluem, icing, minfrin

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

3 years agoVote and promote.
Graham Leggett [Mon, 13 Dec 2021 15:46:04 +0000 (15:46 +0000)] 
Vote and promote.

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

3 years agoconsolidate CHANGES. [skip ci]
Stefan Eissing [Mon, 13 Dec 2021 15:26:24 +0000 (15:26 +0000)] 
consolidate CHANGES. [skip ci]

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

3 years agovote [skip ci]
Stefan Eissing [Mon, 13 Dec 2021 15:25:33 +0000 (15:25 +0000)] 
vote [skip ci]

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

3 years agocleanup after backport. [skip ci]
Stefan Eissing [Mon, 13 Dec 2021 15:17:32 +0000 (15:17 +0000)] 
cleanup after backport. [skip ci]

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

3 years agoMerge r1895719 from trunk:
Stefan Eissing [Mon, 13 Dec 2021 15:16:55 +0000 (15:16 +0000)] 
Merge r1895719 from trunk:

  *) mod_http: Correctly sent a 100 Continue status code when sending an interim
     response as result of an Expect: 100-Continue in the request and not the
     current status code of the request. PR 65725 [Ruediger Pluem]

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

3 years agovote and promote. [skip ci]
Stefan Eissing [Mon, 13 Dec 2021 15:13:00 +0000 (15:13 +0000)] 
vote and promote. [skip ci]

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

3 years agocleanup after backport [skip ci]
Stefan Eissing [Mon, 13 Dec 2021 15:03:39 +0000 (15:03 +0000)] 
cleanup after backport [skip ci]

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

3 years agoMerge r1879889,r1879889,r1893644 from trunk:
Stefan Eissing [Mon, 13 Dec 2021 15:02:44 +0000 (15:02 +0000)] 
Merge r1879889,r1879889,r1893644 from trunk:

  *) mod_dav: Some DAV extensions, like CalDAV, specify both document
     elements and property elements that need to be taken into account
     when generating a property. The document element and property element
     are made available in the dav_liveprop_elem structure by calling
     dav_get_liveprop_element(). [Graham Leggett]

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

3 years agoMerge r1877122, r1879827 from trunk:
Joe Orton [Mon, 13 Dec 2021 15:01:53 +0000 (15:01 +0000)] 
Merge r1877122, r1879827 from trunk:

Travis docs updates.

Test VPATH build in Travis, update docs.

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

3 years agovote and promote [skip ci]
Stefan Eissing [Mon, 13 Dec 2021 15:01:43 +0000 (15:01 +0000)] 
vote and promote [skip ci]

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

3 years agocorrection of patch message (not content) I backported. I am stupid. [skip ci]
Stefan Eissing [Mon, 13 Dec 2021 14:46:33 +0000 (14:46 +0000)] 
correction of patch message (not content) I backported. I am stupid. [skip ci]

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

3 years agobackport cleanup [skip ci]
Stefan Eissing [Mon, 13 Dec 2021 14:44:11 +0000 (14:44 +0000)] 
backport cleanup [skip ci]

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

3 years agoMerged r1879889,r1893643,r1893644 from trunk:
Stefan Eissing [Mon, 13 Dec 2021 14:43:38 +0000 (14:43 +0000)] 
Merged r1879889,r1893643,r1893644 from trunk:

  *) mod_dav: Add utility functions dav_validate_root_ns(),
     dav_find_child_ns(), dav_find_next_ns(), dav_find_attr_ns() and
     dav_find_attr() so that other modules get to play too.
     [Graham Leggett]

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

3 years agovote and promote. [skip ci]
Stefan Eissing [Mon, 13 Dec 2021 14:36:27 +0000 (14:36 +0000)] 
vote and promote. [skip ci]

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

3 years agoFix merge error in r1895876.
Joe Orton [Mon, 13 Dec 2021 14:29:41 +0000 (14:29 +0000)] 
Fix merge error in r1895876.

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

3 years ago* Propose [skip ci]
Ruediger Pluem [Mon, 13 Dec 2021 13:08:45 +0000 (13:08 +0000)] 
* Propose [skip ci]

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

3 years ago* Vote [skip ci]
Ruediger Pluem [Mon, 13 Dec 2021 12:30:39 +0000 (12:30 +0000)] 
* Vote [skip ci]

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

3 years agoMerge r1891138 from trunk: (ci part)
Joe Orton [Mon, 13 Dec 2021 12:08:26 +0000 (12:08 +0000)] 
Merge r1891138 from trunk: (ci part)

* test/travis_run_linux.sh: For TEST_SSL, test loading encrypted
  private keys.

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

3 years agoPropose [skip ci]
Yann Ylavic [Mon, 13 Dec 2021 11:22:10 +0000 (11:22 +0000)] 
Propose [skip ci]

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

3 years agoUpdate credit for OpenSSL 3 patches. [skip ci]
Joe Orton [Mon, 13 Dec 2021 11:09:05 +0000 (11:09 +0000)] 
Update credit for OpenSSL 3 patches. [skip ci]

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

3 years agoAdd a note.
Graham Leggett [Mon, 13 Dec 2021 10:51:00 +0000 (10:51 +0000)] 
Add a note.

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

3 years agoBackport:
Graham Leggett [Mon, 13 Dec 2021 10:43:53 +0000 (10:43 +0000)] 
Backport:

  *) mpm_event: Restart stopping of idle children after a load peak. PR 65626.
     trunk patch: http://svn.apache.org/r1894285
                  http://svn.apache.org/r1894286
                  http://svn.apache.org/r1894291
                  http://svn.apache.org/r1895550
                  http://svn.apache.org/r1895553
                  http://svn.apache.org/r1895630
     backport PR: https://github.com/apache/httpd/pull/276
     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/276.patch
     +1: ylavic, rpluem, minfrin
     ylavic: updated with r1894291 for correctness of perform_idle_server_maintenance()
             w.r.t. num_buckets > 1 and ease merging of r1895553, with r1895550 for
             correctness of active_daemons used in r1895553 and r1895630.

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

3 years agoVote and promote.
Graham Leggett [Mon, 13 Dec 2021 10:42:56 +0000 (10:42 +0000)] 
Vote and promote.

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

3 years agoBackport:
Graham Leggett [Mon, 13 Dec 2021 10:33:48 +0000 (10:33 +0000)] 
Backport:

  *) mod_http2: fixes PR65731 and https://github.com/icing/mod_h2/issues/212
     trunk patch: na, fixed on 2.4.x source base
     backport PR: https://github.com/apache/httpd/pull/281
     +1: icing, minfrin, ylavic

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

3 years agoBackport.
Graham Leggett [Mon, 13 Dec 2021 10:27:03 +0000 (10:27 +0000)] 
Backport.

  *) mod_ssl: Updates to support OpenSSL 3.x
     trunk patch: https://svn.apache.org/r1519264
                  https://svn.apache.org/r1737657
                  https://svn.apache.org/r1876934
                  https://svn.apache.org/r1876936
                  https://svn.apache.org/r1876938
                  https://svn.apache.org/r1890067
                  https://svn.apache.org/r1890076
                  https://svn.apache.org/r1891138
                  https://svn.apache.org/r1893876
                  https://svn.apache.org/r1893964
                  https://svn.apache.org/r1894716
                  https://svn.apache.org/r1895774
     backport PR: https://github.com/apache/httpd/pull/258
     2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/258.patch
                  or https://people.apache.org/~jorton/mod_ssl-openssl3.patch
     +1: jorton, minfrin, ylavic

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

3 years ago* Vote and comment [skip ci]
Ruediger Pluem [Mon, 13 Dec 2021 10:05:16 +0000 (10:05 +0000)] 
* Vote and comment [skip ci]

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

3 years agoEasy proposals to synch a little trunk and 2.4.x
Christophe Jaillet [Mon, 13 Dec 2021 06:30:37 +0000 (06:30 +0000)] 
Easy proposals to synch a little trunk and 2.4.x

[skip ci]

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

3 years agoVote [skip ci]
Yann Ylavic [Sat, 11 Dec 2021 13:10:49 +0000 (13:10 +0000)] 
Vote [skip ci]

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

3 years agoVote, promote [skip ci].
Yann Ylavic [Sat, 11 Dec 2021 12:58:58 +0000 (12:58 +0000)] 
Vote, promote [skip ci].

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

3 years agoRevert r1895807 [skip ci].
Yann Ylavic [Sat, 11 Dec 2021 12:57:53 +0000 (12:57 +0000)] 
Revert r1895807 [skip ci].

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

3 years agoVote, promote [skip ci].
Yann Ylavic [Sat, 11 Dec 2021 12:56:14 +0000 (12:56 +0000)] 
Vote, promote [skip ci].

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

3 years agoWithdraw stale proposal. Replacement patches have solved same problem
Graham Leggett [Fri, 10 Dec 2021 16:05:24 +0000 (16:05 +0000)] 
Withdraw stale proposal. Replacement patches have solved same problem
in a way that could be backported.

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

3 years agoUse jorton's more comprehensive patch set, vote.
Graham Leggett [Fri, 10 Dec 2021 16:03:58 +0000 (16:03 +0000)] 
Use jorton's more comprehensive patch set, vote.

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

3 years agoPropose PR258. [skip ci]
Joe Orton [Fri, 10 Dec 2021 15:12:33 +0000 (15:12 +0000)] 
Propose PR258. [skip ci]

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

3 years agoUpdate mmn in proposal.
Graham Leggett [Fri, 10 Dec 2021 14:03:58 +0000 (14:03 +0000)] 
Update mmn in proposal.

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

3 years ago * documentation: adding mod_tls to the RTC areas
Stefan Eissing [Fri, 10 Dec 2021 14:02:35 +0000 (14:02 +0000)] 
 * documentation: adding mod_tls to the RTC areas
[skip ci]

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

3 years ago *) mod_tls: added mod_tls from abetterinternet, donated
Stefan Eissing [Fri, 10 Dec 2021 13:59:10 +0000 (13:59 +0000)] 
  *) mod_tls: added mod_tls from abetterinternet, donated
     by ISRG/Prossimo <https://github.com/abetterinternet/mod_tls>.
     - adds font-/backend TLS (v1.2/v1.3) via the Rust rustls crate
       and its rustls-ffi C binding <https://github.com/rustls/rustls-ffi>.
     - documentation at <https://github.com/abetterinternet/mod_tls>
       (adding to Apache's manual TBD)
     - build support for Apache httpd configure on *nix platforms,
       rustls is linked statically into mod_tls.

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