]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
4 years agoMerge r1889957 from trunk: [excluding server/mpm/simple changes]
Joe Orton [Thu, 8 Jul 2021 07:04:49 +0000 (07:04 +0000)] 
Merge r1889957 from trunk: [excluding server/mpm/simple changes]

* server/mpm/event/event.c,
  server/mpm/simple/simple_run.c,
  support/htcacheclean.c: Adjust use of APR_RING macros to
  ensure the APR_RING_HEAD is always embedded in a containing
  structure, to avoid warnings with GCC 11.  (apr_ring.h also
  suggests this is best practice)

See also: https://bugzilla.redhat.com/show_bug.cgi?id=1957353
          https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98503
          msgid <814cca2a-1992-3fae-bb0e-c84b3d09b73b@gmail.com>
Github: closes #186
Reviewed by: jorton, minfrin, jfclere

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

4 years agovote. [skip ci]
Jean-Frederic Clere [Thu, 8 Jul 2021 06:23:31 +0000 (06:23 +0000)] 
vote. [skip ci]

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

4 years agobackport for proxy mapping=servlet and balancer_manage [skip ci]
Jean-Frederic Clere [Wed, 7 Jul 2021 06:24:11 +0000 (06:24 +0000)] 
backport for proxy mapping=servlet and balancer_manage [skip ci]

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

4 years agonew proposal put back Referer check. [skip ci]
Jean-Frederic Clere [Tue, 6 Jul 2021 16:27:48 +0000 (16:27 +0000)] 
new proposal put back Referer check. [skip ci]

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

4 years agoTrigger ci.
Yann Ylavic [Tue, 6 Jul 2021 14:02:14 +0000 (14:02 +0000)] 
Trigger ci.

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

4 years agobackport proposal of r1890693+r1890696, improved alpn check [skip ci]
Stefan Eissing [Tue, 6 Jul 2021 12:31:44 +0000 (12:31 +0000)] 
backport proposal of r1890693+r1890696, improved alpn check [skip ci]

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

4 years agobackport proposal of r1890605 [skip ci]
Stefan Eissing [Tue, 6 Jul 2021 12:16:20 +0000 (12:16 +0000)] 
backport proposal of r1890605 [skip ci]

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

4 years agoPropose backports to support WebDAV extensions, like CalDAV and DavACL.
Graham Leggett [Mon, 5 Jul 2021 10:26:05 +0000 (10:26 +0000)] 
Propose backports to support WebDAV extensions, like CalDAV and DavACL.

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

4 years agoVote.
Graham Leggett [Mon, 5 Jul 2021 09:05:52 +0000 (09:05 +0000)] 
Vote.

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

4 years ago *) back port: Add CPING to health check logic - remove hardcoded timeout.
Graham Leggett [Mon, 5 Jul 2021 09:01:27 +0000 (09:01 +0000)] 
  *) back port: Add CPING to health check logic - remove hardcoded timeout.
     Trunk version of patch:
        https://svn.apache.org/r1887439
     Backport version for 2.4.x of patch:
      Trunk version of patch works
      svn merge -c 1887439 ^/httpd/httpd/trunk .
     +1: minfrin, rpluem, covener

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

4 years agoPropose, maybe sometime during the weekend the Travis output will turn up.
Joe Orton [Fri, 2 Jul 2021 14:53:13 +0000 (14:53 +0000)] 
Propose, maybe sometime during the weekend the Travis output will turn up.
[skip ci]

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

4 years agomove proposal to being work [skip ci]
Jean-Frederic Clere [Fri, 2 Jul 2021 08:24:38 +0000 (08:24 +0000)] 
move proposal to being work [skip ci]

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

4 years agovote [skip ci]
Eric Covener [Thu, 1 Jul 2021 18:26:57 +0000 (18:26 +0000)] 
vote [skip ci]

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

4 years agoBump the MMN in the patch.
Graham Leggett [Tue, 22 Jun 2021 11:10:08 +0000 (11:10 +0000)] 
Bump the MMN in the patch.

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

4 years ago* Vote [skip ci]
Ruediger Pluem [Tue, 22 Jun 2021 07:41:08 +0000 (07:41 +0000)] 
* Vote [skip ci]

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

4 years agoPropose.
Graham Leggett [Tue, 22 Jun 2021 07:38:49 +0000 (07:38 +0000)] 
Propose.

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

