]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
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
Stefan Eissing [Tue, 10 Aug 2021 08:32:35 +0000 (08:32 +0000)]
*) mod_proxy: Fix icomplete initialization of BalancerMember(s) from the
balancer-manager, which can lead to a crash.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892165 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:27:47 +0000 (08:27 +0000)]
update after backport [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892162 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:27:18 +0000 (08:27 +0000)]
Merged /httpd/httpd/trunk:r1879074-
1879080 ,
1879094 -
1879095 ,
1879110 -
1879112 ,
1879114 ,
1879116 -
1879117 ,
1879137 ,
1879144 -
1879145 ,
1879147 ,
1879149 ,
1879235 ,
1879360
back port the mapping=servlet proxy logic.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892161 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:08:54 +0000 (08:08 +0000)]
update after merge [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892160 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 10 Aug 2021 08:08:12 +0000 (08:08 +0000)]
Merge of
1891716 -
1891719 ,
1891721 ,
1891724 ,
1891726 -
1891728 from trunk:
*) mpm_event: Fix graceful stop/restart of children processes if connections
are in lingering close for too long. [Yann Ylavic]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892159 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 7 Aug 2021 10:43:50 +0000 (10:43 +0000)]
add a revision from review [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892064 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 6 Aug 2021 14:06:11 +0000 (14:06 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892040 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 6 Aug 2021 13:12:21 +0000 (13:12 +0000)]
propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892039 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 4 Aug 2021 11:52:52 +0000 (11:52 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892014 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 4 Aug 2021 11:50:08 +0000 (11:50 +0000)]
propose
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1892013 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 31 Jul 2021 14:18:18 +0000 (14:18 +0000)]
feedback [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891923 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 31 Jul 2021 14:17:04 +0000 (14:17 +0000)]
vote and promote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891922 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 31 Jul 2021 14:15:21 +0000 (14:15 +0000)]
vote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891921 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 31 Jul 2021 13:56:49 +0000 (13:56 +0000)]
Backport proposal for core hook child_stopping. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891920 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 28 Jul 2021 15:31:35 +0000 (15:31 +0000)]
Easy proposals
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891857 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Mon, 26 Jul 2021 13:58:44 +0000 (13:58 +0000)]
correct a proposal and vote another one [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891810 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 26 Jul 2021 11:57:10 +0000 (11:57 +0000)]
Review note. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891807 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Jul 2021 21:23:00 +0000 (21:23 +0000)]
Update patch command too [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891739 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Jul 2021 21:12:13 +0000 (21:12 +0000)]
Add missing commit into 2.4.x-bz_65419+65429-v2.patch [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891738 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Jul 2021 18:40:46 +0000 (18:40 +0000)]
CHANGES entries now included in the patches [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891734 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Jul 2021 18:25:17 +0000 (18:25 +0000)]
Vote [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891733 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Jul 2021 18:16:52 +0000 (18:16 +0000)]
Propose fix for PRs 65419 and 65429. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891732 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Jul 2021 17:38:27 +0000 (17:38 +0000)]
Update CHANGES [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891731 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Jul 2021 17:35:21 +0000 (17:35 +0000)]
Propose [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891730 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 20 Jul 2021 16:33:59 +0000 (16:33 +0000)]
Trigger ci.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891691 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 20 Jul 2021 15:04:30 +0000 (15:04 +0000)]
Merge r1891496 from trunk:
* Get a full backtrace
Submitted by: rpluem
Reviewed by: rpluem (CTR)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891688 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 20 Jul 2021 13:07:54 +0000 (13:07 +0000)]
Merged /httpd/httpd/trunk:r1891683
*) mod_md:
- Domain names in `<MDomain ...>` can now appear in quoted form.
- Fixed a failure in ACME challenge selection that aborted further searches
when the tls-alpn-01 method did not seem to be suitable.
- Changed the tls-alpn-01 setup to only become unsuitable when none of the
dns names showed support for a configured 'Protocols ... acme-tls/1'. This
allows use of tls-alpn-01 for dns names that are not mapped to a VirtualHost.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891685 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 12 Jul 2021 08:04:51 +0000 (08:04 +0000)]
Merge: /httpd/httpd/trunk:r1891470
*) mod_md: fixed a potential null pointer dereference if ACME/OCSP
server returned 2xx responses without content type. Reported by chuangwen.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891471 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 9 Jul 2021 12:37:26 +0000 (12:37 +0000)]
s/freenode/libera/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891405 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 9 Jul 2021 12:26:10 +0000 (12:26 +0000)]
s/Freenode/Libera.chat/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891401 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 8 Jul 2021 07:05:04 +0000 (07:05 +0000)]
Merged*1. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891378 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 8 Jul 2021 07:04:49 +0000 (07:04 +0000)]
Merge r1889957 from trunk: [excluding server/mpm/simple changes]
* server/mpm/event/event.c,
server/mpm/simple/simple_run.c,
support/htcacheclean.c: Adjust use of APR_RING macros to
ensure the APR_RING_HEAD is always embedded in a containing
structure, to avoid warnings with GCC 11. (apr_ring.h also
suggests this is best practice)
See also: https://bugzilla.redhat.com/show_bug.cgi?id=
1957353
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98503
msgid <
814cca2a -1992-3fae-bb0e-
c84b3d09b73b @gmail.com>
Github: closes #186
Reviewed by: jorton, minfrin, jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891377 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 8 Jul 2021 06:23:31 +0000 (06:23 +0000)]
vote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891376 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Wed, 7 Jul 2021 06:24:11 +0000 (06:24 +0000)]
backport for proxy mapping=servlet and balancer_manage [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891336 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 6 Jul 2021 16:27:48 +0000 (16:27 +0000)]
new proposal put back Referer check. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891319 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 6 Jul 2021 14:02:14 +0000 (14:02 +0000)]
Trigger ci.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891314 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 6 Jul 2021 12:31:44 +0000 (12:31 +0000)]
backport proposal of r1890693+r1890696, improved alpn check [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891311 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 6 Jul 2021 12:16:20 +0000 (12:16 +0000)]
backport proposal of r1890605 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891309 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 5 Jul 2021 10:26:05 +0000 (10:26 +0000)]
Propose backports to support WebDAV extensions, like CalDAV and DavACL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891281 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 5 Jul 2021 09:05:52 +0000 (09:05 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891278 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 5 Jul 2021 09:01:27 +0000 (09:01 +0000)]
*) back port: Add CPING to health check logic - remove hardcoded timeout.
Trunk version of patch:
https://svn.apache.org/r1887439
Backport version for 2.4.x of patch:
Trunk version of patch works
svn merge -c
1887439 ^/httpd/httpd/trunk .
+1: minfrin, rpluem, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891276 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 2 Jul 2021 14:53:13 +0000 (14:53 +0000)]
Propose, maybe sometime during the weekend the Travis output will turn up.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1891205 13f79535 -47bb-0310-9956-
ffa450edef68