]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
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
Stefan Eissing [Mon, 30 Aug 2021 10:21:55 +0000 (10:21 +0000)]
propose for backport. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892730 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 Aug 2021 13:05:01 +0000 (13:05 +0000)]
Trigger ci.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892572 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 Aug 2021 12:45:12 +0000 (12:45 +0000)]
Backported [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892570 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 Aug 2021 12:44:28 +0000 (12:44 +0000)]
Merge r1891206, r1891216, r1891284 from trunk:
mod_proxy: Fix possible reuse/merging of Proxy(Pass)Match workers. PR 65419.
We can't truncate ProxyMatch's worker name/url to the first '$' substitution
without possibly colliding with other workers. This also makes the matching
done at runtime by ap_proxy_strcmp_ematch() completely pointless.
To fix this and still address r1878467 (i.e. make http://host:port$1 a "valid"
URL), we need to remove '$' substitutions from the :port part of the URL only
since it's allowed anywhere else by apr_uri_parse().
So let's strip them before apr_uri_parse() and prepend them back in the path
before apr_uri_unparse() to restore the original URL. Non-matchable workers are
not concerned so ap_proxy_define_worker() is made a local helper (w/o the ap_
prefix) which takes "matchable" as argument and can then be called by both
ap_proxy_define_[match_]worker() functions.
mod_proxy: Follow up to r1891206: fix UDS scheme.
mod_proxy: Avoid confusion of prefix/regex matching workers at loading. PR 65429.
ap_proxy_get_worker() needs to know whether it should lookup for prefix or
match or both matching workers, depending on the context.
For instance <Proxy[Match]> or ProxyPass[Match] directives need to lookup for
an existing worker with the same type as the directive (*Match or not), because
they will define one with that matching type if none exists.
On the contrary, "ProxySet <url>" at load time or ap_proxy_pre_request() at run
time need to find a worker matching an url whether it's by prefix or by regex.
So this commit adds ap_proxy_get_worker_ex() which takes a bitmask for the
matching type and calls it appropriately where needed.
For consistency, ap_proxy_define_worker_ex() is also added, using the same
bitmask flags, deprecating ap_proxy_define_match_worker().
Follow up to r1891206.
Github: closes #261
Submitted by: ylavic
Reviewed by: ylavic, minfrin, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892569 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 24 Aug 2021 12:23:34 +0000 (12:23 +0000)]
vote and promote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892568 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 22 Aug 2021 10:30:48 +0000 (10:30 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892525 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 22 Aug 2021 10:18:40 +0000 (10:18 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892524 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 22 Aug 2021 10:00:00 +0000 (10:00 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892523 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 22 Aug 2021 09:51:33 +0000 (09:51 +0000)]
Backport:
*) back port the add of balancer_manage in mod_proxy_balancer.
trunk patch: http://svn.apache.org/r1859235
http://svn.apache.org/r1887176
http://svn.apache.org/r1887359
http://svn.apache.org/r1887144
Backport version for 2.4.x of patch:
https://people.apache.org/~jfclere/patches/patch.210810.txt
+1: jfclere, jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892522 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 22 Aug 2021 09:49:30 +0000 (09:49 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892521 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Aug 2021 22:55:47 +0000 (22:55 +0000)]
Backport:
*) mod_dav: Add method_precondition hook. WebDAV extensions define
conditions that must exist before a WebDAV method can be executed.
This hook allows a WebDAV extension to verify these preconditions.
trunk patch: http://svn.apache.org/r1879339
http://svn.apache.org/r1879340
2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-preconditions1.patch
+1: minfrin, jim, ylavic (by inspection)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892514 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Aug 2021 22:52:29 +0000 (22:52 +0000)]
Backport:
*) Add hooks deliver_report and gather_reports to mod_dav.h. Allows other
modules apart from versioning implementations to handle the REPORT method.
trunk patch: http://svn.apache.org/r1879339
http://svn.apache.org/r1879307
2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-hooks1.patch
+1: minfrin, jim, ylavic (by inspection)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892513 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Aug 2021 22:47:34 +0000 (22:47 +0000)]
Backport:
*) Add dav_get_provider(), dav_open_lockdb(), dav_close_lockdb() and
dav_get_resource() to mod_dav.h.
trunk patch: http://svn.apache.org/r1879305
http://svn.apache.org/r1879466
2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions6.patch
+1: minfrin, jim, ylavic (by inspection)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892512 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Aug 2021 21:35:04 +0000 (21:35 +0000)]
Backport:
*) core: fix ap_escape_quotes substitution logic
trunk patch: https://svn.apache.org/r1892418
2.4.x patch: svn merge -c
1892418 ^/httpd/httpd/trunk .
+1: covener, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892511 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Aug 2021 21:30:47 +0000 (21:30 +0000)]
Backport:
*) Easy patches: synch 2.4.x and trunk
- mod_auth_basic: Use ap_cstr_casecmp instead of strcasecmp.
- mod_ldap: log and abort locking errors.
- mod_ldap: style fix for r1831165
- mod_ldap: build break fix for r1831165
--> These 3 commits are preparation work for backporting r1856735
- mod_deflate: Avoid hard-coded "%ld" format strings in mod_deflate's logging statements
- mod_deflate: Use apr_uint64_t instead of uint64_t (follow up to r1849590)
- mod_forensic: Follow up to r1856490: missing one mod_log_forensic test_char_table case.
(r1856490 has been backported in r1870261)
- mod_rewrite: Save a few cycles.
- mod_request: Fix a comment (missing '_' in 'keep_body') and some style issues
- core: remove extra whitespace in HTTP_NOT_IMPLEMENTED
trunk patch:
https://svn.apache.org/r1817063
https://svn.apache.org/r1831165
https://svn.apache.org/r1831171
https://svn.apache.org/r1831172
https://svn.apache.org/r1849590
https://svn.apache.org/r1849630
https://svn.apache.org/r1856491
https://svn.apache.org/r1883421
https://svn.apache.org/r1889327
https://svn.apache.org/r1891200
2.4.x patch: svn merge -c
1817063 ,
1831165 ,
1831171 ,
1831172 ,
1849590 ,
1849630 ,
1856491 ,
1883421 ,
1889327 ,
1891200 ^/httpd/httpd/trunk .
+1: jailletc36, covener, jim
icing: I have trouble running the svn merge due to conflicts in CHANGES and
the infamous log tags. Do you have a patch or a PR to use for checking?
covener: on faith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892510 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Aug 2021 14:19:31 +0000 (14:19 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892494 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Aug 2021 14:18:25 +0000 (14:18 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892493 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Aug 2021 10:13:54 +0000 (10:13 +0000)]
Vote, promote [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892469 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 18 Aug 2021 15:24:49 +0000 (15:24 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892424 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 18 Aug 2021 14:52:08 +0000 (14:52 +0000)]
propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892421 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 16 Aug 2021 14:30:57 +0000 (14:30 +0000)]
update after merge. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892381 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 16 Aug 2021 14:30:06 +0000 (14:30 +0000)]
Merge
1892185 ,
1892207 from trunk:
*) core: ap_timeout_parameter_parse UBI fuzz fix followup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892380 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 16 Aug 2021 14:03:04 +0000 (14:03 +0000)]
Cast some votes!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892378 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 16 Aug 2021 13:15:28 +0000 (13:15 +0000)]
Vote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892375 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 16 Aug 2021 11:57:35 +0000 (11:57 +0000)]
Update MMN.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892370 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 16 Aug 2021 08:21:04 +0000 (08:21 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892357 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 11 Aug 2021 10:50:43 +0000 (10:50 +0000)]
add apr15 compat [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892208 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 10 Aug 2021 20:38:37 +0000 (20:38 +0000)]
Vote
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892194 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 10 Aug 2021 18:54:53 +0000 (18:54 +0000)]
propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892186 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 10 Aug 2021 09:40:53 +0000 (09:40 +0000)]
update (fix) my back port proposal) [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892175 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 09:00:15 +0000 (09:00 +0000)]
update after merges. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892174 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:59:48 +0000 (08:59 +0000)]
Merge of
1892038 ,
1892063 from trunk:
*) core: avoid signed integer overflow under fuzzing in
ap_timeout_parameter_parse
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892173 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:59:17 +0000 (08:59 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892172 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:55:54 +0000 (08:55 +0000)]
Merged r1892012 from trunk:
*) core: fix ap_escape_quotes for pre-escaped quotes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892171 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:54:55 +0000 (08:54 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892170 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:51:33 +0000 (08:51 +0000)]
moving accepted patch into other section
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892169 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:43:32 +0000 (08:43 +0000)]
update after merge [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892168 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:43:11 +0000 (08:43 +0000)]
Merged r1891919 from trunk:
*) core: add hook child_stopping hook that gets called when the MPM is stopping a
child process. The additional graceful parameter allows registered hooks
to free resources early during a graceful shutdown.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892167 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:32:57 +0000 (08:32 +0000)]
update after merge [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892166 13f79535 -47bb-0310-9956-
ffa450edef68