]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
3 years agoMerge r1897325, r1897326, r1897329, r1898255 from trunk
Christophe Jaillet [Thu, 24 Feb 2022 20:43:21 +0000 (20:43 +0000)] 
Merge r1897325, r1897326, r1897329, r1898255 from trunk

APR and APU must be at least 1.3 to be able to configure and build httpd 2.4.x.
So remove some osbolete #if in the source code.
   - mod_socache_memcache
   - mod_authn_dbd
   - mod_log_config
   - mod_proxy_ftp and proxy-util

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

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

3 years agoRemove backported entry
Christophe Jaillet [Thu, 24 Feb 2022 20:37:55 +0000 (20:37 +0000)] 
Remove backported entry

[skip ci]

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

3 years agoMerge r1881379, r1892422, r1893011, r1897270, r1897271 from trunk
Christophe Jaillet [Thu, 24 Feb 2022 20:37:08 +0000 (20:37 +0000)] 
Merge r1881379, r1892422, r1893011, r1897270, r1897271 from trunk

Easy patches: synch 2.4.x and trunk
   - mod_ssl: Fix a few warnings on 64 bits windows compilation
   - ap_escape_quotes(): Remove unneeded checks to improve performance
   - test/time-sem.c: unlock the accept mutex before exiting (error conditions)
   - mod_ext_filter: Fix a spurious -1 used as a APR_SIZE_T_FMT in an error message
   - mod_sed: fix some format string (s/lld/APR_INT64_T_FMT/)

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

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

3 years agoResolves BZ65859 - feature is in trunk but not on 2.4 yet.
Rich Bowen [Wed, 23 Feb 2022 18:12:59 +0000 (18:12 +0000)] 
Resolves BZ65859 - feature is in trunk but not on 2.4 yet.

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

3 years agoResolves BZ65861 - clarify post_config api doc
Rich Bowen [Wed, 23 Feb 2022 14:39:07 +0000 (14:39 +0000)] 
Resolves BZ65861 - clarify post_config api doc

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

3 years ago* Vote and promote [skip ci]
Ruediger Pluem [Wed, 23 Feb 2022 08:10:14 +0000 (08:10 +0000)] 
* Vote and promote [skip ci]

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

3 years ago* Propose [skip ci]
Ruediger Pluem [Wed, 23 Feb 2022 08:01:32 +0000 (08:01 +0000)] 
* Propose [skip ci]

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

3 years agovote PCRE2 [skip ci]
Steffen Land [Tue, 22 Feb 2022 10:33:46 +0000 (10:33 +0000)] 
vote PCRE2 [skip ci]

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

3 years agovotes [skip ci]
Stefan Eissing [Tue, 22 Feb 2022 10:09:38 +0000 (10:09 +0000)] 
votes [skip ci]

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

3 years agoUpdate proposal
Christophe Jaillet [Sun, 20 Feb 2022 15:13:41 +0000 (15:13 +0000)] 
Update proposal

[skip ci]

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

3 years agoPropose
Christophe Jaillet [Sun, 20 Feb 2022 14:52:24 +0000 (14:52 +0000)] 
Propose

[skip ci]

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

3 years agofr doc rebuild.
Lucien Gentis [Sun, 20 Feb 2022 14:05:07 +0000 (14:05 +0000)] 
fr doc rebuild.

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

3 years agoXML file update version number
Lucien Gentis [Sun, 20 Feb 2022 14:03:08 +0000 (14:03 +0000)] 
XML file update version number

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

3 years ago< and > characters replacement by their html entities
Lucien Gentis [Sun, 20 Feb 2022 13:57:13 +0000 (13:57 +0000)] 
< and > characters replacement by their html entities

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

3 years agofr doc rebuild.
Lucien Gentis [Sat, 19 Feb 2022 16:12:53 +0000 (16:12 +0000)] 
fr doc rebuild.

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

3 years agofr doc XML files updates.
Lucien Gentis [Sat, 19 Feb 2022 16:10:50 +0000 (16:10 +0000)] 
fr doc XML files updates.

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

3 years agoEasy proposals to synch with trunk
Christophe Jaillet [Sat, 19 Feb 2022 16:07:03 +0000 (16:07 +0000)] 
Easy proposals to synch with trunk

[skip ci]

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

3 years agoAdd a compatibility note for the 'ldap' function.
Christophe Jaillet [Sat, 19 Feb 2022 13:59:30 +0000 (13:59 +0000)] 
Add a compatibility note for the 'ldap' function.
(r1898219 in trunk)