4 years ago*) back port: Add CPING to health check logic.
Graham Leggett [Mon, 21 Jun 2021 17:03:35 +0000 (17:03 +0000)] 
*) back port: Add CPING to health check logic.
   Trunk version of patch:
        https://svn.apache.org/r1887415
   Backport version for 2.4.x of patch:
      Trunk version of patch works
      svn merge -c 1887415 ^/httpd/httpd/trunk .
   +1: jfclere, jim, minfrin

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

4 years agoVote and promote.
Graham Leggett [Mon, 21 Jun 2021 17:02:13 +0000 (17:02 +0000)] 
Vote and promote.

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

4 years agoComment.
Graham Leggett [Mon, 21 Jun 2021 16:45:25 +0000 (16:45 +0000)] 
Comment.

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

4 years ago(Re)propose (with a working link).
Graham Leggett [Mon, 21 Jun 2021 16:13:12 +0000 (16:13 +0000)] 
(Re)propose (with a working link).

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

4 years agoMerged x1, [skip ci]
Joe Orton [Thu, 10 Jun 2021 09:38:59 +0000 (09:38 +0000)] 
Merged x1, [skip ci]

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

4 years agoMerge r1864784 from trunk:
Joe Orton [Thu, 10 Jun 2021 09:38:40 +0000 (09:38 +0000)] 
Merge r1864784 from trunk:

-l and -L are not exclusive.
Document the 'G' suffix.
Fix some minor style issues.

Submitted by: jailletc36
Reviewed by: jorton, ylavic, jfclere

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

4 years agocast votes
Jim Jagielski [Wed, 9 Jun 2021 15:04:59 +0000 (15:04 +0000)] 
cast votes

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

4 years agopropose*1. [skip ci]
Jean-Frederic Clere [Mon, 7 Jun 2021 16:02:30 +0000 (16:02 +0000)] 
propose*1.  [skip ci]

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

4 years agopropose*1. [skip ci]
Jean-Frederic Clere [Mon, 7 Jun 2021 12:59:02 +0000 (12:59 +0000)] 
propose*1.  [skip ci]

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

4 years agoVote*1. [skip ci]
Jean-Frederic Clere [Mon, 7 Jun 2021 08:55:33 +0000 (08:55 +0000)] 
Vote*1. [skip ci]

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

4 years agofr doc rebuild.
Lucien Gentis [Sat, 5 Jun 2021 15:08:06 +0000 (15:08 +0000)] 
fr doc rebuild.

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

4 years agofr doc XML file update.
Lucien Gentis [Sat, 5 Jun 2021 15:07:15 +0000 (15:07 +0000)] 
fr doc XML file update.

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

4 years agocorrect CVE year
Eric Covener [Thu, 3 Jun 2021 16:55:50 +0000 (16:55 +0000)] 
correct CVE year

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

4 years agoMerge r1890424 from trunk:
Eric Covener [Thu, 3 Jun 2021 12:28:47 +0000 (12:28 +0000)] 
Merge r1890424 from trunk:

PR65073: updates to MergeSlashes related doc

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

4 years agoMerge r1889806 from trunk:
Ruediger Pluem [Wed, 2 Jun 2021 07:11:47 +0000 (07:11 +0000)] 
Merge r1889806 from trunk:

* Correctly record changes for the latest release in case there have been no
  changes at all for this release so far.

Reviewed by: rpluem, jorton, ylavic

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

4 years agoVote, promote. [skip ci]
Yann Ylavic [Tue, 1 Jun 2021 20:47:17 +0000 (20:47 +0000)] 
Vote, promote. [skip ci]

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

4 years agoUpdates for announcement of
Christophe Jaillet [Tue, 1 Jun 2021 20:04:51 +0000 (20:04 +0000)] 
Updates for announcement of

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

4 years agofr doc rebuild.
Lucien Gentis [Sat, 29 May 2021 13:58:51 +0000 (13:58 +0000)] 
fr doc rebuild.

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

4 years agofr doc XML file update (version number update omitted)
Lucien Gentis [Sat, 29 May 2021 13:57:46 +0000 (13:57 +0000)] 
fr doc XML file update (version number update omitted)

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

