]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Joe Orton [Tue, 20 Apr 2021 12:57:42 +0000 (12:57 +0000)]
Merge r1886015 from trunk: (Travis RTC exception)
Update Travis LDAP testing to use a CentOS based container, pulled
from quay.io, to avoid the new Docker hub pull rate-limiting which
is causing intermittent failures.
Submitted by: jorton, Lubos Uhliarik <luhliari redhat.com>
Github: closes #167
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1889011 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 19 Apr 2021 12:55:51 +0000 (12:55 +0000)]
Fix some typos
+ remove ome leading/trailing space to synch with trunk
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888962 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 19 Apr 2021 12:39:45 +0000 (12:39 +0000)]
Fix some typos
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888960 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 19 Apr 2021 12:20:45 +0000 (12:20 +0000)]
Fix a typo
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888957 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 19 Apr 2021 12:17:11 +0000 (12:17 +0000)]
Fix a typo
+ remove trailing space to synhc with trunk
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888956 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 19 Apr 2021 07:59:30 +0000 (07:59 +0000)]
vote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888949 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 19 Apr 2021 07:57:36 +0000 (07:57 +0000)]
Vote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888948 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 19 Apr 2021 07:54:27 +0000 (07:54 +0000)]
Adding experimental mod_md to exception description.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888947 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 19 Apr 2021 07:51:20 +0000 (07:51 +0000)]
Vote, [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888946 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 18 Apr 2021 20:53:22 +0000 (20:53 +0000)]
Propose follow up to r1888928 (showtopper). [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888934 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Apr 2021 19:55:14 +0000 (19:55 +0000)]
make update-changes
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888931 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Apr 2021 19:41:42 +0000 (19:41 +0000)]
Remove backported entries
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888930 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Apr 2021 19:40:13 +0000 (19:40 +0000)]
Merge r1730128, r1878140, r1878265, r1881736, r1882775, r1883872, r1884509, r1887720 from trunk
*) Easy patches: synch 2.4.x and trunk
- doxygen: Correct doxygen groupname
- .gdbinit: align columns
- .gdbinit: fix indentation
- mod_dav: Add specific logs for different modes
- core: ap_pbase64encode(): save double NUL byte allocation and assignment
- core: ap_pbase64decode(): save double NUL byte allocation and assignment
- support: Fix a typo in a comment
- proxy_util.c: Fix leak in error path in the do_malloc case
Submitted by: wrowe, ylavic, ylavic, jorton, rpluem, ylavic, jorton, jorton
Reviewed by: jailletc36, gbechis, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888929 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Apr 2021 19:11:48 +0000 (19:11 +0000)]
Merge (most of) r1876599 from trunk
* Add missing pool tags to help debugging
Submitted by: ylavic
Reviewed by: jailletc36, gbechis, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888928 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Apr 2021 19:09:03 +0000 (19:09 +0000)]
Merge r1887999 from trunk
* modules/http/http_core.c server/protocol.c:
Make sure that conn->keepalive is NOT reset after being set in ap_read_request()
Submitted by: jfclere
Reviewed by: jfclere, covener, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888926 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Apr 2021 19:05:08 +0000 (19:05 +0000)]
Add a change entry
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888924 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Apr 2021 18:59:39 +0000 (18:59 +0000)]
Merge r1826206, r1880678, r1880743, r1880924 from trunk
* mod_lua: Support Lua 5.4 and use pkg-config to detect Lua
properly on Debian systems.
Submitted by: jorton, jorton, gbechis, rpluem
Reviewed by: jorton, gbechis, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888923 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Apr 2021 18:55:43 +0000 (18:55 +0000)]
Merge r1888087 from trunk
* mod_http2: Fixed a race condition that could lead to streams being
aborted (RST to the client), although a response had been produced
Submitted by: icing
Reviewed by: icing, rpluem, covener
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888922 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 18 Apr 2021 17:05:20 +0000 (17:05 +0000)]
Backported. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888918 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 18 Apr 2021 17:04:34 +0000 (17:04 +0000)]
Merge r1882370 from trunk:
Adjust signal handler before unblocking
* server/mpm/event/event.c: Set the new signal handler before unblocking the
signal as otherwise queued signals get delivered to the old handler
immediately when the signal is unblocked.
* server/mpm/worker/worker.c: Same thing as with event.
Submitted by: rpluem
Reviewed by: ylavic, jorton, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888917 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 18 Apr 2021 16:57:19 +0000 (16:57 +0000)]
Vote, promote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888916 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Sun, 18 Apr 2021 13:38:55 +0000 (13:38 +0000)]
vote, fix typo [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888899 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 18 Apr 2021 08:57:41 +0000 (08:57 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888883 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Sun, 18 Apr 2021 08:56:55 +0000 (08:56 +0000)]
update for sync with English docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888882 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Apr 2021 08:05:16 +0000 (08:05 +0000)]
Propose
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888879 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 17 Apr 2021 20:09:08 +0000 (20:09 +0000)]
promote/vote
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888870 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 17 Apr 2021 17:56:59 +0000 (17:56 +0000)]
Propose
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888866 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 13 Apr 2021 07:47:13 +0000 (07:47 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888712 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 12 Apr 2021 08:47:52 +0000 (08:47 +0000)]
propose mod_http2 backport of fix regarding response status on a stream.
[no ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888654 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 2 Apr 2021 12:46:15 +0000 (12:46 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888306 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 2 Apr 2021 12:45:10 +0000 (12:45 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888305 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 26 Mar 2021 16:13:50 +0000 (16:13 +0000)]
Updated backport PR with recent changes, integrated all ap_ssl_*() related
trunk revisions and listed them in the proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888088 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 25 Mar 2021 15:05:13 +0000 (15:05 +0000)]
Back port proposal and vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888064 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 24 Mar 2021 14:38:42 +0000 (14:38 +0000)]
vote
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888014 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 24 Mar 2021 14:33:45 +0000 (14:33 +0000)]
adjust PR number for rebased PR on 2.4.x branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888013 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 24 Mar 2021 14:30:04 +0000 (14:30 +0000)]
Update after backport of mod_http2 change proposal.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888012 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 24 Mar 2021 14:28:49 +0000 (14:28 +0000)]
*) mod_http2: sync with github standalone version 1.15.17
- Log requests and sent the configured error response in case of early detected
errors like too many or too long headers. [Ruediger Pluem]
- new option 'H2OutputBuffering on/off' which controls the buffering of stream output.
The default is on, which is the behaviour of older mod-h2 versions. When off, all
bytes are made available immediately to the main connection for sending them
out to the client. This fixes interop issues with certain flavours of gRPC, see
also <https://github.com/icing/mod_h2/issues/207>.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888011 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 24 Mar 2021 14:10:09 +0000 (14:10 +0000)]
Proposing backport of ap_ssl_* functions and related changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888008 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 24 Mar 2021 13:13:29 +0000 (13:13 +0000)]
Merge r1888004 from trunk:
drive home the purpose of forward-dns
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888005 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 24 Mar 2021 12:52:36 +0000 (12:52 +0000)]
Merge r1888002 from trunk:
pull in forward-dns example from authz_host
lots of people miss it reading the doc for Require in authz_core only
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1888003 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Mar 2021 13:34:22 +0000 (13:34 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887852 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Mar 2021 13:33:31 +0000 (13:33 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887851 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 19 Mar 2021 16:52:59 +0000 (16:52 +0000)]
Vote, [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887815 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 19 Mar 2021 16:38:51 +0000 (16:38 +0000)]
Update Lua proposal, thanks to jailletc36 for catching missing commit.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887814 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 19 Mar 2021 16:12:29 +0000 (16:12 +0000)]
Merge r1880958 from trunk:
Document limitations for private key format in
SSLProxyMachineCertificateFile and
SSLProxyMachineCertificatePath. PR 63935.
Plus, further tweak text to explain failure mode specific to 2.4.
Submitted by: rjung, jorton
Reviewed by: jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887813 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 17 Mar 2021 12:11:08 +0000 (12:11 +0000)]
Propose. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887751 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 14 Mar 2021 16:16:34 +0000 (16:16 +0000)]
Axe modules.apache.org.
It has been off-line for a long time now, and there is no plan to bring it up, AFAIK.
r1887636 on trunk
+ a few changes to synch with trunk
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887638 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 13 Mar 2021 16:24:07 +0000 (16:24 +0000)]
Add a note
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887601 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Mar 2021 10:58:07 +0000 (10:58 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887577 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Mar 2021 10:56:57 +0000 (10:56 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887576 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 18:15:22 +0000 (18:15 +0000)]
Fix APLOGNO(10258) missing from r1887384.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887390 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 16:35:32 +0000 (16:35 +0000)]
Backported in r1887386 [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887387 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 16:35:03 +0000 (16:35 +0000)]
Merge r1887244, r1887245 from trunk:
Fix a potential duplicated ID generation issue under heavy load.
This is due to a non thread safe use of a counter.
Use a counter for each thread instead to avoid the issue.
PR 65159
Follow-up to r1887244.
Wrong version of the patch attached :(
Submitted by: jailletc36
Reviewed by: jailletc36, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887386 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 16:30:07 +0000 (16:30 +0000)]
Backported in r1887384 [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887385 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 16:28:23 +0000 (16:28 +0000)]
Merge r1879285, r1879322, r1879345, r1879346, r1879465, r1879469, r1879470, r1879488, r1879541, r1879548 from trunk:
"[mod_dav_fs etag handling] should really honor the FileETag setting".
- It now does.
- Add "Digest" to FileETag directive, allowing a strong ETag to be
generated using a file digest.
- Add ap_make_etag_ex() and ap_set_etag_fd() to allow full control over
ETag generation.
- Add concept of "binary notes" to request_rec, allowing packed bit flags
to be added to a request.
- First binary note - AP_REQUEST_STRONG_ETAG - allows modules to force
the ETag to a strong ETag to comply with RFC requirements, such as those
mandated by various WebDAV extensions.
Be defensive when the request is missing.
Remove tabs.
Use a dedicated constant for the base64 sha1 length.
Be defensive when calculating the digest. Make sure the offset is initialised
to zero before reading the current offset.
Seek to the start of the file when calculating the ETag.
Add log numbers to util_etag.c.
Add MMAP support to ETag generation.
Use a brigade instead of direct reads, allow APR to handle MMAP.
Bump the logno.
Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887384 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 16:16:18 +0000 (16:16 +0000)]
Backported in r1887382 [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887383 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 16:15:45 +0000 (16:15 +0000)]
Merge r1874674 from trunk:
bubble up an error if none of the passhrases work
previously, the un-decodable z->encoded would get set to NULL
but success would be returned
Submitted by: covener
Reviewed by: jailletc36, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887382 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 16:14:18 +0000 (16:14 +0000)]
Backported in r1887380 [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887381 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 16:12:52 +0000 (16:12 +0000)]
Merge r1883184 from trunk:
Optimize 'ap_list_provider_names'.
Save some memory and potentialy avoid some useless copy .
Using 'goto' is not realy in line with httpd coding style, but the function is small and still readable IMHO.
Submitted by: jailletc36
Reviewed by: jailletc36, jorton, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887380 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 16:10:38 +0000 (16:10 +0000)]
Backported [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887379 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 16:09:07 +0000 (16:09 +0000)]
Merge r1875353 from trunk:
* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response): Clear any
possible returned buckets in the brigade in the error case. As we want to
close the connection anyway there is no sensible content we could still
sent and hence doing the needed life time transformation of the buckets
would be a waste.
PR: 64234
Submitted by: rpluem
Reviewed by: ylavic, jorton, jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887378 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 15:44:30 +0000 (15:44 +0000)]
Merge r1883668, r1886255 from trunk:
mod_http2: explicitely apr_thread_exit() at the end of slot_run().
Calling apr_thread_exit() before returning from the thread function avoids
leaking the thread's pool (until/unless APR-2.0 is used).
mod_http2: Fix workers synchronization on pchild cleanup.
When the MPM child exits and pre-workers_pool_cleanup() is called, all the
workers are not necessarily in their idle critical section, thus aborting slots
in the ->idle list only may leave worker threads alive, later blocked in the
idle critical section with no one to wake them.
Instead of the per-slot ->aborted flag, workers_pool_cleanup() will now set
workers->aborted "globally" such that slot_run() does not wait to be woken up
from idle in this case, and all workers really exit.
Also, for workers_pool_cleanup() to wait for all the workers to reach the
->zombies list before returning, a new ->all_done condition variable is armed
when the last thread exits. Since this depends on the atomic ->worker_count to
reach zero, for accuracy the increment in activate_slot() is moved before the
thread startup.
* modules/http2/h2_workers.h (struct h2_workers): volatilize ->aborted and
add the ->all_done condition variable.
* modules/http2/h2_workers.c (push_slot, pop_slot): volatilize the h2_slot*
being cas-ed.
* modules/http2/h2_workers.c (cleanup_zombies): rename to join_zombies(), and
move ->worker_count atomic inc to slot_done().
* modules/http2/h2_workers.c (get_next): when workers->aborted, leave and don't
wait for ->not_idle. Return an int/bool since it's gotten / not gotten.
* modules/http2/h2_workers.c (slot_done): signal ->all_done when the last
worker and the MPM child are exiting.
* modules/http2/h2_workers.c (slot_run): rework the loops now that get_next()
is the stop signal.
* modules/http2/h2_workers.c (workers_pool_cleanup): wait for ->all_done when
needed, and remove the !workers->aborted condition since the cleanup will
only be called once.
* modules/http2/h2_workers.c (activate_slot): move ->worker_count atomic inc
before the thread creation and handle failure rollback.
github: closes #169
Submitted by: ylavic
Reviewed by: ylavic, icing, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887374 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Mar 2021 15:37:55 +0000 (15:37 +0000)]
Promote [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1887373 13f79535 -47bb-0310-9956-
ffa450edef68