]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Christophe Jaillet [Sun, 26 Dec 2021 10:36:17 +0000 (10:36 +0000)]
Fix a typo.
Prefer <code> to <var> when giving the value of a parameter
Add a missing space
Add a missing link
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896413 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 26 Dec 2021 10:15:24 +0000 (10:15 +0000)]
Fix a typo and add a missing link to a directive
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896411 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 26 Dec 2021 09:52:25 +0000 (09:52 +0000)]
Fix some typo.
Add some missing spaces spotted here and there to better comply with coding style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896409 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 25 Dec 2021 18:16:06 +0000 (18:16 +0000)]
Fix some typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896393 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 25 Dec 2021 13:58:16 +0000 (13:58 +0000)]
Fix some typos
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896386 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 25 Dec 2021 09:22:04 +0000 (09:22 +0000)]
Rebuild
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896381 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 25 Dec 2021 09:04:36 +0000 (09:04 +0000)]
Add some hyperlinks to some directives
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896378 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 25 Dec 2021 08:41:19 +0000 (08:41 +0000)]
Add some <default> values in the description of some directives.
Add a description for TLSHonorClientOrder
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896377 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 25 Dec 2021 08:21:19 +0000 (08:21 +0000)]
Add a few <module>.
In <syntax>, add some <em> around parameters that should be replaced by actual values.
Remove the text describing TLSProxyCA. It is a copy&paste error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896374 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 25 Dec 2021 08:10:45 +0000 (08:10 +0000)]
Add an 's' in 2 directives name to match code and be consistent with the non-proxy directives
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896373 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 25 Dec 2021 07:52:24 +0000 (07:52 +0000)]
Add "id" to <section> so that hyperlinks are generated in the TOC.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896372 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 24 Dec 2021 15:00:58 +0000 (15:00 +0000)]
Add a few missing hyper links and use <em> for parameters that need to be replaced with actual values
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896363 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 24 Dec 2021 13:49:35 +0000 (13:49 +0000)]
Close a file handle in case of error in ct_static_scts()
PR 65760 <ryancaicse gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896361 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Dec 2021 14:36:29 +0000 (14:36 +0000)]
Add a change entry for r1896278
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896279 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Dec 2021 14:28:00 +0000 (14:28 +0000)]
Try to workaround a linkage issue with rustls.
See https://github.com/rustls/rustls-ffi/issues/133 for discussion about it.
Only 1.55, 1.56 and 1.57 should be affected.
Tested with 1.56.1 on Linux pop-os 5.15.5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896278 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 21 Dec 2021 18:42:30 +0000 (18:42 +0000)]
mod_proxy: Bump max worker name to 384 chars.
The worker name is a fully qualified URI while the hostname's limit is 256
already, so potentially more than 256 are needed to store the name. Let's
use 384.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896253 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 21 Dec 2021 18:18:56 +0000 (18:18 +0000)]
Reserve an APLOGNO for an eventual 2.4.x (only) backport. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896251 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Dec 2021 14:52:25 +0000 (14:52 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896133 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Dec 2021 14:51:20 +0000 (14:51 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896132 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Dec 2021 12:11:31 +0000 (12:11 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896128 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Dec 2021 12:10:15 +0000 (12:10 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896127 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 18 Dec 2021 11:31:03 +0000 (11:31 +0000)]
Add some installation information, if it can help s.o.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896125 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 17 Dec 2021 19:51:42 +0000 (19:51 +0000)]
Add a compatibility note for MDExternalAccountBinding
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896105 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Dec 2021 15:09:50 +0000 (15:09 +0000)]
Sync docs [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896065 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Dec 2021 15:07:43 +0000 (15:07 +0000)]
Sync docs [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896063 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Dec 2021 15:07:15 +0000 (15:07 +0000)]
Improve ProxyPass mapping= docs. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896062 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Dec 2021 13:42:23 +0000 (13:42 +0000)]
Sync docs [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896056 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Dec 2021 12:25:40 +0000 (12:25 +0000)]
docs/mod_proxy.xml: syntax. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896048 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Dec 2021 11:23:41 +0000 (11:23 +0000)]
test: fully qualified URIs should work through reverse proxy too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896043 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 16 Dec 2021 11:22:29 +0000 (11:22 +0000)]
*) test: modules/proxy, make uds faker a daemon thread, so it does not
prevent test shutdown.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896041 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 16 Dec 2021 10:45:39 +0000 (10:45 +0000)]
*) test: when building librustls, force an update to cbindgen as focal seems
to have an really old version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896034 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 16 Dec 2021 09:18:17 +0000 (09:18 +0000)]
*) test: enabling proxy tests.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896030 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Dec 2021 20:33:59 +0000 (20:33 +0000)]
mod_ssl: Fix -Werror=unused-value in ssl_var_lookup_ssl_cert_data().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896008 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 15 Dec 2021 16:39:38 +0000 (16:39 +0000)]
*) test: added first mod_proxy tests in test/modules/proxy that
check some variations on forward, reverse and mixed vhosts
and also using a unix: domain socket backend.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1896002 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 15 Dec 2021 14:41:26 +0000 (14:41 +0000)]
Add maintainer-mode for the OpenSSL 3.x -Werror build so we get actual warning coverage.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895996 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Dec 2021 12:47:05 +0000 (12:47 +0000)]
mod_proxy: Axe useless setting of *balancer to NULL in ap_proxy_pre_request()
It's already NULL per the enclosing "if" test.
Also, while at a non-functional change, break a close long log line to <80 col.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895986 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 15 Dec 2021 11:37:53 +0000 (11:37 +0000)]
Add Travis job against OpenSSL 3 with -Werror but with deprecation
warnings disabled.
Be careful to remove the previous OpenSSL install prefix is rebuilding.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895982 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 15 Dec 2021 11:35:36 +0000 (11:35 +0000)]
mod_proxy: follow up to r1895921: Don't prevent forwarding URIs w/ no hostname.
r1895921 changed proxy_detect() to disable forward proxying for URIs with no
hostname which is wrong, there might exist a third-party proxy module handling
the "urn:" scheme for instance (thanks Roy for the catch!).
For this to work, we also need to leave the forward proxied URI alone in
ap_proxy_pre_request() with no UDS special case or alike, a proxy module can
then catch (or not) the original URI as expected.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895981 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 15 Dec 2021 08:36:33 +0000 (08:36 +0000)]
Test against OpenSSL 3.0.1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895973 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 15 Dec 2021 08:28:11 +0000 (08:28 +0000)]
* Improve error handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895970 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 14 Dec 2021 15:42:43 +0000 (15:42 +0000)]
Trim leading empty lines [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895957 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 14 Dec 2021 15:24:32 +0000 (15:24 +0000)]
Sync changes-entries [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895953 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 13 Dec 2021 18:55:18 +0000 (18:55 +0000)]
http: Enforce that fully qualified uri-paths not to be forward-proxied
have an http(s) scheme, and that the ones to be forward proxied have a
hostname, per HTTP specifications.
The early checks avoid failing the request later on and thus save cycles
for those invalid cases.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895921 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 13 Dec 2021 18:07:22 +0000 (18:07 +0000)]
mod_proxy: Detect unix: scheme syntax errors at load time.
* modules/proxy/mod_proxy.c(add_pass, add_member, set_proxy_param,
proxysection):
Check return value of ap_proxy_de_socketfy().
* modules/proxy/proxy_util.c(ap_proxy_get_worker_ex):
Check return value of ap_proxy_de_socketfy().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895914 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 13 Dec 2021 16:37:29 +0000 (16:37 +0000)]
Add a note about aliging mapping= with the backend's. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895907 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 13 Dec 2021 16:24:03 +0000 (16:24 +0000)]
Add Travis job for 2.4.x against OpenSSL 3, using APR 1.7/apr-util 1.6.
Disable TEST_MALLOC (enabled by accident) for OpenSSL 3 / trunk job.
Restrict OpenSSL 3 / apr trunk build to non-2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895905 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 13 Dec 2021 15:07:45 +0000 (15:07 +0000)]
Improve docs for ProxyPass mapping= parameter. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895895 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 10 Dec 2021 17:17:37 +0000 (17:17 +0000)]
Add Travis build job building/testing mod_ssl against OpenSSL 3.
Github: closes #282
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895787 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 10 Dec 2021 14:50:19 +0000 (14:50 +0000)]
* modules/ssl/ssl_engine_io.c (bio_filter_in_ctrl): Remove debugging
assert for unexpected control commands, matching bio_filter_out_ctrl
which also ignores such invocations. Fixes core dumps in debug
builds with OpenSSL 3.0.0 which triggers this via the
BIO_get_ktls_recv() call on the SSL bio, aka
BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, ...);
See: https://github.com/openssl/openssl/blob/
105af0ad923a665ca5fee296b52dbf34b524a2aa /ssl/record/rec_layer_s3.c#L274
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895774 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 10 Dec 2021 12:22:17 +0000 (12:22 +0000)]
docs: rebuild of documentation
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895756 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 10 Dec 2021 12:20:49 +0000 (12:20 +0000)]
*) mod_tls: adding module documentation to our manuals.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895755 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 9 Dec 2021 14:15:19 +0000 (14:15 +0000)]
* When reaching server limits, such as MaxRequestsPerChild, the HTTP/2 connection
send a GOAWAY frame much too early on new connections, leading to invalid
protocol state and a client failing the request. See PR65731 at
<https://bz.apache.org/bugzilla/show_bug.cgi?id=65731>.
The module now initializes the HTTP/2 protocol correctly and allows the
client to submit one request before the shutdown via a GOAWAY frame
is being announced.
No changes-entries, since this fix is proposed for backport on the 1.15.x
module codebase in 2.4.x in a separate PR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895724 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 9 Dec 2021 08:38:30 +0000 (08:38 +0000)]
* Correctly sent a 100 Continue status code when sending an interim
response as result of an Expect: 100-Continue in the request and not the
current status code of the request.
PR: 65725
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895719 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 9 Dec 2021 08:31:09 +0000 (08:31 +0000)]
* Whitespace fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895718 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 9 Dec 2021 07:40:25 +0000 (07:40 +0000)]
* Do not change the status code after we already sent it to the client.
Changing the status code after we sent it to the client causes a status
code being logged that is different from the one sent to the client which
can be confusing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895715 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 7 Dec 2021 16:02:21 +0000 (16:02 +0000)]
As in r1877467 for mod_ssl, for OpenSSL 1.1.1+ require that OpenSSL is
configured with a suitable entropy source and don't try to seed it
from getpid etc.
* support/ab.c (main): Check RAND_status().
(ssl_rand_seed, ssl_rand_choosenum): Drop for OpenSSL 1.1.1+.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895659 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 6 Dec 2021 17:12:28 +0000 (17:12 +0000)]
mpm_event: Follow up to r1895553.
We can still kill processes above MaxSpareThreads at every maintenance cycle
unless there is not enough headromm in the scoreboard for a graceful restart.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895630 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 6 Dec 2021 10:34:27 +0000 (10:34 +0000)]
*) mod_http2: fixed a bug in v2.0.0 that could lead to an infinite
loop when clients close connections prematurely.
Enhanced the scoreboard status updates on h2 connections for
mod_status. 'server-status' now gives a better idea what the
connection is working on.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895614 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Dec 2021 15:18:28 +0000 (15:18 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895577 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Dec 2021 15:17:12 +0000 (15:17 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895576 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Dec 2021 21:23:49 +0000 (21:23 +0000)]
Revert r1895551: seems to break python tests..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895562 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 3 Dec 2021 16:40:18 +0000 (16:40 +0000)]
* support/ab.c (main): Check apr_getopt() returned APR_EOF, fixing clang
warning:
support/ab.c:2343:13: warning[deadcode.DeadStores]: Although the value stored to 'status' is used in the enclosing expression, the value is never actually read from 'status'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895559 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Dec 2021 16:09:47 +0000 (16:09 +0000)]
Sync CHANGES entries. [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895558 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Dec 2021 13:25:51 +0000 (13:25 +0000)]
mpm_event: Follow up to r1894285: new MaxSpareThreads heuristics.
When at MaxSpareThreads, instead of deferring the stop if we are close to
active/server limit let's wait for the pending exits to complete.
This way we always and accurately account for slow-to-exit processes to
avoid filling up the scoreboard, whether at the limits or not.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895553 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 3 Dec 2021 13:07:42 +0000 (13:07 +0000)]
* modules/filters/mod_deflate.c (deflate_in_filter): Handle FLUSH in
the input brigade even if done inflating (ctx->done is true), but
don't try to flush the inflate stream in that case. (Caught by
Coverity)
Github: closes #280
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895552 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Dec 2021 13:00:45 +0000 (13:00 +0000)]
mpm_event: Close the listeners first for ungraceful stop too.
Just like for graceful stop.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895551 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 3 Dec 2021 12:59:02 +0000 (12:59 +0000)]
mpm_event: Retain active_daemons instead of resetting it on restart.
Since active_daemons is tracked by perform_idle_server_maintenance() and
decremented when a child gets quiescing or exits, clearing it on restart
is actually an off by -total_daemons (of the old gen) after the first calls
to perform_idle_server_maintenance().
Let perform_idle_server_maintenance() be the only one to update active_daemons
by putting it in the retained struct to keep track accross restarts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895550 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 1 Dec 2021 17:12:06 +0000 (17:12 +0000)]
* mod_tls: remove modules.mk, should not be under version control
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895472 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 1 Dec 2021 14:03:42 +0000 (14:03 +0000)]
* test: removing the loadtest.py from test/modules/tls that requires additional python packages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895467 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 1 Dec 2021 11:54:25 +0000 (11:54 +0000)]
* travis: installing librustls in $PREFIX and using
it from there.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895456 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 1 Dec 2021 09:50:33 +0000 (09:50 +0000)]
* test suite: add an image to test mod_tls on travis
Let's see what the hamsters think of the setup I use
on a local docker focal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895451 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Nov 2021 17:10:13 +0000 (17:10 +0000)]
* test: check the h2load version for test suite making use
of its --connect-to feature (available since 1.41.0).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895434 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Nov 2021 16:30:26 +0000 (16:30 +0000)]
* test suite: adding modules/tls, the test suite for the
new mod_tls module to be run via pytest.
Integration into travis TBD.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895433 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Nov 2021 16:29:20 +0000 (16:29 +0000)]
*) mod_tls: added mod_tls from abetterinternet, donated
by ISRG/Prossimo <https://github.com/abetterinternet/mod_tls>.
- adds font-/backend TLS (v1.2/v1.3) via the Rust rustls crate
and its rustls-ffi C binding <https://github.com/rustls/rustls-ffi>.
- documentation at <https://github.com/abetterinternet/mod_tls>
(adding to Apache's manual TBD)
- build support for Apache httpd configure on *nix platforms,
rustls is linked statically into mod_tls.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895432 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Nov 2021 16:28:59 +0000 (16:28 +0000)]
allicating numbers for mod_tls. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895431 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Nov 2021 15:58:30 +0000 (15:58 +0000)]
* test: allow more flexibility in the ssl modules used
for a vhost. Adjust http2 and md test cases for working
with modules other than mod_ssl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895429 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Nov 2021 15:57:05 +0000 (15:57 +0000)]
* mod_md: install the early config hook with _FIRST, so that
they run before any ssl modules runs get_certificates hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895428 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Nov 2021 15:56:07 +0000 (15:56 +0000)]
* mod_http2: handle gracefully when SSL_PROTOCOL variable is not available.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895427 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 26 Nov 2021 09:29:07 +0000 (09:29 +0000)]
* mod_http2: the new pollset implementation is disabled when
compiling with an APR version less than 1.6.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895349 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 25 Nov 2021 20:47:14 +0000 (20:47 +0000)]
Revert spurious commit r1895340.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895341 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 25 Nov 2021 20:45:54 +0000 (20:45 +0000)]
Trigger ci.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895340 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 25 Nov 2021 15:57:21 +0000 (15:57 +0000)]
mod_http2: fix logic for non-proxy Server and Date response headers.
First error was in r1890564 where the test for !PROXYREQ_NONE was replaced by
PROXYREQ_RESPONSE (which is never the case besides the fake proxy origin
request) so a mod_h2 PR tried to fix that but the logic is now incorrect.
Let's finally use the same logic as ap_basic_http_header().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895336 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 24 Nov 2021 17:49:47 +0000 (17:49 +0000)]
mod_proxy: SetEnv proxy-nohalfclose to disable half-close tunneling. PR 65662.
Some connect/wstunnel protocols might want half-close forwarding while some
might not, let's provide an r->subprocess_env opt-out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895304 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 24 Nov 2021 10:56:20 +0000 (10:56 +0000)]
* mod_md: resurrection of r1893969 after accidental overwrite in r1894610
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895287 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 24 Nov 2021 10:20:52 +0000 (10:20 +0000)]
* test: updating modules/md eab test for file feature
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895286 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 24 Nov 2021 10:13:42 +0000 (10:13 +0000)]
*) mod_md: values for External Account Binding (EAB) can
now also be configured to be read from a separate JSON
file. This allows to keep server configuration permissions
world readable without exposing secrets.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895285 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 18 Nov 2021 11:44:17 +0000 (11:44 +0000)]
* HTTP2 test image: make sure all mpms are build, so we can test event and worker
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895147 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 17 Nov 2021 15:25:00 +0000 (15:25 +0000)]
Sync r1895107 from libapreq.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895108 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 16 Nov 2021 00:15:22 +0000 (00:15 +0000)]
Sync r1895075 from libapreq.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895076 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 15 Nov 2021 14:56:23 +0000 (14:56 +0000)]
Sync r1895054 from libapreq.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895055 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 14 Nov 2021 11:22:07 +0000 (11:22 +0000)]
Sync r1895020 and r1895021 from libapreq.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1895023 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 12 Nov 2021 21:47:09 +0000 (21:47 +0000)]
apreq: Sync r1894983 from libapreq.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1894986 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 12 Nov 2021 21:46:11 +0000 (21:46 +0000)]
apreq: Sync r1894982 from libapreq.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1894985 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 12 Nov 2021 14:11:57 +0000 (14:11 +0000)]
apreq: Sync r1894977 from libapreq.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1894978 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 11 Nov 2021 11:16:23 +0000 (11:16 +0000)]
*) mod_http2: always return an EOS bucket for requests
that have no body on c2 connection input filter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1894949 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 11 Nov 2021 02:33:41 +0000 (02:33 +0000)]
apreq: Sync r1894940 from libapreq.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1894941 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 11 Nov 2021 02:09:02 +0000 (02:09 +0000)]
apreq: Sync latest changes from lib apreq.
r1867789, r1894935 and r1894937.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1894939 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 10 Nov 2021 15:54:27 +0000 (15:54 +0000)]
* testsuite: possible now to issue client certificates and the chain file for them
* testsuite: handling of cert+key in same file improved
* testsuite: using 'stop' configuration to terminate server in case test cases
leave borked test configs lying around.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1894919 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 8 Nov 2021 14:40:44 +0000 (14:40 +0000)]
* test HTTP/2: also run core tests and worker mpm
* test/README.pytest on how to use pytest suite and
add test cases.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1894835 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 8 Nov 2021 12:33:46 +0000 (12:33 +0000)]
* test: just general cleanup and separation
- base modules loaded minimized
- h2's htdocs/cgi setup now in test/modules/http2
- less args to constructors, more methods
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1894832 13f79535 -47bb-0310-9956-
ffa450edef68