]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
4 years agopropose [skip ci]
Eric Covener [Tue, 10 Aug 2021 18:54:53 +0000 (18:54 +0000)] 
propose [skip ci]

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

4 years agoupdate (fix) my back port proposal) [skip ci]
Jean-Frederic Clere [Tue, 10 Aug 2021 09:40:53 +0000 (09:40 +0000)] 
update (fix) my back port proposal) [skip ci]

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

4 years agoupdate after merges. [skip ci]
Stefan Eissing [Tue, 10 Aug 2021 09:00:15 +0000 (09:00 +0000)] 
update after merges. [skip ci]

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

4 years agoMerge of 1892038,1892063 from trunk:
Stefan Eissing [Tue, 10 Aug 2021 08:59:48 +0000 (08:59 +0000)] 
Merge of 1892038,1892063 from trunk:

  *) core: avoid signed integer overflow under fuzzing in
     ap_timeout_parameter_parse

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

4 years agovote [skip ci]
Stefan Eissing [Tue, 10 Aug 2021 08:59:17 +0000 (08:59 +0000)] 
vote [skip ci]

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

4 years agoMerged r1892012 from trunk:
Stefan Eissing [Tue, 10 Aug 2021 08:55:54 +0000 (08:55 +0000)] 
Merged r1892012 from trunk:

  *) core: fix ap_escape_quotes for pre-escaped quotes

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

4 years agovote [skip ci]
Stefan Eissing [Tue, 10 Aug 2021 08:54:55 +0000 (08:54 +0000)] 
vote [skip ci]

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

4 years agomoving accepted patch into other section
Stefan Eissing [Tue, 10 Aug 2021 08:51:33 +0000 (08:51 +0000)] 
moving accepted patch into other section

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

4 years agoupdate after merge [skip ci]
Stefan Eissing [Tue, 10 Aug 2021 08:43:32 +0000 (08:43 +0000)] 
update after merge [skip ci]

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

4 years agoMerged r1891919 from trunk:
Stefan Eissing [Tue, 10 Aug 2021 08:43:11 +0000 (08:43 +0000)] 
Merged r1891919 from trunk:

  *) core: add hook child_stopping hook that gets called when the MPM is stopping a
     child process. The additional graceful parameter allows registered hooks
     to free resources early during a graceful shutdown.

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

4 years agoupdate after merge [skip ci]
Stefan Eissing [Tue, 10 Aug 2021 08:32:57 +0000 (08:32 +0000)] 
update after merge [skip ci]

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

4 years ago *) mod_proxy: Fix icomplete initialization of BalancerMember(s) from the
Stefan Eissing [Tue, 10 Aug 2021 08:32:35 +0000 (08:32 +0000)] 
  *) mod_proxy: Fix icomplete initialization of BalancerMember(s) from the
                balancer-manager, which can lead to a crash.

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

4 years agoupdate after backport [skip ci]
Stefan Eissing [Tue, 10 Aug 2021 08:27:47 +0000 (08:27 +0000)] 
update after backport [skip ci]

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

4 years agoMerged /httpd/httpd/trunk:r1879074-1879080,1879094-1879095,1879110-1879112,1879114...
Stefan Eissing [Tue, 10 Aug 2021 08:27:18 +0000 (08:27 +0000)] 
Merged /httpd/httpd/trunk:r1879074-1879080,1879094-1879095,1879110-1879112,1879114,1879116-1879117,1879137,1879144-1879145,1879147,1879149,1879235,1879360

back port the mapping=servlet proxy logic.

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

4 years agoupdate after merge [skip ci]
Stefan Eissing [Tue, 10 Aug 2021 08:08:54 +0000 (08:08 +0000)] 
update after merge [skip ci]

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

4 years agoMerge of 1891716-1891719,1891721,1891724,1891726-1891728 from trunk:
Stefan Eissing [Tue, 10 Aug 2021 08:08:12 +0000 (08:08 +0000)] 
Merge of 1891716-1891719,1891721,1891724,1891726-1891728 from trunk:

  *) mpm_event: Fix graceful stop/restart of children processes if connections
     are in lingering close for too long.  [Yann Ylavic]

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

4 years agoadd a revision from review [skip ci]
Eric Covener [Sat, 7 Aug 2021 10:43:50 +0000 (10:43 +0000)] 
add a revision from review [skip ci]

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

4 years agovotes
Jim Jagielski [Fri, 6 Aug 2021 14:06:11 +0000 (14:06 +0000)] 
votes

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

4 years agopropose [skip ci]
Eric Covener [Fri, 6 Aug 2021 13:12:21 +0000 (13:12 +0000)] 
propose [skip ci]

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

4 years agovote [skip ci]
Eric Covener [Wed, 4 Aug 2021 11:52:52 +0000 (11:52 +0000)] 
vote [skip ci]

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

4 years agopropose
Eric Covener [Wed, 4 Aug 2021 11:50:08 +0000 (11:50 +0000)] 
propose
[skip ci]

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

