]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Giovanni Bechis [Fri, 3 Jun 2022 15:29:31 +0000 (15:29 +0000)]
typo [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901597 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 3 Jun 2022 14:37:23 +0000 (14:37 +0000)]
Compile CHANGES.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901593 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 3 Jun 2022 08:27:35 +0000 (08:27 +0000)]
update after backport
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901587 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 3 Jun 2022 08:27:07 +0000 (08:27 +0000)]
Merge Pull 321 (trunk: r1874005, r1877261, r1901470):
*) mod_ssl: SSLFIPS compatible with OpenSSL 3.0. PR 66063.
[Petr Sumbera <petr.sumbera oracle.com>, Yann Ylavic]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901586 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 3 Jun 2022 08:21:13 +0000 (08:21 +0000)]
update after backport
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901585 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 3 Jun 2022 08:20:42 +0000 (08:20 +0000)]
Merge pull 319 (trunk: r1901420, r1901446, r1901485, r1901486):
*) mod_proxy_http: Avoid 417 responses for non forwardable 100-continue.
PR 65666. [Yann Ylavic]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901584 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Fri, 3 Jun 2022 07:42:23 +0000 (07:42 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901582 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 2 Jun 2022 20:03:36 +0000 (20:03 +0000)]
Remove backported items
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901568 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 2 Jun 2022 20:02:50 +0000 (20:02 +0000)]
Merge r1756843, r1897890, r1898731, r1900064, r1900077 from trunk
* mod_auth_digest: Fix some missed "strcasecmp <--> ap_cstr_casecmp" conversions
* mod_dav: fix a typo
* mod_lua: Avoid "may be uninitialized" warning
* ab: Fix alignment in an 'if' block.
* mod_authz_dbd: fix select-groups example, bz 66010
Submitted by: jailletc36, rpluem, rpluem, jailletc36, gbechis
Reviewed by: jailletc36, ylavic, rpluem
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901567 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 2 Jun 2022 11:37:53 +0000 (11:37 +0000)]
* Vote and promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901556 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 2 Jun 2022 09:59:22 +0000 (09:59 +0000)]
Sync CHANGES [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901552 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 2 Jun 2022 09:41:28 +0000 (09:41 +0000)]
Merge of r1901549 from trunk:
*) mod_md: update version after release on github.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901550 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 2 Jun 2022 09:19:37 +0000 (09:19 +0000)]
Merge of r1901546 from trunk:
update of mod_md change description.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901547 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Jun 2022 13:48:21 +0000 (13:48 +0000)]
mod_proxy_ajp: T-E has precedence over C-L.
Merge r1901521 from trunk.
Submitted by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901522 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Jun 2022 13:15:19 +0000 (13:15 +0000)]
Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901519 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Jun 2022 13:12:08 +0000 (13:12 +0000)]
Sync docs again [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901518 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Jun 2022 12:58:38 +0000 (12:58 +0000)]
Merge r1901512 from trunk:
add LWP::Protocol::AnyEvent::http
it can be used to workaround a bug with hitting mod_echo_post
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901513 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Jun 2022 12:53:42 +0000 (12:53 +0000)]
Merge r1901510 from trunk:
mention limit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901511 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Jun 2022 12:50:40 +0000 (12:50 +0000)]
Merge r1901506 from trunk:
limit mod_sed memory use
Resync mod_sed.c with trunk due to merge conflicts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901509 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Jun 2022 12:38:03 +0000 (12:38 +0000)]
Merge r1901504 from trunk:
mod_isapi: use consistent filename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901505 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Jun 2022 12:36:39 +0000 (12:36 +0000)]
Merge r1901502 from trunk:
use filters consistently
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901503 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Jun 2022 12:34:16 +0000 (12:34 +0000)]
Merge r1901500 from trunk:
handle large writes in ap_rputs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901501 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Jun 2022 12:31:48 +0000 (12:31 +0000)]
Merge r1901497 from trunk:
use a liberal default limit for LimitRequestBody of 1GB
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901499 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Jun 2022 12:31:19 +0000 (12:31 +0000)]
Merge r1901496 from trunk:
cast first
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901498 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 1 Jun 2022 12:21:45 +0000 (12:21 +0000)]
Merge r1901494 from trunk:
fix types
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901495 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Jun 2022 11:51:42 +0000 (11:51 +0000)]
Sync docs [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901493 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Jun 2022 11:50:37 +0000 (11:50 +0000)]
Note about Absolute URL redirects w.r.t. query-string in mod_rewrite [skip ci]
Merge r1901487 from trunk.
Submitted by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901492 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 1 Jun 2022 11:26:11 +0000 (11:26 +0000)]
Propose, vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901490 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Jun 2022 11:06:17 +0000 (11:06 +0000)]
Remove duplicate CHANGES entry, slightly reformat others.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901488 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 1 Jun 2022 07:51:27 +0000 (07:51 +0000)]
cleanup after backport [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901481 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 1 Jun 2022 07:51:04 +0000 (07:51 +0000)]
Merge r1901461 from trunk via #320:
*) mod_proxy: ap_proxy_create_hdrbrgd() to clear hop-by-hop first and fixup last.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901480 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 1 Jun 2022 07:49:30 +0000 (07:49 +0000)]
vote and promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901479 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 1 Jun 2022 06:41:54 +0000 (06:41 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901475 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 31 May 2022 16:03:45 +0000 (16:03 +0000)]
Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901462 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 25 May 2022 19:59:32 +0000 (19:59 +0000)]
Vote
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901257 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 25 May 2022 19:49:59 +0000 (19:49 +0000)]
Easy proposals
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901256 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 25 May 2022 12:10:29 +0000 (12:10 +0000)]
update after backport [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901236 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 25 May 2022 12:10:08 +0000 (12:10 +0000)]
vote and promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901235 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 25 May 2022 12:09:36 +0000 (12:09 +0000)]
Merge /httpd/httpd/trunk:r1899858,
1899865 ,
1899884 ,
1900991
*) mpm_event, mpm_worker: Handle children killed pathologically.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901234 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 25 May 2022 11:49:56 +0000 (11:49 +0000)]
Merge of r1901088 from trunk:
*) mod_proxy_connect: Ensure that the configured timeout is set on the
backend socket.
Trunk version of patch:
https://svn.apache.org/r1901088
Backport version for 2.4.x of patch:
Trunk version of patch works
svn merge -c
1901088 ^/httpd/httpd/trunk .
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901233 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 25 May 2022 11:47:59 +0000 (11:47 +0000)]
vote and promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901232 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 25 May 2022 11:45:05 +0000 (11:45 +0000)]
Merge /httpd/httpd/trunk:r1901230
*) mod_md: a logic bug in sending long OCSP HTTP request bodies was fixed.
This did not happen in normal use as request sizes for OSCP queries
never exceed that length.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901231 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 May 2022 09:08:07 +0000 (09:08 +0000)]
Backported in r1901203 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901205 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 May 2022 09:07:27 +0000 (09:07 +0000)]
Sync CHANGES [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901204 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 May 2022 09:06:42 +0000 (09:06 +0000)]
ab: Allow for TLSv1.3 when the SSL library supports it.
When TLS1_3_VERSION is defined by the SSL library, bump the maximum TLS
protocol to that and use it for "-f ALL" or "-f TLSv1.3".
This mixes proposed patches from BZ 63594 and 64699.
BZ: 63594, 64699
Merge r1900157 from trunk:
Submitted by: abhilash <abhilash1232 gmail.com>
Submitted by: xiaolongx.jiang intel.com
Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901203 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 May 2022 09:03:58 +0000 (09:03 +0000)]
Backported in r1901201 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901202 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 May 2022 09:03:30 +0000 (09:03 +0000)]
core: Disable TCP_NOPUSH optimization on OSX. BZ 66019.
OSX supports TCP_NOPUSH but does not release the data retained (in TCP stack)
when the option is unset. It seems that unsetting it before the last write
does not help either so just disable the optimization for OSX in the core
output filter to avoid uncontrollable transmission delays.
* server/core_filters.c():
Add the sock_nopush() helper that does nothing on OSX and platforms not
supporting TCP_NOPUSH or TCP_CORK.
* server/core_filters.c(send_brigade_nonblocking):
Use sock_nopush() instead of apr_socket_opt_set() for APR_TCP_NOPUSH option.
Merge r1900100 from trunk.
Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901201 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 May 2022 09:00:51 +0000 (09:00 +0000)]
Backported in r1901199 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901200 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 May 2022 09:00:19 +0000 (09:00 +0000)]
mpm_event: Fix accounting of active/total processes on ungraceful restart.
Children processes terminated by ap_{reclaim,relieve}_child_processes() were
were not un-accounted for total_daemons and active_daemons, which was done in
server_main_loop() only. This led to perform_idle_server_maintenance() thinking
it was over the limit of children processes and never create new ones.
Have this accounting right in event_note_child_{started,stopped}() which is
called both at runtime and reload time.
* server/mpm/event/event.c(struct event_retained_data):
Rename field max_daemons_limit to max_daemon_used to better describe what
it's about and to align with AP_MPMQ_MAX_DAEMON_USED.
* server/mpm/event/event.c(event_note_child_stopped):
Renamed from event_note_child_killed() to clarify that it's not only called
when a child is killed (i.e. on restart) but whenever a child has stopped.
* server/mpm/event/event.c(event_note_child_stopped):
Move decrementing {active,total}_daemons and marking child's threads as
SERVER_DEAD from server_main_loop() so that it's done both at runtime and
reload time. Log the current number/state of daemons at APLOG_DEBUG level
for each child stopped.
* server/mpm/event/event.c(event_note_child_started):
Move incrementing {active,total}_daemons from make_child() for symmetry,
given that make_child() calls event_note_child_started(). Log the current
number/state of daemons at APLOG_DEBUG level for each child started.
* server/mpm/event/event.c(perform_idle_server_maintenance):
Fix possible miscounting of retained->max_daemon_used accross the multiple
calls to perform_idle_server_maintenance() if ListenCoresBucketsRatio > 0.
Pass an int *max_daemon_used which starts at zero and is bumped consistently
for all the buckets, while retained->max_daemon_used is updated only after
all the buckets have been maintained.
* server/mpm/event/event.c(perform_idle_server_maintenance):
Use event_note_child_stopped() to handle exited children processes.
Follow up to r1899777: CHANGES entry.
mpm_event: Follow up to r1899777: Fix max_daemon_used.
Merge r1899777, r1899786, r1899812 from trunk.
Fixes: BZ 66004
Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901199 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 May 2022 08:56:14 +0000 (08:56 +0000)]
Backported in r1901196 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901197 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 May 2022 08:55:16 +0000 (08:55 +0000)]
*) core: make ap_escape_quotes() work correctly on strings
with more than MAX_INT/2 characters, counting quotes double.
Credit to <generalbugs@zippenhop.com> for finding this.
*) core: improved checks in ap_escape_quotes() for
extra long strings (or resulting strings) that
exceed ptrdiff_t ranges.
Merge r1899609, r1899905 from trunk.
Reviewed by: icing, rpluem, ylavic
Submitted by: icing, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901196 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 May 2022 09:27:17 +0000 (09:27 +0000)]
Votes, promotes, [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901158 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 23 May 2022 07:33:54 +0000 (07:33 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901148 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 23 May 2022 07:16:01 +0000 (07:16 +0000)]
* Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901147 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 May 2022 15:09:33 +0000 (15:09 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901104 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 May 2022 15:08:32 +0000 (15:08 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901103 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 19 May 2022 18:44:15 +0000 (18:44 +0000)]
Merge r1901071 from trunk:
escaping doesn't actually happen by default
otherwise, we would not have [B] and two internal escape functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901072 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 18 May 2022 12:48:33 +0000 (12:48 +0000)]
Sync CHANGES entries [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901036 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 17 May 2022 18:28:08 +0000 (18:28 +0000)]
Add back changes-entries/mod_proxy_log_backend_port.txt
which was removed erroneously by r1901009.
It is needed to document the changes applied by
r1900957 (backport of r1900028).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901013 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 17 May 2022 18:19:36 +0000 (18:19 +0000)]
Merge r1900356 from trunk:
*) mod_http2: remove unused and insecure code. Fixes PR66037.
Thanks to Ronald Crane (Zippenhop LLC) for reporting this.
Submitted by: icing
Reviewed by: jailletc36, icing, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901010 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 17 May 2022 18:17:44 +0000 (18:17 +0000)]
Merge r from trunk:
Submitted by: icing, rpluem, ylavic
Reviewed by: jim
Github: closes #317
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901009 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 17 May 2022 18:14:29 +0000 (18:14 +0000)]
Merge r1900335 from trunk:
Harden mod_session and avoid overflow in case of indecently large session
Submitted by: jailletc36
Reviewed by: jailletc36, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901008 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 17 May 2022 18:13:11 +0000 (18:13 +0000)]
Merge from trunk:
Submitted by: jim
Reviewed by:
1900340
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901007 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 17 May 2022 16:01:10 +0000 (16:01 +0000)]
Note missing link [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1901000 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 17 May 2022 15:56:17 +0000 (15:56 +0000)]
More proposals [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900999 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 17 May 2022 15:47:31 +0000 (15:47 +0000)]
Note associated PR [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900998 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 17 May 2022 15:43:34 +0000 (15:43 +0000)]
Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900997 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 17 May 2022 15:27:39 +0000 (15:27 +0000)]
Add missing revision in merge command [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900996 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 17 May 2022 15:26:33 +0000 (15:26 +0000)]
Vote, promote [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900995 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 May 2022 13:32:43 +0000 (13:32 +0000)]
Merge /httpd/httpd/trunk:r1899841
mod_heartmonitor: Fix setting and comparison of IPs fields.
Setting or comparing hm_server_t and hm_slot_server_t IPs should not be base
on MAXIPSIZE since the former is potentially a smaller const char*.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900986 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 16 May 2022 12:40:52 +0000 (12:40 +0000)]
Remove backported entry
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900958 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 16 May 2022 12:39:54 +0000 (12:39 +0000)]
mod_proxy: Add backend port to log messages to
ease identification of involved service.
Merge r1900028 from trunk.
Submitted by: rjung
Reviewed by: rjung, jim, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900957 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 16 May 2022 11:38:37 +0000 (11:38 +0000)]
Merge /httpd/httpd/trunk:r1900875
*) test: switch rustls-ffi to v0.9.0 which gets
rid of the cbindgen dependency.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900952 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 16 May 2022 11:36:20 +0000 (11:36 +0000)]
Merge /httpd/httpd/trunk:r1900852,
1900887
*) mod_md: the `MDCertificateAuthority` directive can take more than one URL/name of
an ACME CA. This gives a failover for renewals when several consecutive attempts
to get a certificate failed.
A new directive was added: `MDRetryDelay` sets the delay of retries.
A new directive was added: `MDRetryFailover` sets the number of errored
attempts before an alternate CA is selected for certificate renewals.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900950 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 16 May 2022 07:43:03 +0000 (07:43 +0000)]
* Promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900941 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 16 May 2022 07:41:15 +0000 (07:41 +0000)]
* Vote and comment [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900940 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 16 May 2022 07:06:29 +0000 (07:06 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900939 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 13 May 2022 17:06:09 +0000 (17:06 +0000)]
Remove backported entry
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900864 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 13 May 2022 17:05:31 +0000 (17:05 +0000)]
Merge r1898453 from trunk
* mod_lua: ap_lua_init_mutex() is not about thread only. It also calls
apr_global_mutex_child_init(). So I see no good reason to skip this hook
if !APR_HAS_THREADS.
Some #if APR_HAS_THREADS are also already in place in
ap_lua_init_mutex() anyway.
Submitted by: jailletc36
Reviewed by: jaillect36, ylavic, rpluem
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900863 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 11 May 2022 08:20:43 +0000 (08:20 +0000)]
*) test: log rustc and cbindget versions used to build rustls-ffi
to speed up analysis of any problems in the future.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900805 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 11 May 2022 08:02:02 +0000 (08:02 +0000)]
*) test: backport the cbindgen workaround for building rustls-ffi
so that rustc and cbindget are in a combination that works on
focal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900804 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 May 2022 18:02:07 +0000 (18:02 +0000)]
Merge r1899451, r1899454, r1899562, r1899564, r1899584, r1899886 from trunk:
* Close the connection in case an EOC bucket was seen
* In case we see an EOC bucket and there was an error bucket before, use its
status as status for the request. This should ensure proper status logging
in the access log.
* We need to set r->status on each call after we noticed an EOC as
data bucket generators like ap_die might have changed the status
code. But we know better in this case and insist on the status
code that we have seen in the error bucket.
* Keep track of the number of keepalives we processed on this connection.
* Report a broken backend in case reading the response line failed on the
first request on this connection otherwise we assume we have just run
into a keepalive race and the backend is still healthy.
* Add Changelog for r1899451, r1899454, r1899562, r1899564, r1899584
Submitted by: rpluem
Reviewed by: jim
Github: closes #314
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900755 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 May 2022 17:57:48 +0000 (17:57 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900754 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 May 2022 17:55:29 +0000 (17:55 +0000)]
r1900751.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900753 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 May 2022 17:55:06 +0000 (17:55 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900752 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 May 2022 17:54:42 +0000 (17:54 +0000)]
Merge r1900026 from trunk:
*) mod_heartmonitor: Set the documented default value
"10" for HeartbeatMaxServers instead of "0". With "0"
no shared memory slotmem was initialized. [Rainer Jung]
Submitted by: rjung
Reviewed by:
1899841
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900751 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 May 2022 17:53:20 +0000 (17:53 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900750 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 May 2022 17:08:33 +0000 (17:08 +0000)]
Xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900747 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 8 May 2022 12:28:51 +0000 (12:28 +0000)]
Fix a typo (s/virtal/virtual) and add a missing hyper-link.
r1900689 in trunk
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900690 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 May 2022 14:39:09 +0000 (14:39 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900657 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 May 2022 14:38:22 +0000 (14:38 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900656 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 6 May 2022 13:16:36 +0000 (13:16 +0000)]
Merge /httpd/httpd/trunk:r1900628
*) mod_md: fixed a bug leading to failed transfers for OCSP
stapling information when more than 6 certificates needed
updates in the same run.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900629 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 6 May 2022 08:26:05 +0000 (08:26 +0000)]
* Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900620 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 5 May 2022 08:37:49 +0000 (08:37 +0000)]
propose backport h2 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900579 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 4 May 2022 17:50:35 +0000 (17:50 +0000)]
httpd 2.4.x and above require at least APR 1.3, so this is always the case.
Simplify the wording in the doc.
r1900557 in trunk
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900558 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 3 May 2022 19:58:01 +0000 (19:58 +0000)]
httpd 2.4.x and above require at least APR 1.3, so this is always the case.
Simplify the wording in the doc.
r1900525 in trunk
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900526 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Apr 2022 15:48:22 +0000 (15:48 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900428 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Apr 2022 15:47:34 +0000 (15:47 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900427 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 30 Apr 2022 10:07:06 +0000 (10:07 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900423 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 30 Apr 2022 09:41:10 +0000 (09:41 +0000)]
Propose
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1900421 13f79535 -47bb-0310-9956-
ffa450edef68