]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
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
Joe Orton [Tue, 7 Sep 2021 06:43:24 +0000 (06:43 +0000)]
Vote, promote, [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893008 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Sep 2021 02:01:46 +0000 (02:01 +0000)]
Update mod_unique_id proposal [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893005 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 7 Sep 2021 01:24:30 +0000 (01:24 +0000)]
Vote, propose [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1893003 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 6 Sep 2021 19:43:39 +0000 (19:43 +0000)]
* Comment [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892997 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 6 Sep 2021 19:35:10 +0000 (19:35 +0000)]
* Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892996 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 6 Sep 2021 19:33:29 +0000 (19:33 +0000)]
* Forgot my +1 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892995 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 6 Sep 2021 19:23:46 +0000 (19:23 +0000)]
* New proposal [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892994 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 6 Sep 2021 10:54:58 +0000 (10:54 +0000)]
Backported [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892984 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 6 Sep 2021 10:53:37 +0000 (10:53 +0000)]
Sync CHANGES entries [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892983 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 6 Sep 2021 10:53:04 +0000 (10:53 +0000)]
Merge r1892915 from trunk:
Reduce the time window where duplicates may be generated by mod_uniqueid
Submitted by: jailletc36
Reviewed by: jailletc36, jorton, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892982 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 6 Sep 2021 10:17:04 +0000 (10:17 +0000)]
Merge r1892914 from trunk:
Revert r1887244 and r1887245 which causes issues on Windows
Submitted by: jailletc36
Reviewed by: jailletc36, icing, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892980 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 6 Sep 2021 10:04:09 +0000 (10:04 +0000)]
Backported [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892979 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 6 Sep 2021 10:03:06 +0000 (10:03 +0000)]
Merge r1890465 from trunk:
mpm_prefork: mask signals during ap_run_child_init().
This prevents threads potentially created from the child_init hooks (e.g.
mod_watchdog workers) to catch signals needed by the MPM, like here:
https://travis-ci.com/github/apache/httpd/jobs/
510821148 #L5356.
Submitted by: ylavic
Reviewed by: jorton, icing, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892978 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 6 Sep 2021 10:01:02 +0000 (10:01 +0000)]
Just in case :) [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892977 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 6 Sep 2021 10:00:21 +0000 (10:00 +0000)]
Backported [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892976 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 6 Sep 2021 08:47:57 +0000 (08:47 +0000)]
* As stated on list, Christophe did not vote for it, but I do and hence we stay here [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892972 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 6 Sep 2021 08:34:19 +0000 (08:34 +0000)]
Merge r1892740, r1892851 from trunk:
mod_proxy: Fix potential tunneling infinite loop and spurious timeout.
PRs 65521 and 65519.
* modules/proxy/proxy_util.c(ap_proxy_tunnel_run):
Avoid an infinite loop by shutting down the connection for write when poll()
returns POLLHUP and read is already down. PR 65521.
* modules/proxy/proxy_util.c(ap_proxy_tunnel_run):
When write completion is finished don't check for ap_filter_input_pending()
before proxy_tunnel_forward() to flush input data, this is a nonblocking read
already which will do the same thing implicitely. ap_filter_input_pending()
is broken in 2.4.x without the whole pending data mechanism (not backported
yet), so let's align here. PR 65519.
mod_proxy: Follow up to r1892740.
Really remove the old ap_filter_input_pending() handling forgotten by r1892740.
Submitted by: ylavic
Reviewed by: ylavic, covener, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892971 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Sep 2021 08:14:01 +0000 (08:14 +0000)]
vote and promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892967 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Sep 2021 08:10:31 +0000 (08:10 +0000)]
vote and promote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892966 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 6 Sep 2021 08:08:53 +0000 (08:08 +0000)]
Votes. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892965 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Sep 2021 07:59:06 +0000 (07:59 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892964 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Sep 2021 07:42:34 +0000 (07:42 +0000)]
assuming Christophe is for the backport he proposed. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892963 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Sep 2021 11:13:29 +0000 (11:13 +0000)]
Propose what looks like a good backport candidate.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892930 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Sep 2021 06:03:22 +0000 (06:03 +0000)]
propose
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892916 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 4 Sep 2021 17:20:54 +0000 (17:20 +0000)]
Add an alternate syntax for <!-- comment ... -->
PR 65546
r1892902 in trunk
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892903 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Sep 2021 17:05:12 +0000 (17:05 +0000)]
Sync CHANGES [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892878 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Sep 2021 17:02:30 +0000 (17:02 +0000)]
All backported [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892877 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Sep 2021 17:01:29 +0000 (17:01 +0000)]
Merge r1892599 from trunk:
mod_http2: fixes a use-after-read of an integer value when
passing a stream identifier for further IO checking. A
non-issue since an int value matching no active stream
will lead to no action.
Submitted by: icing
Reviewed by: icing, jorton, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892876 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Sep 2021 17:00:07 +0000 (17:00 +0000)]
Merge r1892805 from trunk:
mod_proxy_uwsgi: Fix PATH_INFO setting for generic worker.
When the generic "proxy:reverse" worker is selected for an uwsgi scheme, the
worker name is irrelevant so uwscgi_handler() should point to the PATH_INFO
directly from the given URL.
Submitted by: ylavic
Reviewed by: ylavic, covener, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892875 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Sep 2021 16:52:38 +0000 (16:52 +0000)]
Merge r1892814, r1892853 from trunk:
mod_proxy: Faster unix socket path parsing in the "proxy:" URL.
The actual r->filename format is "[proxy:]unix:path|url" for UDS, no need to
strstr(,"unix:") since it's at the start of the string.
mod_proxy: Follow up to r1892814.
Save some few cycles in ap_proxy_de_socketfy() too.
Submitted by: ylavic
Reviewed by: ylavic, covener, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892874 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Sep 2021 16:50:33 +0000 (16:50 +0000)]
Merge r1892728 from trunk:
* mod_deflate: refrain from reading buckets of known length, just
to get their length. This may transform buckets unwanted (e.g. file
to mmap) and prevent optimization down the filter chain.
Submitted by: icing
Reviewed by: icing, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892873 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Sep 2021 16:49:01 +0000 (16:49 +0000)]
Vote, promote [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892872 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 3 Sep 2021 13:41:42 +0000 (13:41 +0000)]
Vote, [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892871 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 3 Sep 2021 13:28:26 +0000 (13:28 +0000)]
update after backport [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892870 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 3 Sep 2021 13:28:01 +0000 (13:28 +0000)]
Merge of r1890693,r1890696 from trunk:
mod_ssl: tighten the handling of ALPN for outgoing (proxy)
connections. If ALPN protocols are provided and sent to the
remote server, the received protocol selected is inspected
and checked for a match. Without match, the peer handshake
fails.
An exception is the proposal of "http/1.1" where it is
accepted if the remote server did not answer ALPN with
a selected protocol. This accomodates for hosts that do
not observe/support ALPN and speak http/1.x be default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892869 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 3 Sep 2021 13:22:43 +0000 (13:22 +0000)]
proposing r1892599 for backport. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892868 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 3 Sep 2021 12:31:47 +0000 (12:31 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892860 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 3 Sep 2021 12:22:09 +0000 (12:22 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892859 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Sep 2021 12:18:15 +0000 (12:18 +0000)]
Fix backport command [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892858 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Sep 2021 12:17:20 +0000 (12:17 +0000)]
Propose [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892857 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Sep 2021 12:08:09 +0000 (12:08 +0000)]
Those are ready to backport [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892856 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Sep 2021 12:06:19 +0000 (12:06 +0000)]
Propose the fix for PRs 65521 and 65519, as showstopper.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892855 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 3 Sep 2021 10:19:23 +0000 (10:19 +0000)]
Two reviews. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892850 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 3 Sep 2021 09:57:42 +0000 (09:57 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892849 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 3 Sep 2021 09:57:25 +0000 (09:57 +0000)]
update for sync with English docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892848 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 3 Sep 2021 08:33:22 +0000 (08:33 +0000)]
Merge r1892841, r1892845 from trunk:
Adjust Travis conditions for candidate-2.4.x tags.
Second attempt at updating the Travis conditions to work properly
for candidate-2.4.x branches, and add a mini test script for the
conditions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892846 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 3 Sep 2021 08:14:02 +0000 (08:14 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892842 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 2 Sep 2021 11:18:21 +0000 (11:18 +0000)]
adding `dist` to ignored directories
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892810 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 1 Sep 2021 13:22:19 +0000 (13:22 +0000)]
Merge r1892782 from trunk:
* mod_md: Certificate/keys pairs are verified as matching before a renewal is accepted
as successful or a staged renewal is replacing the existing certificates.
This avoid potential mess ups in the md store file system to render the active
certificates non-working. [@mkauf]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892783 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 30 Aug 2021 16:47:22 +0000 (16:47 +0000)]
Vote [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892736 13f79535 -47bb-0310-9956-
ffa450edef68