]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Eric Covener [Fri, 3 Mar 2023 14:20:27 +0000 (14:20 +0000)]
backport
1906428 ,
1906433 ,
1907993 from trunk
add rotatelogs -T to truncate all but the first-opened file.
+ docs tweak for compat
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908025 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 2 Mar 2023 19:52:56 +0000 (19:52 +0000)]
Note about a typo in a comment
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907994 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 2 Mar 2023 15:22:48 +0000 (15:22 +0000)]
Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907982 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 2 Mar 2023 15:14:18 +0000 (15:14 +0000)]
Vote, promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907981 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 2 Mar 2023 13:31:29 +0000 (13:31 +0000)]
* Vote and promote [Skip CI]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907970 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 2 Mar 2023 10:00:12 +0000 (10:00 +0000)]
Remove tests which don't work for 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907962 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 2 Mar 2023 09:58:30 +0000 (09:58 +0000)]
Merge r1891497, r1906480, r1906482, r1906501, r1907235, r1907235, r1907236, r1907237, r1907506, r1907506, r1907670, r1907960 from trunk:
* Allow to load /home/travis/build/apache/httpd/.gdbinit
Prep for GitHub actions: move CPAN handling into test scripts,
don't reference /home/travis directly.
Enable simplest CI test cases in GitHub Actions (currently also
still enabled in Travis). Based on apr/trunk.
Limit triggering on non-code changes, try to capture error_log as
an artifact on failure.
Migrate more tests to Github Actions.
Github: fixes #340, fixes #339
Migrate more tests to Github Actions.
Github: fixes #340, fixes #339
Travis RIP, WIP.
Add todo list for GHA migration.
Further migration of tests to GHA, though HTTP/2, ACME and
i386 build testing are all failing so currently disabled.
Caching needs adjusting to use a different model to Travis.
Further migration of tests to GHA, though HTTP/2, ACME and
i386 build testing are all failing so currently disabled.
Caching needs adjusting to use a different model to Travis.
Clear cache for mod_tls test.
Also run CI for PRs against 2.4.x.
Submitted by: rpluem, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907961 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 2 Mar 2023 03:14:35 +0000 (03:14 +0000)]
propose a rotatelogs sync
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907951 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 2 Mar 2023 03:07:24 +0000 (03:07 +0000)]
vote
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907950 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 21 Feb 2023 10:58:48 +0000 (10:58 +0000)]
Broaden RTC exception to "CI configuration" from only referencing
Travis specifically.
Vote: https://lists.apache.org/thread/7wljnw8o5pl0tq71dzsxfvcf21bmqz7o
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907783 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 16 Feb 2023 19:25:27 +0000 (19:25 +0000)]
s/http/https/
These links are visible from the root of the github page. (https://github.com/apache/httpd)
So, https is better than plain http.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907708 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 6 Feb 2023 09:14:02 +0000 (09:14 +0000)]
* Propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907456 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Feb 2023 16:22:54 +0000 (16:22 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907313 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Feb 2023 16:22:03 +0000 (16:22 +0000)]
fr doc XML files update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907312 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 31 Jan 2023 15:06:24 +0000 (15:06 +0000)]
rebuild doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907152 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 31 Jan 2023 15:05:20 +0000 (15:05 +0000)]
Fix order of remote/local IP addresses in ErrorLogFormat example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907151 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 29 Jan 2023 15:41:53 +0000 (15:41 +0000)]
Clarify accepted values for driver names used with 'dbacquire'.
PR 66334
r1907076 in trunk.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907077 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Jan 2023 16:54:08 +0000 (16:54 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907062 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Jan 2023 16:53:07 +0000 (16:53 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907061 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 27 Jan 2023 18:44:42 +0000 (18:44 +0000)]
xforms [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907048 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 27 Jan 2023 18:43:13 +0000 (18:43 +0000)]
docs: no default value for mod_proxy upgrade= parameter. [skip ci]
Merges r1907045 from https://svn.apache.org/repos/asf/httpd/httpd/trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907047 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 27 Jan 2023 18:03:13 +0000 (18:03 +0000)]
xforms [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907043 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 27 Jan 2023 18:01:27 +0000 (18:01 +0000)]
docs: Better mod_proxy_wstunnel vs mod_proxy_http upgrade= documentation.
docs: Add deprecation note for wstunnel, move Upgrade example up for proxy_http.
docs: move mod_proxy_wstunnel deprecation warning up and warn about ANY/NONE protos.
docs: fix typos. [skip ci]
Merges r1907031, r1907035, r1907038, r1907040 from https://svn.apache.org/repos/asf/httpd/httpd/trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907042 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 27 Jan 2023 13:22:38 +0000 (13:22 +0000)]
propose
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1907025 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Jan 2023 13:27:25 +0000 (13:27 +0000)]
rebuild.-Cette ligne, et les suivantes ci-dessous, seront ignorées--
M manual/mod/mod_rewrite.html.fr.utf8
M manual/mod/mod_rewrite.xml.meta
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906862 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Jan 2023 13:26:12 +0000 (13:26 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906861 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 20 Jan 2023 17:39:17 +0000 (17:39 +0000)]
Rebuild docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906841 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 20 Jan 2023 17:37:06 +0000 (17:37 +0000)]
Fix incorrect syntax in <directive> tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906840 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 19 Jan 2023 16:02:14 +0000 (16:02 +0000)]
Cleanup after backport [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906807 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 19 Jan 2023 16:01:46 +0000 (16:01 +0000)]
Merge of r1906775 from trunk:
*) mod_http2: client resets of HTTP/2 streams led to unwanted 500 errors
reported in access logs and error documents. The processing of the
reset was correct, only unneccesary reporting was caused.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906806 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Thu, 19 Jan 2023 10:57:35 +0000 (10:57 +0000)]
mod_http2 vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906800 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Thu, 19 Jan 2023 09:24:58 +0000 (09:24 +0000)]
VOTE mod_http2 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906792 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 18 Jan 2023 20:04:58 +0000 (20:04 +0000)]
Propose r1906775 for backport [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906776 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Tue, 17 Jan 2023 17:17:37 +0000 (17:17 +0000)]
Propose r1902366.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906742 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 17 Jan 2023 16:15:56 +0000 (16:15 +0000)]
publishing release httpd-2.4.55
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906739 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Jan 2023 16:14:05 +0000 (16:14 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906678 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Jan 2023 16:12:26 +0000 (16:12 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906677 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 12 Jan 2023 16:44:38 +0000 (16:44 +0000)]
Rebuild doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906642 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 12 Jan 2023 15:45:46 +0000 (15:45 +0000)]
fix rewriterule syntax, and remove dir-vs-file confusion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906638 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 11 Jan 2023 18:50:11 +0000 (18:50 +0000)]
Addresses bug https://bz.apache.org/bugzilla/show_bug.cgi?id=53108
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906614 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 11 Jan 2023 15:41:11 +0000 (15:41 +0000)]
as per https://lists.apache.org/thread/g36po3tp24xl92s182plxlgv8rnl1hj8
clarify that chained RewriteCond directives are "fast fail".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906607 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 10 Jan 2023 18:05:40 +0000 (18:05 +0000)]
match MOD_HTTP2_VERSION_NUM
(post-rc1)
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906554 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 10 Jan 2023 13:22:51 +0000 (13:22 +0000)]
make update-changes
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906544 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 10 Jan 2023 13:21:48 +0000 (13:21 +0000)]
Merge r1906487 from trunk:
* modules/dav/main/util.c (dav_process_if_header): Fix error
path for "Not" prefix parsing.
Submitted By: jorton
Reviewed By: jorton, covener, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906543 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 10 Jan 2023 13:20:55 +0000 (13:20 +0000)]
Merge r1906540 from trunk:
cleanup on error
Reviewed By: rpluem, gbechis, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906542 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 10 Jan 2023 13:20:09 +0000 (13:20 +0000)]
Merge r1906539 from trunk:
fail on bad header
Submitted By: covener
Reviewed By: covener, rpluem, gbechis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906541 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 10 Jan 2023 12:00:58 +0000 (12:00 +0000)]
* Vote and promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906537 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 9 Jan 2023 21:08:14 +0000 (21:08 +0000)]
Add a compatibility note
r1906520 in trunk
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906521 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 9 Jan 2023 20:46:06 +0000 (20:46 +0000)]
Add a compatibility note for HeartbeatMaxServers 0
Add a missing hyperlink.
r1906517 in trunk
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906518 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 9 Jan 2023 20:28:50 +0000 (20:28 +0000)]
Fix compatibility version for DavLockDiscovery
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906516 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 9 Jan 2023 15:31:48 +0000 (15:31 +0000)]
xforms
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906508 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 9 Jan 2023 15:30:11 +0000 (15:30 +0000)]
update from much later backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906507 13f79535 -47bb-0310-9956-
ffa450edef68
manu [Mon, 9 Jan 2023 14:52:27 +0000 (14:52 +0000)]
*) mod_dav: DAVlockDiscovery option to disable WebDAV lock discovery
This is a game changer for performances if client use PROPFIND a lot,
PR: 66313
Submited by: manu
Reviewed by: manu, covener, gbechis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906506 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 9 Jan 2023 13:33:06 +0000 (13:33 +0000)]
vote
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906500 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 9 Jan 2023 13:28:33 +0000 (13:28 +0000)]
Merge r1889936 from trunk:
mod_proxy_hcheck: Honor worker timeout settings.
Daniel reported on user@ that hc connections do not timeout according to
the worker's tumeout= configuration, this fixes it.
While at it, copy the other timeout settings too.
Reported by: dferradal
Submitted By: rpluem
Reviewed By: rpluem, jorton, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906499 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 9 Jan 2023 13:26:52 +0000 (13:26 +0000)]
Merge r1903744, r1903745, r1904642, r1905646, r1905669 from trunk:
Allow for HTTP/1.1 or HTTP/1.0 protocol health checks
Document hcmethod enhancement to allow HTTP/1.1 comms
catch by CJ
Bump mmn
bump again
+ suppress MMN changes, applied manually in
1906496
Submitted By: jim
Reviewed By: jim, covener, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906498 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 9 Jan 2023 13:23:05 +0000 (13:23 +0000)]
backported
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906497 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 9 Jan 2023 13:22:44 +0000 (13:22 +0000)]
Merge r1904518 from trunk:
*) mod_proxy_hcheck: Re-enable workers in standard ERROR state. PR 66302.
[Alessandro Cavaliere <alessandro.cavalier7 unibo.it>]
+ MMN
Submitted By: jim
Reviewed By: +1: jim, ylavic, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906496 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 9 Jan 2023 13:16:50 +0000 (13:16 +0000)]
Merge r1663123, r1670431 from trunk:
mod_authn_core: Add expression support to AuthName and AuthType.
Add missing APLOGNOs by running
docs/log-message-tags/update-log-msg-tags.
bump version in XML to 2.4.55
Submitted By: minfrin
Reviewed By: minfrin, jim, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906494 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 9 Jan 2023 12:11:34 +0000 (12:11 +0000)]
Merged x2. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906492 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 9 Jan 2023 12:10:49 +0000 (12:10 +0000)]
Fix typo. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906491 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 9 Jan 2023 12:10:33 +0000 (12:10 +0000)]
Merge r1756531 from trunk:
Follow up to r1750392: reduce AH03408 level to INFO as suggested by wrowe/jim.
Submitted by: ylavic
Reviewed by: jorton, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906490 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 9 Jan 2023 12:07:49 +0000 (12:07 +0000)]
Merge r1861269 from trunk:
* modules/ssl/ssl_engine_config.c (ssl_cmd_check_file):
If dumping the config, don't validate the paths. Allows
e.g. "httpd -L" to work w/ certs configured but not present,
doesn't affect "httpd -t".
Reviewed by: jorton, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906489 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 9 Jan 2023 12:03:53 +0000 (12:03 +0000)]
Propose. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906488 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Jan 2023 10:49:13 +0000 (10:49 +0000)]
And promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906484 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Jan 2023 10:48:35 +0000 (10:48 +0000)]
Backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906483 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 9 Jan 2023 07:47:58 +0000 (07:47 +0000)]
update after backport [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906477 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 9 Jan 2023 07:47:29 +0000 (07:47 +0000)]
Merge of httpd/httpd/trunk:r1906051
*) mod_proxy_http2: apply the standard httpd content type handling
to responses from the backend, as other proxy modules do. Fixes PR 66391.
Thanks to Jérôme Billiras for providing the patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906476 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 9 Jan 2023 07:35:18 +0000 (07:35 +0000)]
*) mod_http2: version 2.0.10 of the module, synchronizing changes
with the gitgub version. This is a partial rewrite of how connections
and streams are handled.
- an APR pollset and pipes (where supported) are used to monitor
the main connection and react to IO for request/response handling.
This replaces the stuttered timed waits of earlier versions.
- H2SerializeHeaders directive still exists, but has no longer an effect.
- Clients that seemingly misbehave still get less resources allocated,
but ongoing requests are no longer disrupted.
- Fixed an issue since 1.15.24 that "Server" headers in proxied requests
were overwritten instead of preserved. [PR by @daum3ns]
- A regression in v1.15.24 was fixed that could lead to httpd child
processes not being terminated on a graceful reload or when reaching
MaxConnectionsPerChild. When unprocessed h2 requests were queued at
the time, these could stall. See #212.
- Improved information displayed in 'server-status' for H2 connections when
Extended Status is enabled. Now one can see the last request that IO
operations happened on and transferred IO stats are updated as well.
- 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.
- :scheme pseudo-header values, not matching the
connection scheme, are forwarded via absolute uris to the
http protocol processing to preserve semantics of the request.
Checks on combinations of pseudo-headers values/absence
have been added as described in RFC 7540. Fixes #230.
- A bug that prevented trailers (e.g. HEADER frame at the end) to be
generated in certain cases was fixed. See #233 where it prevented
gRPC responses to be properly generated.
- Request and response header values are automatically stripped of leading
and trialing space/tab characters. This is equivalent behaviour to what
Apache httpd's http/1.1 parser does.
The checks for this in nghttp2 v1.50.0+ are disabled.
- Extensive testing in production done by Alessandro Bianchi (@alexskynet)
on the v2.0.x versions for stability. Many thanks!
*) mod_proxy_http2: fixed #235 by no longer forwarding 'Host:' header when
request ':authority' is known. Improved test case that did not catch that
the previous 'fix' was incorrect.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906475 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 4 Jan 2023 14:37:23 +0000 (14:37 +0000)]
Merge r1477687 from trunk:
mod_dav: mod_dav overrides dav_fs response on PUT failure. PR 35981.
PR: 35981
Reviewed by: rpluem, covener, jorton, gbechis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906393 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 4 Jan 2023 14:31:41 +0000 (14:31 +0000)]
* Promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906392 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 4 Jan 2023 14:29:57 +0000 (14:29 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906391 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Wed, 4 Jan 2023 13:53:47 +0000 (13:53 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906389 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 4 Jan 2023 13:51:58 +0000 (13:51 +0000)]
Vote*2, propose*2. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906388 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 4 Jan 2023 13:21:22 +0000 (13:21 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906386 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 4 Jan 2023 13:13:05 +0000 (13:13 +0000)]
short votes
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906385 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 4 Jan 2023 13:07:03 +0000 (13:07 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906383 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 Dec 2022 13:55:05 +0000 (13:55 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906060 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 17 Dec 2022 10:28:07 +0000 (10:28 +0000)]
proposing r1906051 for backport. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906052 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 15 Dec 2022 09:17:50 +0000 (09:17 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1906007 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 13 Dec 2022 09:11:35 +0000 (09:11 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905954 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 13 Dec 2022 09:10:49 +0000 (09:10 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905953 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Dec 2022 17:05:36 +0000 (17:05 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905905 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Dec 2022 17:04:42 +0000 (17:04 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905904 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 6 Dec 2022 13:41:04 +0000 (13:41 +0000)]
Merge r1905793 from trunk:
PR66374: add some <If> warning notes.
EXEC_ON_READ and similar can't be conditional on runtime checks,
but for backwards compat they aren't yet rejected.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905795 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 3 Dec 2022 15:37:02 +0000 (15:37 +0000)]
Merge r1905716 from trunk:
mention some non-inuititive <If> stuff
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905717 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 1 Dec 2022 17:23:06 +0000 (17:23 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905678 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 1 Dec 2022 17:21:15 +0000 (17:21 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905677 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 1 Dec 2022 13:08:20 +0000 (13:08 +0000)]
bump again
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905670 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 30 Nov 2022 14:46:04 +0000 (14:46 +0000)]
update backport prop w/ mmn bump commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905647 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Nov 2022 19:41:53 +0000 (19:41 +0000)]
vote/promote/comment
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905619 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Nov 2022 18:25:04 +0000 (18:25 +0000)]
remove backported
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905614 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Nov 2022 18:24:38 +0000 (18:24 +0000)]
merge r1905229,r1905404 from trunk;
*) mod_dav: Open the lock database read-only when possible
2.4.x patch: trunk works
Submitted by: manu
Reviewed by: manu, jailletc36, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905613 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Nov 2022 13:28:18 +0000 (13:28 +0000)]
remove backported, sent email on MMN q
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905609 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Nov 2022 13:24:16 +0000 (13:24 +0000)]
Merge r1904516 from trunk:
*) mod_proxy_hcheck: Detect AJP/CPING support correctly. PR 66300.
trunk revision:
Submitted by: jim
Reviewed by: jim, ylavic, icing, jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905608 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Nov 2022 13:21:06 +0000 (13:21 +0000)]
Merge r1903167 from trunk:
*) mod_ssl: fix for PR66190.
Submitted by: icing
Reviewed by: icing, rpluem, ylavic
Github: closes #326
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905607 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Nov 2022 13:19:07 +0000 (13:19 +0000)]
Merge r1727934 from trunk:
exporting mod_http2.h
Submitted by: icing
Reviewed by: icing, rpluem, ylavic
Github: closes #327
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905606 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Nov 2022 13:18:28 +0000 (13:18 +0000)]
make update-changes prior to backports
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905605 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 29 Nov 2022 13:09:00 +0000 (13:09 +0000)]
vote/promote
not resetting votes for changes-entries addition
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905604 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 19 Nov 2022 16:06:48 +0000 (16:06 +0000)]
Vote + add a svn command to ease review for a backport proposal
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1905406 13f79535 -47bb-0310-9956-
ffa450edef68