[skip ci]

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

3 years agoRemove backported entry
Christophe Jaillet [Sat, 19 Feb 2022 13:49:56 +0000 (13:49 +0000)] 
Remove backported entry
[skip ci]

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

3 years agoMerge r1589986, r1589995, r1633528 from trunk
Christophe Jaillet [Sat, 19 Feb 2022 13:47:02 +0000 (13:47 +0000)] 
Merge r1589986, r1589995, r1633528 from trunk

  *) Add the ldap function to the expression API, allowing LDAP filters and
     distinguished names based on expressions to be escaped correctly to
     guard against LDAP injection.

Submitted by: minfrin, minfrin, jailletc36
Reviewed by: minfrin, icing, covener
Backported by: jailletc36

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

3 years agovote/promote
Eric Covener [Fri, 18 Feb 2022 13:14:13 +0000 (13:14 +0000)] 
vote/promote

[skip ci]

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

3 years agovote [skip ci]
Stefan Eissing [Fri, 18 Feb 2022 10:12:20 +0000 (10:12 +0000)] 
vote [skip ci]

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

3 years agovote [skip ci]
Stefan Eissing [Fri, 18 Feb 2022 09:46:49 +0000 (09:46 +0000)] 
vote [skip ci]

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

3 years agoupdated backport proposal. [skip ci]
Stefan Eissing [Fri, 18 Feb 2022 09:32:26 +0000 (09:32 +0000)] 
updated backport proposal. [skip ci]

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

3 years agore-adding backport proposal for mod_http2 redesign in trunk
Stefan Eissing [Thu, 17 Feb 2022 10:17:00 +0000 (10:17 +0000)] 
re-adding backport proposal for mod_http2 redesign in trunk
and adding fixes r1895724 and r1895614.
[skip ci]

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

3 years agobackport proposal for fix of PR65881.
Stefan Eissing [Thu, 17 Feb 2022 10:09:49 +0000 (10:09 +0000)] 
backport proposal for fix of PR65881.
[skip ci]

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

3 years agoMerge of r1896278 from trunk:
Stefan Eissing [Mon, 14 Feb 2022 16:52:26 +0000 (16:52 +0000)] 
Merge of r1896278 from trunk:

  *) mod_tls: Fix a linkage issue with rustls when compiled
     with rust 1.55, 1.56 or 1.57. This prevents the loading
     of the module because of an undefined symbol: fmaf
     See https://github.com/rustls/rustls-ffi/issues/133
     [Christophe Jaillet]

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

3 years agoMerge r1898068 from trunk:
Stefan Eissing [Mon, 14 Feb 2022 13:55:59 +0000 (13:55 +0000)] 
Merge r1898068 from trunk:

 *) test: capture and parse output from nghttp more reliably.
    add repeat param to certain proxy tests.

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

3 years agofr doc rebuild.
Lucien Gentis [Sat, 12 Feb 2022 16:56:58 +0000 (16:56 +0000)] 
fr doc rebuild.

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

3 years agofr doc XML file update.
Lucien Gentis [Sat, 12 Feb 2022 16:55:21 +0000 (16:55 +0000)] 
fr doc XML file update.

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

3 years agoMerge r1897182, r1897614, r1897615, r1897619 from trunk:
Ruediger Pluem [Wed, 9 Feb 2022 12:29:13 +0000 (12:29 +0000)] 
Merge r1897182, r1897614, r1897615, r1897619 from trunk:

* Allocate the dav_liveprop_elem structure only once in the lifetime of the
  resource->pool and reuse it to avoid unnecessary huge memory allocations
  during collection walks.

* CHANGES entry for r1897182

* Fix typo

* Stupid mine. Evgeny is a committer here

Reviewed by: rpluem, jorton, ylavic

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

3 years ago * mod_md) do not interfere with requests to /.well-known/acme-challenge/
Stefan Eissing [Tue, 8 Feb 2022 12:28:37 +0000 (12:28 +0000)] 
  * mod_md) do not interfere with requests to /.well-known/acme-challenge/
    resources if challenge type 'http-01' is not configured for a domain.
    Fixes <https://github.com/icing/mod_md/issues/279>.

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

3 years agoUpdate proposal [skip ci]
Yann Ylavic [Tue, 8 Feb 2022 11:11:09 +0000 (11:11 +0000)] 
Update proposal [skip ci]

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