4 years agofr doc XML file update.
Lucien Gentis [Sat, 29 May 2021 13:53:34 +0000 (13:53 +0000)] 
fr doc XML file update.

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

4 years agoFixed version numbers after revew by cristiophe hawkeye.
Stefan Eissing [Thu, 27 May 2021 14:10:27 +0000 (14:10 +0000)] 
Fixed version numbers after revew by cristiophe hawkeye.

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

4 years agoupdate after backport. [skip ci]
Stefan Eissing [Thu, 27 May 2021 13:08:50 +0000 (13:08 +0000)] 
update after backport. [skip ci]

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

4 years agoMerged r1734009,r1734231,r1734281,r1838055,r1838079,r1840229,r1876664,r1876674,r18767...
Stefan Eissing [Thu, 27 May 2021 13:08:21 +0000 (13:08 +0000)] 
Merged r1734009,r1734231,r1734281,r1838055,r1838079,r1840229,r1876664,r1876674,r1876784,r1879078,r1881620,r1887311,r1888871 from trunk:

  *) core: Split ap_create_request() from ap_read_request(). [Graham Leggett]

  *) core, h2: common ap_parse_request_line() and ap_check_request_header()
     code. [Yann Ylavic]

  *) core: Add StrictHostCheck to allow unconfigured hostnames to be
     rejected. [Eric Covener]

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

4 years agofr doc rebuild.
Lucien Gentis [Sat, 22 May 2021 16:24:10 +0000 (16:24 +0000)] 
fr doc rebuild.

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

4 years agofr doc XML files updates.
Lucien Gentis [Sat, 22 May 2021 16:22:37 +0000 (16:22 +0000)] 
fr doc XML files updates.

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

4 years ago<contextlist> and <compatibility> bad ordering.
Lucien Gentis [Sat, 22 May 2021 16:19:54 +0000 (16:19 +0000)] 
<contextlist> and <compatibility> bad ordering.

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

4 years agoVote*1, propose*1, TBD*1. [skip ci]
Joe Orton [Fri, 21 May 2021 11:18:33 +0000 (11:18 +0000)] 
Vote*1, propose*1, TBD*1. [skip ci]

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

4 years agoMerge /httpd/httpd/trunk:r1890001
Stefan Eissing [Tue, 18 May 2021 13:42:15 +0000 (13:42 +0000)] 
Merge  /httpd/httpd/trunk:r1890001

mod_md: the better libressl fix for unsupported EC key types.

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

4 years agoMerge: /httpd/httpd/trunk:r1889995
Stefan Eissing [Tue, 18 May 2021 12:11:32 +0000 (12:11 +0000)] 
Merge: /httpd/httpd/trunk:r1889995

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

4 years agoFix French vs English date format.
Christophe Jaillet [Mon, 17 May 2021 21:39:50 +0000 (21:39 +0000)] 
Fix French vs English date format.

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

4 years agoPost 2.4.48 tag updates
Christophe Jaillet [Mon, 17 May 2021 21:10:19 +0000 (21:10 +0000)] 
Post 2.4.48 tag updates

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

4 years agoGet ready to tag httpd 2.4.48
Christophe Jaillet [Mon, 17 May 2021 21:10:15 +0000 (21:10 +0000)] 
Get ready to tag httpd 2.4.48

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

4 years ago* Vote and promote [skip ci]
Ruediger Pluem [Mon, 17 May 2021 19:28:30 +0000 (19:28 +0000)] 
* Vote and promote [skip ci]

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

4 years ago* Propose [skip ci]
Ruediger Pluem [Mon, 17 May 2021 14:41:07 +0000 (14:41 +0000)] 
* Propose [skip ci]

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

4 years agoMerge r1889958 from trunk:
Stefan Eissing [Mon, 17 May 2021 12:13:58 +0000 (12:13 +0000)] 
Merge r1889958 from trunk:

mod_md: update documentation regarding private keys and message events.

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

4 years agovote. [skip ci]
Stefan Eissing [Mon, 17 May 2021 08:44:01 +0000 (08:44 +0000)] 
vote. [skip ci]

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

4 years agoAdd other missing commits. [skip ci]
Yann Ylavic [Sun, 16 May 2021 11:34:16 +0000 (11:34 +0000)] 
Add other missing commits. [skip ci]

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