4 years agofeedback [skip ci]
Stefan Eissing [Sat, 31 Jul 2021 14:18:18 +0000 (14:18 +0000)] 
feedback [skip ci]

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

4 years agovote and promote. [skip ci]
Stefan Eissing [Sat, 31 Jul 2021 14:17:04 +0000 (14:17 +0000)] 
vote and promote. [skip ci]

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

4 years agovote. [skip ci]
Stefan Eissing [Sat, 31 Jul 2021 14:15:21 +0000 (14:15 +0000)] 
vote. [skip ci]

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

4 years agoBackport proposal for core hook child_stopping. [skip ci]
Stefan Eissing [Sat, 31 Jul 2021 13:56:49 +0000 (13:56 +0000)] 
Backport proposal for core hook child_stopping. [skip ci]

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

4 years agoEasy proposals
Christophe Jaillet [Wed, 28 Jul 2021 15:31:35 +0000 (15:31 +0000)] 
Easy proposals

[skip ci]

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

4 years agocorrect a proposal and vote another one [skip ci]
Jean-Frederic Clere [Mon, 26 Jul 2021 13:58:44 +0000 (13:58 +0000)] 
correct a proposal and vote another one [skip ci]

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

4 years agoReview note. [skip ci]
Joe Orton [Mon, 26 Jul 2021 11:57:10 +0000 (11:57 +0000)] 
Review note. [skip ci]

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

4 years agoUpdate patch command too [skip ci]
Yann Ylavic [Thu, 22 Jul 2021 21:23:00 +0000 (21:23 +0000)] 
Update patch command too [skip ci]

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

4 years agoAdd missing commit into 2.4.x-bz_65419+65429-v2.patch [skip ci]
Yann Ylavic [Thu, 22 Jul 2021 21:12:13 +0000 (21:12 +0000)] 
Add missing commit into 2.4.x-bz_65419+65429-v2.patch [skip ci]

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

4 years agoCHANGES entries now included in the patches [skip ci]
Yann Ylavic [Thu, 22 Jul 2021 18:40:46 +0000 (18:40 +0000)] 
CHANGES entries now included in the patches [skip ci]

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

4 years agoVote [skip ci].
Yann Ylavic [Thu, 22 Jul 2021 18:25:17 +0000 (18:25 +0000)] 
Vote [skip ci].

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

4 years agoPropose fix for PRs 65419 and 65429. [skip ci]
Yann Ylavic [Thu, 22 Jul 2021 18:16:52 +0000 (18:16 +0000)] 
Propose fix for PRs 65419 and 65429.  [skip ci]

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

4 years agoUpdate CHANGES [skip ci].
Yann Ylavic [Thu, 22 Jul 2021 17:38:27 +0000 (17:38 +0000)] 
Update CHANGES [skip ci].

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

4 years agoPropose [skip ci].
Yann Ylavic [Thu, 22 Jul 2021 17:35:21 +0000 (17:35 +0000)] 
Propose [skip ci].

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

4 years agoTrigger ci.
Yann Ylavic [Tue, 20 Jul 2021 16:33:59 +0000 (16:33 +0000)] 
Trigger ci.

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

4 years agoMerge r1891496 from trunk:
Ruediger Pluem [Tue, 20 Jul 2021 15:04:30 +0000 (15:04 +0000)] 
Merge r1891496 from trunk:

* Get a full backtrace
Submitted by: rpluem
Reviewed by: rpluem (CTR)

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

4 years agoMerged /httpd/httpd/trunk:r1891683
Stefan Eissing [Tue, 20 Jul 2021 13:07:54 +0000 (13:07 +0000)] 
Merged /httpd/httpd/trunk:r1891683

  *) mod_md:
     - Domain names in `<MDomain ...>` can now appear in quoted form.
     - Fixed a failure in ACME challenge selection that aborted further searches
       when the tls-alpn-01 method did not seem to be suitable.
     - Changed the tls-alpn-01 setup to only become unsuitable when none of the
       dns names showed support for a configured 'Protocols ... acme-tls/1'. This
       allows use of tls-alpn-01 for dns names that are not mapped to a VirtualHost.

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

4 years agoMerge: /httpd/httpd/trunk:r1891470
Stefan Eissing [Mon, 12 Jul 2021 08:04:51 +0000 (08:04 +0000)] 
Merge: /httpd/httpd/trunk:r1891470

  *) mod_md: fixed a potential null pointer dereference if ACME/OCSP
     server returned 2xx responses without content type. Reported by chuangwen.

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

4 years agos/freenode/libera/
Rich Bowen [Fri, 9 Jul 2021 12:37:26 +0000 (12:37 +0000)] 
s/freenode/libera/

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

4 years agos/Freenode/Libera.chat/
Rich Bowen [Fri, 9 Jul 2021 12:26:10 +0000 (12:26 +0000)] 
s/Freenode/Libera.chat/

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

4 years agoMerged*1. [skip ci]
Joe Orton [Thu, 8 Jul 2021 07:05:04 +0000 (07:05 +0000)] 
Merged*1. [skip ci]

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

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