3 years agoPropose bumping proxy worker name to 384 chars [skip ci]
Yann Ylavic [Tue, 8 Feb 2022 11:00:49 +0000 (11:00 +0000)] 
Propose bumping proxy worker name to 384 chars [skip ci]

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

3 years agoVote, promote [skip ci]
Yann Ylavic [Tue, 8 Feb 2022 10:50:31 +0000 (10:50 +0000)] 
Vote, promote [skip ci]

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

3 years agoPropose PCRE2 with Thread Local Storage [skip ci]
Yann Ylavic [Tue, 8 Feb 2022 10:49:28 +0000 (10:49 +0000)] 
Propose PCRE2 with Thread Local Storage [skip ci]

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

3 years agoFollow up to r1897849: CHANGES entry. [skip ci]
Yann Ylavic [Tue, 8 Feb 2022 10:19:37 +0000 (10:19 +0000)] 
Follow up to r1897849: CHANGES entry. [skip ci]

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

3 years agofix typo [skip ci]
Stefan Eissing [Tue, 8 Feb 2022 10:08:40 +0000 (10:08 +0000)] 
fix typo [skip ci]

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

3 years ago *) test: fixing tls test case for a non-working curl
Stefan Eissing [Tue, 8 Feb 2022 10:02:14 +0000 (10:02 +0000)] 
  *) test: fixing tls test case for a non-working curl
     check on TLSv1.3 support.

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

3 years ago *) mod_md: the status description in MDomain's JSON, exposed in the
Stefan Eissing [Tue, 8 Feb 2022 10:00:21 +0000 (10:00 +0000)] 
  *) mod_md: the status description in MDomain's JSON, exposed in the
     md-status handler (if configure) did sometimes not carry the correct
     message when certificates needed renew.

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

3 years agoMerge of r1897753 from trunk:
Stefan Eissing [Fri, 4 Feb 2022 09:55:10 +0000 (09:55 +0000)] 
Merge of r1897753 from trunk:

  *) mod_http2: remove mention of Cache Digest functionality
     since the draft has been redacted for some time.

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

3 years ago* Vote, comment [skip ci]
Ruediger Pluem [Wed, 2 Feb 2022 07:16:12 +0000 (07:16 +0000)] 
* Vote, comment [skip ci]

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

3 years agoVote, promote [skip ci]
Yann Ylavic [Tue, 1 Feb 2022 00:39:50 +0000 (00:39 +0000)] 
Vote, promote [skip ci]

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

3 years agoVote, [skip ci]
Joe Orton [Mon, 31 Jan 2022 09:12:07 +0000 (09:12 +0000)] 
Vote, [skip ci]

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

3 years ago* Another fix to the changes entry [skip ci]
Ruediger Pluem [Mon, 31 Jan 2022 08:59:25 +0000 (08:59 +0000)] 
* Another fix to the changes entry [skip ci]

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

3 years ago* Add proposal [skip ci]
Ruediger Pluem [Mon, 31 Jan 2022 08:21:36 +0000 (08:21 +0000)] 
* Add proposal [skip ci]

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

3 years agofr doc rebuid.
Lucien Gentis [Sat, 29 Jan 2022 13:33:31 +0000 (13:33 +0000)] 
fr doc rebuid.

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

3 years agofr doc XML file update.
Lucien Gentis [Sat, 29 Jan 2022 13:32:36 +0000 (13:32 +0000)] 
fr doc XML file update.

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

3 years agoFixes ambiguous example, as per https://bz.apache.org/bugzilla/show_bug.cgi?id=63714
Rich Bowen [Mon, 24 Jan 2022 16:36:19 +0000 (16:36 +0000)] 
Fixes ambiguous example, as per https://bz.apache.org/bugzilla/show_bug.cgi?id=63714

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

3 years agofr doc rebuild.
Lucien Gentis [Sat, 22 Jan 2022 13:46:01 +0000 (13:46 +0000)] 
fr doc rebuild.

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

3 years agofr doc XML files updates.
Lucien Gentis [Sat, 22 Jan 2022 13:45:06 +0000 (13:45 +0000)] 
fr doc XML files updates.

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

3 years agoAdd some small comments
Christophe Jaillet [Fri, 21 Jan 2022 18:11:18 +0000 (18:11 +0000)] 
Add some small comments

[skip ci]

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