4 years agoAdd missing commit r1888871 to proposal. [skip ci]
Yann Ylavic [Sun, 16 May 2021 11:22:54 +0000 (11:22 +0000)] 
Add missing commit r1888871 to proposal. [skip ci]

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

4 years agoPropose. [skip ci]
Yann Ylavic [Sun, 16 May 2021 10:53:17 +0000 (10:53 +0000)] 
Propose. [skip ci]

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

4 years agoBackported. [skip ci]
Yann Ylavic [Fri, 14 May 2021 19:19:36 +0000 (19:19 +0000)] 
Backported. [skip ci]

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

4 years agoMerge r1889792, r1889795 from trunk:
Yann Ylavic [Fri, 14 May 2021 19:18:52 +0000 (19:18 +0000)] 
Merge r1889792, r1889795 from trunk:

mod_proxy_wstunnel: Add ProxyWebsocketFallbackToProxyHttp.

Allows to opt-out the fallback to mod_proxy_http to handle WebSocket upgrade,
and let mod_proxy_wstunnel handle the requests as in 2.4.46 and earlier.

Update docs.

Follow up to r1889792: CHANGES entry.

Submitted by: ylavic
Reviewed by: ylavic, covener, rpluem

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

4 years agomod_proxy: Fix flushing of THRESHOLD_MIN_WRITE data while tunneling. BZ 65294
Yann Ylavic [Fri, 14 May 2021 19:15:11 +0000 (19:15 +0000)] 
mod_proxy: Fix flushing of THRESHOLD_MIN_WRITE data while tunneling.  BZ 65294

Submitted by: ylavic
Reviewed by: ylavic, covener, rpluem

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

4 years ago* Vote and promote [skip ci]
Ruediger Pluem [Fri, 14 May 2021 19:06:38 +0000 (19:06 +0000)] 
* Vote and promote [skip ci]

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

4 years agoUpdate Win32 command line makefiles for r1889793
Gregg Lewis Smith [Thu, 13 May 2021 20:14:00 +0000 (20:14 +0000)] 
Update Win32 command line makefiles for r1889793

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

4 years agoBackported. [skip ci]
Yann Ylavic [Wed, 12 May 2021 11:21:40 +0000 (11:21 +0000)] 
Backported. [skip ci]

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

4 years agoMerge r1888266 from trunk:
Yann Ylavic [Wed, 12 May 2021 11:21:09 +0000 (11:21 +0000)] 
Merge r1888266 from trunk:

mod_socache_shmcb: be safe from socache_shmcb_destroy() late call.  PR 59798.

ssl_init_Module() in post_config early registers ssl_init_ModuleKill(), which
will then run after all the next cleanups registered later in post_config, thus
any shm_cleanup() registered from ssl_scache_init::socache_shmcb_init().
This can cause a double SHM cleanup when apr_shm_destroy() is called from
ssl_init_ModuleKill::ssl_scache_kill() as pconf is cleared.

Fix this in mod_socache_shmcb by registering a socache_shmcb_cleanup() after
the SHM is created, and by letting socache_shmcb_destroy() run the cleanup,
such that shm_cleanup() is always and ever called only once.

Ideally apr_shm_create() would be consistent accross platforms to register its
shm_cleanup() on the pool but that's not the case for now (I'm on it), so httpd
has to call apr_shm_destroy() explicitely from several places (we'll be able to
remove ssl_scache_kill() and other similar cleanups once the minimal APR
version required by httpd is fixed..).

We could also fix this by registering ssl_init_ModuleKill() late(r) in
ssl_init_Module(), though the more robust mod_socache_shmcb the better for
all the modules..

Reviewed by: ylavic, icing, rpluem

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

4 years agovote, move to showstoppers [skip ci]
Eric Covener [Wed, 12 May 2021 10:41:50 +0000 (10:41 +0000)] 
vote, move to showstoppers [skip ci]

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

4 years agoPropose fix for BZ 65294 and opt-out for wstunnel fallback.
Yann Ylavic [Wed, 12 May 2021 10:38:01 +0000 (10:38 +0000)] 
Propose fix for BZ 65294 and opt-out for wstunnel fallback.

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

4 years agoupdate after backport. [skip ci]
Stefan Eissing [Wed, 12 May 2021 10:15:21 +0000 (10:15 +0000)] 
update after backport. [skip ci]

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

