]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Ruediger Pluem [Thu, 7 Oct 2021 12:36:22 +0000 (12:36 +0000)]
* Nitpick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893982 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 7 Oct 2021 12:34:29 +0000 (12:34 +0000)]
Fix ap_mmn.h after r1893977.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893980 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 7 Oct 2021 12:28:18 +0000 (12:28 +0000)]
Backported [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893978 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 7 Oct 2021 12:27:43 +0000 (12:27 +0000)]
Merge r1893971 from trunk:
core: Add ap_unescape_url_ex() for better decoding control, and deprecate
unused AP_NORMALIZE_DROP_PARAMETERS flag.
Submitted by: ylavic
Reviewed by: ylavic, icing, gbechis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893977 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 7 Oct 2021 12:24:49 +0000 (12:24 +0000)]
Move to 3 votes' section [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893976 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Thu, 7 Oct 2021 12:21:10 +0000 (12:21 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893975 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 7 Oct 2021 12:13:33 +0000 (12:13 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893974 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 7 Oct 2021 12:07:01 +0000 (12:07 +0000)]
Propose [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893973 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 5 Oct 2021 08:15:56 +0000 (08:15 +0000)]
publishing release httpd-2.4.50
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893906 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 Oct 2021 13:21:37 +0000 (13:21 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893819 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 Oct 2021 13:17:32 +0000 (13:17 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893816 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 1 Oct 2021 11:22:10 +0000 (11:22 +0000)]
CHANGES and STATUS update after merge [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893776 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 1 Oct 2021 11:21:11 +0000 (11:21 +0000)]
Merge of /httpd/httpd/trunk:r1893724
*) core: AP_NORMALIZE_DECODE_UNRESERVED should normalize the second dot in
the uri-path when it's preceded by a dot. [Yann Ylavic]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893775 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 1 Oct 2021 11:12:58 +0000 (11:12 +0000)]
move to proper section [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893774 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 1 Oct 2021 10:54:08 +0000 (10:54 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893773 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 1 Oct 2021 10:41:11 +0000 (10:41 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893771 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 30 Sep 2021 09:38:00 +0000 (09:38 +0000)]
consolidate CHANGES [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893748 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 29 Sep 2021 19:33:34 +0000 (19:33 +0000)]
Add compatibility note for CheckBasenameMatch
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893734 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 29 Sep 2021 15:04:47 +0000 (15:04 +0000)]
Propose [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893725 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Sep 2021 14:35:55 +0000 (14:35 +0000)]
Backport:
*) mpm event: Correctly count active child processes in parent process if
child process dies due to MaxConnectionsPerChild. PR 65592.
Trunk version of patch:
https://svn.apache.org/r1893520
Backport version for 2.4.x of patch:
Trunk version of patch works
svn merge -c
1893520 ^/httpd/httpd/trunk .
+1: rpluem, ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893660 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Sep 2021 14:34:20 +0000 (14:34 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893659 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Sep 2021 14:30:51 +0000 (14:30 +0000)]
Backport:
*) mod_http2: when a server is restarted gracefully, any idle h2 worker
threads are shut down immediately.
Also, change OpenSSL API use for deprecations in OpenSSL 3.0.
Adds all other, never proposed code changes to make a clean
sync of http2 sources.
trunk patch: http://svn.apache.org/r1893214
http://svn.apache.org/r1893215
http://svn.apache.org/r1893220
and other never proposed code changes
PR: https://github.com/apache/httpd/pull/270
+1: icing, rpluem, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893658 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Sep 2021 14:28:20 +0000 (14:28 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893657 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Sep 2021 14:18:55 +0000 (14:18 +0000)]
Backport:
*) mod_dav: Correctly handle errors returned by dav providers on REPORT
requests.
Trunk version of patch:
https://svn.apache.org/r1893589
Backport version for 2.4.x of patch:
Trunk version of patch works
svn merge -c
1893589 ^/httpd/httpd/trunk .
+1: rpluem, minfrin, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893656 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Sep 2021 14:14:37 +0000 (14:14 +0000)]
Backport:
*) core: do not install core input/output filters on secondary
connections.
Trunk version of patch:
http://svn.apache.org/viewvc?view=revision&revision=
1787606
Backport version for 2.4.x of patch:
svn merge -c
1787606 ^/httpd/httpd/trunk .
+1: icing, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893655 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Sep 2021 14:11:22 +0000 (14:11 +0000)]
Backport:
*) core: Add ap_pre_connection() as a wrapper to ap_run_pre_connection()
and use it to prevent that failures in running the pre_connection
hook cause crashes afterwards.
Trunk version of patch:
https://svn.apache.org/r1893497
https://svn.apache.org/r1893507
Backport version for 2.4.x of patch:
https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/269.diff
Can be applied via apply_backport_pr.sh 269.
+1: rpluem, icing, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893654 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Sep 2021 13:35:34 +0000 (13:35 +0000)]
Remove duplicate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893653 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 26 Sep 2021 13:24:26 +0000 (13:24 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893652 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Sep 2021 13:07:01 +0000 (13:07 +0000)]
Backport:
*) mod_speling: Backport CheckBasenameMatch for PR44221
trunk patch: http://svn.apache.org/r1557580
http://svn.apache.org/r1732273
http://svn.apache.org/r1844598
2.4.x patch: full resync of code/docs due to conflicts + changes
http://people.apache.org/~covener/patches/speling-sync.diff
+1 covener, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893649 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 26 Sep 2021 13:00:21 +0000 (13:00 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893646 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 25 Sep 2021 22:15:28 +0000 (22:15 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893632 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 25 Sep 2021 21:51:34 +0000 (21:51 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893630 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 25 Sep 2021 21:33:29 +0000 (21:33 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893628 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 24 Sep 2021 14:50:01 +0000 (14:50 +0000)]
* Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893598 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 23 Sep 2021 18:32:18 +0000 (18:32 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893575 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 12:42:48 +0000 (12:42 +0000)]
vote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893561 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 12:32:21 +0000 (12:32 +0000)]
update after backport [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893560 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 12:31:53 +0000 (12:31 +0000)]
backport of
1893519 ,
1893532 from trunk:
*) mod_proxy: Handle UDS URIs with empty hostname ("unix:///...") as if they
had no hostname ("unix:/..."), also in mod_rewrite's is_absolulte_uri().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893559 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 12:31:12 +0000 (12:31 +0000)]
vote and promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893558 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 12:29:51 +0000 (12:29 +0000)]
update after backport [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893557 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 12:29:03 +0000 (12:29 +0000)]
Merge of r1893516 from trunk:
*) mod_rewrite: Fix UDS ("unix:") scheme for [P] rules. PR 57691 + 65590.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893556 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 12:27:47 +0000 (12:27 +0000)]
vote and promote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893554 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 23 Sep 2021 12:23:15 +0000 (12:23 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893553 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 12:08:36 +0000 (12:08 +0000)]
add proposal for r1787606.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893552 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 09:53:01 +0000 (09:53 +0000)]
* merging test/modules from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893546 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 09:46:42 +0000 (09:46 +0000)]
removing copy of test for future merging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893545 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 09:14:38 +0000 (09:14 +0000)]
test/modules/http2: ignoring gen directory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893544 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 09:13:59 +0000 (09:13 +0000)]
Reload of proposed mod_http2 backport of server graceful handling,
including all the tiny code changes that were never proposed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893543 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 23 Sep 2021 08:56:33 +0000 (08:56 +0000)]
* test: adding the modules/http2 test suite for easy availability
in 2.4.x.
* configure.in: adding the test/modules/http2 .in files to process
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893542 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 23 Sep 2021 08:51:42 +0000 (08:51 +0000)]
* Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893540 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 23 Sep 2021 08:47:50 +0000 (08:47 +0000)]
* Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893539 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 23 Sep 2021 08:29:52 +0000 (08:29 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893535 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 23 Sep 2021 08:00:17 +0000 (08:00 +0000)]
Propose, vote, promote [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893533 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 23 Sep 2021 07:39:15 +0000 (07:39 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893531 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 23 Sep 2021 07:25:24 +0000 (07:25 +0000)]
* Comment [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893530 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 23 Sep 2021 07:23:16 +0000 (07:23 +0000)]
* Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893529 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 19 Sep 2021 11:51:32 +0000 (11:51 +0000)]
Remove useless CHANGES entry + trigger CI
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893439 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 17 Sep 2021 12:41:45 +0000 (12:41 +0000)]
Merge of /httpd/httpd/trunk:r1893399
*) mod_md: when MDMessageCmd for a 'challenge-setup:<type>:<dnsname>'
fails (!= 0 exit), the renewal process is aborted and an error is
reported for the MDomain. This provides scripts that distribute
information in a cluster to abort early with bothering an ACME
server to validate a dns name that will not work. The common
retry logic will make another attempt in the future, as with
other failures.
Fixed a bug when adding private key specs to an already working
MDomain, see <https://github.com/icing/mod_md/issues/260>.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893400 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 16 Sep 2021 07:58:22 +0000 (07:58 +0000)]
publishing release httpd-2.4.49
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893373 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 15 Sep 2021 13:41:35 +0000 (13:41 +0000)]
Merge of /httpd/httpd/trunk:r1893359
*) mod_md: fixed a bug in handling multiple parallel OCSP requests. These could
run into an assertion which terminated (and restarted) the child process where
the task was running. Eventually, all OCSP responses were collected, but not
in the way that things are supposed to work.
See also <https://bz.apache.org/bugzilla/show_bug.cgi?id=65567>.
The bug was possibly triggered when more than one OCSP status needed updating
at the same time. For example for several renewed certificates after a server
reload.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893360 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Sep 2021 12:43:26 +0000 (12:43 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893252 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Sep 2021 12:42:39 +0000 (12:42 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893251 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 10 Sep 2021 12:23:09 +0000 (12:23 +0000)]
readability [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893225 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 10 Sep 2021 12:19:18 +0000 (12:19 +0000)]
propose a busy PR [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893223 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 10 Sep 2021 09:47:41 +0000 (09:47 +0000)]
update back port proposal [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893221 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 10 Sep 2021 08:20:14 +0000 (08:20 +0000)]
backport proposal added. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893216 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 9 Sep 2021 15:23:16 +0000 (15:23 +0000)]
update after back port [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893183 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 9 Sep 2021 15:22:23 +0000 (15:22 +0000)]
Merge r1890605, r1893164, r1893179 from trunk:
*) core/mod_proxy/mod_ssl:
Adding `outgoing` flag to conn_rec, indicating a connection is
initiated by the server to somewhere, in contrast to incoming
connections from clients.
Adding 'ap_ssl_bind_outgoing()` function that marks a connection
as outgoing and is used by mod_proxy instead of the previous
optional function `ssl_engine_set`. This enables other SSL
module to secure proxy connections.
The optional functions `ssl_engine_set`, `ssl_engine_disable` and
`ssl_proxy_enable` are now provided by the core to have backward
compatibility with non-httpd modules that might use them. mod_ssl
itself no longer registers these functions, but keeps them in its
header for backward compatibility.
The core provided optional function wrap any registered function
like it was done for `ssl_is_ssl`.
*core: clarify comments and use hook API better to check for presence of callbacks.
* optimizing hook check as suggested by Yann.
Submitted by: icing
Reviewed by:
Github: closes #203
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893182 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 9 Sep 2021 14:57:48 +0000 (14:57 +0000)]
* Vote and promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893180 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 9 Sep 2021 14:34:07 +0000 (14:34 +0000)]
Sync CHANGES [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893178 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 9 Sep 2021 14:33:22 +0000 (14:33 +0000)]
WIP [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893177 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 8 Sep 2021 09:13:41 +0000 (09:13 +0000)]
* Clean up my mess that I created in r1893100 withe respect to change-entries vs. changes-entries [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893119 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 8 Sep 2021 08:42:05 +0000 (08:42 +0000)]
Sync CHANGES for r1893111. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893118 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 8 Sep 2021 08:32:13 +0000 (08:32 +0000)]
Backported in r1893116. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893117 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 8 Sep 2021 08:31:38 +0000 (08:31 +0000)]
Merge r1893001, r1893002, r1893004 from trunk:
core: Set r->request_time before any logging, mod_unique_id needs it.
* server/protocol.c(read_request_line):
Move r->request_time initialization before first APLOG_TRACE5,
ap_log_rerror() may run the generate_log_id hooks and call mod_unique_id
with no timestamp initialized (zero).
mod_unique_id: Follow up to r1892915: Shorter counter race condition yet.
* modules/metadata/mod_unique_id.c(gen_unique_id):
Set the counter in network byte order for uuencoding only, allowing for
simple cur_unique_id.counter++
mod_unique_id: Follow up to r1892915 and r1893002: Atomic counter.
* modules/metadata/mod_unique_id.c(gen_unique_id):
Use an atomic 32bit counter to close the race condition with threaded MPMs,
using the lower 16 bits for uuencoding still.
Submitted by: ylavic
Reviewed by: ylavic, rpluem, gbechis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893116 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 8 Sep 2021 08:29:19 +0000 (08:29 +0000)]
Backported in r1893111. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893113 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 8 Sep 2021 08:28:27 +0000 (08:28 +0000)]
comment [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893112 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 8 Sep 2021 08:27:47 +0000 (08:27 +0000)]
Merge r1893016 from trunk:
mod_proxy: Don't canonicalize with both nocanon and ProxyPassInterpolateEnv On.
If nocanon is set, we should match the unparsed_uri against the interpolated
alias (not the ProxyPass'ed one) when verifying the resulting length. Otherwise
we falsely restore the canonicalized URL in case of mismatch. PR 65549.
Submitted by: Joel Self <joelself gmail.com>
Reviewed by: ylavic, covener, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893111 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 8 Sep 2021 08:26:03 +0000 (08:26 +0000)]
Backported in r1893109. [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893110 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 8 Sep 2021 08:25:29 +0000 (08:25 +0000)]
Merge r1893014, r1893073 from trunk:
mpm_event: Fix children processes possibly not stopped on graceful restart.
The number of children spawned can go above active_daemons_limit due to
exponential idle_spawn_rate growth (x 2), enforce the upper limit in
perform_idle_server_maintenance(). PR 63169.
Submitted by: Joel Self <joelself gmail.com>
mpm_event: Follow up to r1893014: log when children are not spawned.
Log at trace1 level when active_daemons >= active_daemons_limit and we won't
spawn children. Reset free_length to avoid negative value in this case too.
Submitted by: ylavic
Reviewed by: ylavic, covener, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893109 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 8 Sep 2021 08:21:54 +0000 (08:21 +0000)]
Backported in r1893107. [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893108 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 8 Sep 2021 08:21:22 +0000 (08:21 +0000)]
mod_proxy: Axe unused ap_filter_input_pending in 2.4.x (only) after r1892971.
Submitted by: ylavic
Reviewed by: ylavic, icing, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893107 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 8 Sep 2021 08:18:37 +0000 (08:18 +0000)]
Backported in r1893051 [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893106 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 8 Sep 2021 08:12:44 +0000 (08:12 +0000)]
Accepted [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893105 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Wed, 8 Sep 2021 07:23:05 +0000 (07:23 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893103 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 8 Sep 2021 07:00:09 +0000 (07:00 +0000)]
Merge r1892986, r1892987 from trunk:
mod_proxy: Follow up to r1892814.
* modules/proxy/proxy_util.c(fix_uds_filename):
Sanity checks on the configured UDS path, fail with 500 if invalid since
continuing through proxy processing wouldn't work as expected.
mod_proxy: Follow up to r1892986: APLOGNO()
Stefan get out of this body! :)
Submitted by: ylavic
Reviewed by: rpluem, ylavic, covener
Github: closes #265
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893101 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 8 Sep 2021 06:58:31 +0000 (06:58 +0000)]
* Add missing changes entry for r1893099 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893100 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 8 Sep 2021 06:55:40 +0000 (06:55 +0000)]
Merge r1869842 from trunk:
mod_ssl: Log private key material to file set by $SSLKEYLOGFILE in the
environment, using the standard format which can be parsed by (e.g.)
wireshark for decoding SSL/TLS traffic; supported from OpenSSL 1.1.1.
* modules/ssl/ssl_private.h: Add keylog_file to SSLModConfigRec.
* modules/ssl/ssl_engine_init.c (ssl_init_Module): Open log file if
SSLKEYLOGFILE is set in the environment.
(ssl_init_ctx_protocol): Register the keylog callback with OpenSSL.
* modules/ssl/ssl_engine_kernel.c (modssl_callback_keylog):
New function.
PR: 63391
Github: closes #74
Submitted by: jorton
Reviewed by: rpluem, ylavic, jorton
Github: closes #264
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893099 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 8 Sep 2021 06:50:31 +0000 (06:50 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893098 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Sep 2021 20:17:36 +0000 (20:17 +0000)]
Add logging (r1893073) to the fix for PR 63169 (keeping Eric's vote). [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893074 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 7 Sep 2021 17:13:11 +0000 (17:13 +0000)]
vote/promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893062 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Sep 2021 16:05:31 +0000 (16:05 +0000)]
Merge r1878092 from trunk:
Fix a NULL pointer dereference
* server/scoreboard.c (ap_increment_counts): In certain cases like certain
invalid requests r->method might be NULL here. r->method_number defaults
to M_GET and hence is M_GET in these cases.
Submitted by: rpluem
Reviewed by: covener, ylavic, jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893051 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Sep 2021 14:46:21 +0000 (14:46 +0000)]
Update proposal (resetting jfclere's vote), promote r1878092. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893046 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 7 Sep 2021 14:08:24 +0000 (14:08 +0000)]
Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893042 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Sep 2021 13:14:32 +0000 (13:14 +0000)]
Vote, propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893033 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 7 Sep 2021 11:03:01 +0000 (11:03 +0000)]
propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893018 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Sep 2021 10:19:53 +0000 (10:19 +0000)]
Propose fix for PR 65549. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893017 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Sep 2021 09:44:27 +0000 (09:44 +0000)]
Propose fix for PR 63169. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893015 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 7 Sep 2021 09:04:10 +0000 (09:04 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893013 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Sep 2021 09:01:25 +0000 (09:01 +0000)]
Axe unused ap_filter_input_pending in 2.4.x. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893012 13f79535 -47bb-0310-9956-
ffa450edef68