3 years agoAdds link to bugzilla as requested in https://bz.apache.org/bugzilla/show_bug.cgi...
Rich Bowen [Fri, 21 Jan 2022 16:57:14 +0000 (16:57 +0000)] 
Adds link to bugzilla as requested in  https://bz.apache.org/bugzilla/show_bug.cgi?id=61218

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

3 years agoRemoves link to long-gone website.
Rich Bowen [Fri, 21 Jan 2022 16:03:24 +0000 (16:03 +0000)] 
Removes link to long-gone website.
Fixes https://bz.apache.org/bugzilla/show_bug.cgi?id=65651

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

3 years agoPatch from Vedran Miletić in
Rich Bowen [Fri, 21 Jan 2022 15:24:20 +0000 (15:24 +0000)] 
Patch from Vedran Miletić in
https://bz.apache.org/bugzilla/show_bug.cgi?id=65821  Notes the version
in which MDContactEmail was added.

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

3 years ago* Vote [skip ci]
Ruediger Pluem [Mon, 17 Jan 2022 08:45:21 +0000 (08:45 +0000)] 
* Vote [skip ci]

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

3 years ago* Backported [skip ci]
Ruediger Pluem [Mon, 17 Jan 2022 08:44:42 +0000 (08:44 +0000)] 
* Backported [skip ci]

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

3 years agoMerge r1896505 from trunk:
Ruediger Pluem [Mon, 17 Jan 2022 08:43:50 +0000 (08:43 +0000)] 
Merge r1896505 from trunk:

mpm_event: Fix a possible listener deadlock.  PR 65769.

When the listener starts accepting more connections than the number of workers
already started (due to scheduling), the listening sockets gets disabled (per
AH03269) but nothing was re-enabling them before the end of the connections,
despite the creation of more idle/available workers in the meantime.
In the wost case there is no idle worker when the listener accepts the first
connection thus nothing to wake up the listener blocked in poll() with no
socket, hence a deadlock.

Fix this by waking up the listener when a worker becomes idle and this unblocks
connections_above_limit(). This is also worthwhile when all the workers are
started (fully initialized runtime) since the number of idle workers is a
condition for connections_above_limit() anyway so the sooner the listeners are
re-enabled the better (the other condition is the number of connections which
is unblocked appropriately by decrement_connection_count() already).

Also when a child exists with ps->quiescing == 1 and it's caught by
server_main_loop() before perform_idle_server_maintenance(), active_daemons was
not decrement as needed (including accross restarts), leading to an invalid
active_daemons accounting.

* server/mpm/event/event.c(should_enable_listensocks):
  New helper that returns whether listenning sockets can be poll()ed again.

* server/mpm/event/event.c(decrement_connection_count, listener_thread):
  Use should_enable_listensocks() where previously open-coded.

* server/mpm/event/event.c(worker_thread):
  Wake up the listener when is_idle => 1 and should_enable_listensocks().
  Have a single point of exit when workers_may_exit to make sure that the
  wake always occurs (even when exiting).

* server/mpm/event/event.c(server_main_loop):
  Decrement active_daemons not only when !ps->quiescing but also when
  ps->quiescing == 1, i.e. all the cases not handled by
  perform_idle_server_maintenance() already.

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

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

3 years ago* Promote [skip ci]
Ruediger Pluem [Mon, 17 Jan 2022 08:02:52 +0000 (08:02 +0000)] 
* Promote [skip ci]

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

3 years agoPropose.
Graham Leggett [Sun, 16 Jan 2022 15:29:03 +0000 (15:29 +0000)] 
Propose.

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

3 years agoPropose.
Graham Leggett [Sun, 16 Jan 2022 14:20:23 +0000 (14:20 +0000)] 
Propose.

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

3 years agoPropose.
Graham Leggett [Sun, 16 Jan 2022 13:44:07 +0000 (13:44 +0000)] 
Propose.

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

3 years agoPropose.
Graham Leggett [Sat, 15 Jan 2022 19:40:33 +0000 (19:40 +0000)] 
Propose.

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

3 years agofr doc rebuild.
Lucien Gentis [Sat, 15 Jan 2022 16:33:44 +0000 (16:33 +0000)] 
fr doc rebuild.

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

3 years agofr doc XML files updates.
Lucien Gentis [Sat, 15 Jan 2022 16:32:23 +0000 (16:32 +0000)] 
fr doc XML files updates.

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

3 years agovote [skip ci]
Giovanni Bechis [Thu, 13 Jan 2022 18:18:31 +0000 (18:18 +0000)] 
vote [skip ci]

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

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