4 years agoMerge of [r1886840, r1887085, r1887087, r1887134, r1887151, r1887152,
Stefan Eissing [Wed, 12 May 2021 10:14:42 +0000 (10:14 +0000)] 
Merge of [r1886840, r1887085, r1887087, r1887134, r1887151, r1887152,
       r1887337, r1887340, r1887342, r1887343, r1887360, r1887364,
       r1887923, r1887965, r1887993, r1888006, r1888083, r1888084,
       r1888723, r1888724, r1888726, r1888729, r1889788] from trunk:

   *) core/mod_ssl/mod_md:
     - adding new ap_ssl_*() functions for a backward
       compatible replacement of the major optional mod_ssl functions. This
       allows other ssl modules to work without impersonating mod_ssl and
       also allows different ssl modules being active on separate ports.
     - latest mod_md with support for multiple certificates per domain
       and ECDSA certificates. Removed ACMEv1 support.
     - Interworking mod_md and ssl modules changed to exchange PEM strings
       instead of file paths for ACME challenges.
     - core/mod_ssl/mod_md: adding OCSP response provisioning as core feature.

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

4 years agoMove a change entry to the right location
Christophe Jaillet [Tue, 11 May 2021 19:21:34 +0000 (19:21 +0000)] 
Move a change entry to the right location

[skip ci]

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

4 years agoMerge r1889341 from trunk:
Ruediger Pluem [Tue, 11 May 2021 15:21:43 +0000 (15:21 +0000)] 
Merge r1889341 from trunk:

* Do not strip any headers from 304 responses.

PR: 61820

Reviewed by: rpluem, covener, ylavic

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

4 years agoUpdate after merge of backport. [skip ci]
Stefan Eissing [Tue, 11 May 2021 13:37:18 +0000 (13:37 +0000)] 
Update after merge of backport. [skip ci]

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

4 years agoMerge r1889119 from trunk:
Stefan Eissing [Tue, 11 May 2021 13:36:45 +0000 (13:36 +0000)] 
Merge r1889119 from trunk:

mod_http2: fix incomplete sync with github and its version number.

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

4 years ago* Vote and promote [skip ci]
Ruediger Pluem [Tue, 11 May 2021 09:50:49 +0000 (09:50 +0000)] 
* Vote and promote [skip ci]

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

4 years agoupdate proposal [skip ci]
Stefan Eissing [Tue, 11 May 2021 08:42:09 +0000 (08:42 +0000)] 
update proposal [skip ci]

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

4 years agoVote, promote [skip ci].
Yann Ylavic [Mon, 10 May 2021 09:55:23 +0000 (09:55 +0000)] 
Vote, promote [skip ci].

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

4 years ago* Promote [skip ci]
Ruediger Pluem [Wed, 5 May 2021 07:36:37 +0000 (07:36 +0000)] 
* Promote [skip ci]

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

4 years ago* Vote [skip ci]
Ruediger Pluem [Wed, 5 May 2021 07:34:58 +0000 (07:34 +0000)] 
* Vote [skip ci]

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

4 years ago* Vote [skip ci]
Ruediger Pluem [Wed, 5 May 2021 07:18:55 +0000 (07:18 +0000)] 
* Vote [skip ci]

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

4 years agovote [skip ci]
Eric Covener [Tue, 4 May 2021 23:58:32 +0000 (23:58 +0000)] 
vote [skip ci]

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

4 years ago* Propose
Ruediger Pluem [Tue, 4 May 2021 09:04:51 +0000 (09:04 +0000)] 
* Propose

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

4 years agoKeep the date of distribution, but not announced, 2.4.47
Christophe Jaillet [Mon, 3 May 2021 19:12:56 +0000 (19:12 +0000)] 
Keep the date of distribution, but not announced, 2.4.47

[skip ci]

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

4 years agoRemove wrong idea (and trigger a travis run)
Christophe Jaillet [Fri, 30 Apr 2021 15:23:32 +0000 (15:23 +0000)] 
Remove wrong idea (and trigger a travis run)

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

4 years agoAdd a note on the PCRE2 backport stalled patches about a potential solution
Christophe Jaillet [Thu, 29 Apr 2021 06:13:33 +0000 (06:13 +0000)] 
Add a note on the PCRE2 backport stalled patches about a potential solution

[skip ci]

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

4 years agoRevert r1889272.
Christophe Jaillet [Wed, 28 Apr 2021 20:33:52 +0000 (20:33 +0000)] 
Revert r1889272.

It will be updated by announce.sh

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

4 years agoUpdate 2.4.47 release date
Christophe Jaillet [Wed, 28 Apr 2021 16:37:58 +0000 (16:37 +0000)] 
Update 2.4.47 release date

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

4 years agofr doc rebuild.
Lucien Gentis [Sat, 24 Apr 2021 14:14:30 +0000 (14:14 +0000)] 
fr doc rebuild.

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

4 years agofr doc XML file update.
Lucien Gentis [Sat, 24 Apr 2021 14:13:18 +0000 (14:13 +0000)] 
fr doc XML file update.

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

4 years agoPropose synch with mod_http2 on github for backport.
Stefan Eissing [Fri, 23 Apr 2021 08:07:11 +0000 (08:07 +0000)] 
Propose synch with mod_http2 on github for backport.
[skip ci]

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

4 years agoFix French vs English
Christophe Jaillet [Thu, 22 Apr 2021 07:08:42 +0000 (07:08 +0000)] 
Fix French vs English

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

4 years agoPost 2.4.47 tag updates
Christophe Jaillet [Thu, 22 Apr 2021 06:43:50 +0000 (06:43 +0000)] 
Post 2.4.47 tag updates

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

4 years agoGet ready to tag httpd 2.4.47
Christophe Jaillet [Thu, 22 Apr 2021 06:43:44 +0000 (06:43 +0000)] 
Get ready to tag httpd 2.4.47

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

4 years agoFix a typo
Christophe Jaillet [Wed, 21 Apr 2021 17:07:53 +0000 (17:07 +0000)] 
Fix a typo

[skip ci]

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

4 years agoAdd a comment on a backport proposal
Christophe Jaillet [Wed, 21 Apr 2021 09:22:11 +0000 (09:22 +0000)] 
Add a comment on a backport proposal

[skip ci]

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

4 years agoremove [skip ci]
Eric Covener [Wed, 21 Apr 2021 01:15:40 +0000 (01:15 +0000)] 
remove [skip ci]

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

4 years agoMerge r1887727 from trunk:
Eric Covener [Wed, 21 Apr 2021 01:15:24 +0000 (01:15 +0000)] 
Merge r1887727 from trunk:

* modules/generators/mod_cgid.c (cgid_server): Register cleanup for
  socket earlier to avoid possible leaks on error paths.  (highlighted
  by Coverity scan)

Reviewed By: ylavic, icing, covener

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

4 years agovote/promote [skip ci]
Eric Covener [Wed, 21 Apr 2021 01:14:12 +0000 (01:14 +0000)] 
vote/promote [skip ci]

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

4 years agoMerge r1889037 from trunk:
Eric Covener [Wed, 21 Apr 2021 01:10:58 +0000 (01:10 +0000)] 
Merge r1889037 from trunk:

Pass NULL instead of a "null ACL"

Submitted By: Ivan Zhakov
Reviewed By: covener, ylavic (by inspection), ivan

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

4 years agoMerge r1889036 from trunk:
Eric Covener [Wed, 21 Apr 2021 01:10:12 +0000 (01:10 +0000)] 
Merge r1889036 from trunk:

legacy default slash-matching behavior w/ 'MergeSlashes OFF'

Submitted By: Ruediger Pluem
Reviewed By: covener, rpluem, ylavic

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

4 years agoVote [skip ci].
Yann Ylavic [Tue, 20 Apr 2021 21:07:31 +0000 (21:07 +0000)] 
Vote [skip ci].

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

4 years agocleanup after backport. [skip ci]
Stefan Eissing [Tue, 20 Apr 2021 14:25:13 +0000 (14:25 +0000)] 
cleanup after backport. [skip ci]

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

4 years agoMerge /httpd/httpd/trunk:r1876619,1876675
Stefan Eissing [Tue, 20 Apr 2021 14:24:31 +0000 (14:24 +0000)] 
Merge /httpd/httpd/trunk:r1876619,1876675

mod_watchdog: Fix incomplete backport in r1888928.

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

4 years agovote [skip ci]
Stefan Eissing [Tue, 20 Apr 2021 14:23:51 +0000 (14:23 +0000)] 
vote [skip ci]

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