]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Giovanni Bechis [Fri, 2 Feb 2024 14:19:28 +0000 (14:19 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915542 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 2 Feb 2024 11:56:09 +0000 (11:56 +0000)]
Done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915540 13f79535 -47bb-0310-9956-
ffa450edef68
jorton [Fri, 2 Feb 2024 11:55:30 +0000 (11:55 +0000)]
Merge r1874101, r1913838 from trunk:
fix build with LibreSSL 2.0.7+
PR: 64047
Follow up to r1874101: Axe useless LIBRESSL_VERSION_NUMBER check.
Since the fix to MODSSL_USE_OPENSSL_PRE_1_1_API in r1908537, we are sure that
!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL
in this block.
Submitted by: gbechis, ylavic
Reviewed by: ylavic, minfrin, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915539 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 2 Feb 2024 11:51:48 +0000 (11:51 +0000)]
Vote, done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915535 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 2 Feb 2024 11:50:07 +0000 (11:50 +0000)]
Merge r1909450 from trunk:
Make sources build with latest clang version
Submitted by: icing
Reviewed by: minfrin, ylavic, jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915534 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 2 Feb 2024 11:48:27 +0000 (11:48 +0000)]
Done/vote/propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915533 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Fri, 2 Feb 2024 09:02:15 +0000 (09:02 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915530 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 1 Feb 2024 16:54:40 +0000 (16:54 +0000)]
Merge r1861793, r1862612, r1862724, r1877251, r1907672 from trunk:
Add support for SHA-2 crypt() algorithm in htpasswd.
* configure.in: Detect SHA-2 support in crypt().
* support/passwd_common.h: Define ALG_CRYPT_SHA256, ALG_CRYPT_SHA512,
include ap_config_auto.h.
* support/htpasswd.c (check_args): Allow -2, -5, -r arguments for
SHA-256, SHA-256 and rounds options respectively.
* support/passwd_common.c
(parse_common_options): Parse -2, -5, -r args.
(mkhash): Generate crypt hash for SHA256/SHA512 algorithms.
Update transform.
* support/htpasswd.c (usage): More usage fixes for SHA-2; describe
as "secure", leave bcrypt only algorithm described as "very secure".
* support/passwd_common.c (mkhash): Fix salt buffer size for SHA2
(caught by gcc 10).
configure: Assume crypt() does not support SHA-2 when cross-compiling.
Can be forced with "./configure ap_cv_crypt_sha2=yes ..." still.
* configure.in:
Give AC_RUN_IFELSE a cross-compiling action, otherwise it fails with:
configure: error: cannot run test program while cross compiling
Submitted by: jorton, ylavic
Reviewed by: minfrin, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915516 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 1 Feb 2024 16:48:40 +0000 (16:48 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915515 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 1 Feb 2024 12:24:00 +0000 (12:24 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915510 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 1 Feb 2024 11:00:22 +0000 (11:00 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915509 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 31 Jan 2024 16:40:33 +0000 (16:40 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915498 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 31 Jan 2024 15:42:06 +0000 (15:42 +0000)]
Merged x1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915497 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 31 Jan 2024 15:41:38 +0000 (15:41 +0000)]
Merge r1811831 from trunk:
* server/util_script.c (ap_add_common_vars): Allow mod_env to override
all system path environment variables, not just PATH. (The
behaviour for PATH alone was changed in r965679 for PR 43906.)
Submitted by: jorton
Reviewed by: minfrin, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915496 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 31 Jan 2024 15:37:13 +0000 (15:37 +0000)]
Vote, propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915495 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 Jan 2024 14:25:50 +0000 (14:25 +0000)]
Merge r1915423 from trunk:
fill in empty descriptions from command_rec
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915424 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 24 Jan 2024 14:46:36 +0000 (14:46 +0000)]
Updated typo NWGNUmakefile
dependencies was spelled dependancies.
Submitted by: StevenSedwick <
133059415 +StevenSedwick@users.noreply.github.com>
(Also applied to trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915381 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 17 Jan 2024 12:53:02 +0000 (12:53 +0000)]
* Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915288 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 17 Jan 2024 08:41:32 +0000 (08:41 +0000)]
propose r1915281 for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915282 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 Jan 2024 15:12:46 +0000 (15:12 +0000)]
Tweak formatting, remove a non-user-visible change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915069 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 Jan 2024 15:11:51 +0000 (15:11 +0000)]
Updated after merged backports.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915068 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 Jan 2024 15:03:35 +0000 (15:03 +0000)]
Merge r1914318 from trunk:
mod_ssl: Follow up to r1908537: Fix typo s/MODSSL_USE_ENGINE_API/MODSSL_HAVE_ENGINE_API/
Submitted by: ylavic
Reviewed by: ylavic, minfrin, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915067 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 Jan 2024 15:02:30 +0000 (15:02 +0000)]
Merge r1914013 from trunk:
mod_xml2enc: remove dependency on xmlstring header
Submitted by: ttachi <tachihara hotmail.com>
Github: closes #393
Reviewed by: covener, minfrin, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915066 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 Jan 2024 15:00:51 +0000 (15:00 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1915065 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 23 Dec 2023 10:31:02 +0000 (10:31 +0000)]
Fix a typo (missing "t")
s/redisribution/redistribution/
PR 67018 [<hanskrentel yahoo.de>]
r1914884 on trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914885 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 23 Dec 2023 09:43:42 +0000 (09:43 +0000)]
Fix the authorization types that support expressions.
r1914881 in trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914882 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 21 Dec 2023 15:19:52 +0000 (15:19 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914826 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 19 Dec 2023 15:45:40 +0000 (15:45 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914782 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Mon, 11 Dec 2023 14:38:05 +0000 (14:38 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914538 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 4 Dec 2023 17:50:12 +0000 (17:50 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914333 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 4 Dec 2023 16:35:58 +0000 (16:35 +0000)]
Late fix for r1913912, plus comment about new proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914323 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 2 Dec 2023 09:54:18 +0000 (09:54 +0000)]
Update proposal to include r1914281.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914283 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Nov 2023 16:06:47 +0000 (16:06 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914116 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Nov 2023 16:05:35 +0000 (16:05 +0000)]
fr doc XML file ipdate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914115 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 24 Nov 2023 17:13:34 +0000 (17:13 +0000)]
Update LDAP proposal, reset the vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914093 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 22 Nov 2023 17:38:48 +0000 (17:38 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914049 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 22 Nov 2023 17:31:48 +0000 (17:31 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914047 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 22 Nov 2023 17:26:58 +0000 (17:26 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914046 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Nov 2023 14:07:45 +0000 (14:07 +0000)]
xforms
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914042 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Nov 2023 14:05:03 +0000 (14:05 +0000)]
Merge r1914039, r1914040 from trunk:
remove apachehaus
I've read in two places they are no longer providing builds,
and the website is currently down.
[skip ci]
mention httpd.conf and install root dependency
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914041 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 21 Nov 2023 13:01:12 +0000 (13:01 +0000)]
add contributor patch for libxml2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1914014 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 20 Nov 2023 18:08:25 +0000 (18:08 +0000)]
Resume vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913989 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 20 Nov 2023 16:45:34 +0000 (16:45 +0000)]
Update proposal as per recommendation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913987 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 20 Nov 2023 13:17:25 +0000 (13:17 +0000)]
Backport to v2.4:
*) core: Fix use after free warning with gcc -fanalyzer.
trunk patch: http://svn.apache.org/r1892413
2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-use-after-free.patch
+1: minfrin, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913983 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 20 Nov 2023 13:16:10 +0000 (13:16 +0000)]
Backport to 2.4:
*) Allow mod_dav_fs to tolerate race conditions between PROPFIND and an
operation which removes a directory/file between apr_dir_read() and
apr_stat(). Current behaviour is to abort the connection which seems
inferior to tolerating (and logging) the error.
trunk patch: http://svn.apache.org/r1910811
2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-tolerant.patch
+1: minfrin, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913982 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 20 Nov 2023 13:14:21 +0000 (13:14 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913981 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 20 Nov 2023 12:56:10 +0000 (12:56 +0000)]
Suspend vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913980 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 20 Nov 2023 12:34:08 +0000 (12:34 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913978 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 20 Nov 2023 12:02:29 +0000 (12:02 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913976 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 20 Nov 2023 08:57:09 +0000 (08:57 +0000)]
* Update mergeinfo with merges from r1913907
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913973 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 19 Nov 2023 10:42:46 +0000 (10:42 +0000)]
Update proposal with ylavic's fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913961 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 18 Nov 2023 15:16:49 +0000 (15:16 +0000)]
More votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913945 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 15:10:02 +0000 (15:10 +0000)]
Backport to v2.4:
*) mod_ldap: HTML-escape data in ldap-status handler
trunk patch: http://svn.apache.org/r1913855
2.4.x patch svn merge -c
1913855 ^/httpd/httpd/trunk .
+1: covener, minfrin, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913944 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 14:50:10 +0000 (14:50 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913943 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 14:48:34 +0000 (14:48 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913942 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 14:37:58 +0000 (14:37 +0000)]
Add proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913940 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 18 Nov 2023 14:37:11 +0000 (14:37 +0000)]
Vote, promote, comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913939 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 14:24:36 +0000 (14:24 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913937 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 14:17:11 +0000 (14:17 +0000)]
Update vote, note need for mmn bump.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913936 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 18 Nov 2023 13:59:56 +0000 (13:59 +0000)]
Keep my initial comment for better understanding.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913935 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 18 Nov 2023 13:55:45 +0000 (13:55 +0000)]
Update proposal, vote/comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913934 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Nov 2023 13:55:20 +0000 (13:55 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913933 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Nov 2023 13:53:43 +0000 (13:53 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913932 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Nov 2023 13:50:58 +0000 (13:50 +0000)]
Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913931 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 13:28:45 +0000 (13:28 +0000)]
Add proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913929 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 12:47:53 +0000 (12:47 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913925 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 12:37:48 +0000 (12:37 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913921 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 12:00:25 +0000 (12:00 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913918 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 11:53:57 +0000 (11:53 +0000)]
Fix revision number, vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913916 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 11:42:57 +0000 (11:42 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913914 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 11:38:04 +0000 (11:38 +0000)]
Add comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913913 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 11:34:12 +0000 (11:34 +0000)]
Backport to v2.4.
*) mod_ssl: Improve compatibility with OpenSSL 3, fix build warnings about
deprecated ENGINE_ API, honor OPENSSL_API_COMPAT setting while defaulting
to compatibitily with version 1.1.1 (including ENGINEs / SSLCryptoDevice).
mod_ssl: Disable the OpenSSL ENGINE API when OPENSSL_NO_ENGINE is set.
Allow for "SSLCryptoDevice builtin" if the ENGINE API is not available,
notably with OpenSSL >= 3. PR 68080.
trunk patch: http://svn.apache.org/r1908537
http://svn.apache.org/r1908539
http://svn.apache.org/r1908542
http://svn.apache.org/r1913616
http://svn.apache.org/r1913815
http://svn.apache.org/r1913816
http://svn.apache.org/r1908542
http://svn.apache.org/r1913832
2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/381.diff
(https://github.com/apache/httpd/pull/381)
+1: ylavic, jorton, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913912 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 11:33:06 +0000 (11:33 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913911 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 11:20:14 +0000 (11:20 +0000)]
Backport to v2.4:
*) mod_ssl: release memory to the OS when needed
Trunk version of patch:
https://svn.apache.org/r1898410
https://svn.apache.org/r1898366
svn merge -c
1898366 ^/httpd/httpd/trunk .
svn merge -c
1898410 ^/httpd/httpd/trunk .
+1: gbechis, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913909 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 11:19:16 +0000 (11:19 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913908 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 11:08:42 +0000 (11:08 +0000)]
Backport to v2.4:
*) mod_proxy: Allow to set a TTL for how long DNS resolutions to backend
systems are cached.
In order to solve merge conflicts this proposal also backports:
mod_proxy: Add optional third argument for ProxyRemote, which
configures Basic authentication credentials to pass to the remote
proxy. PR 37355. (r1881790)
mod_proxy: Ignore (and warn about) enablereuse=on for ProxyPassMatch when
some dollar substitution (backreference) happens in the hostname or port
part of the URL. (r1904513)
Trunk version of patch:
https://svn.apache.org/r1881790
https://svn.apache.org/r1904513
https://svn.apache.org/r1909400
https://svn.apache.org/r1909401
https://svn.apache.org/r1909402
https://svn.apache.org/r1909451
https://svn.apache.org/r1912459
https://svn.apache.org/r1913432
https://svn.apache.org/r1913534
Backport version for 2.4.x of patch:
https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/390.diff
Can be applied via apply_backport_pr.sh 390
+1: rpluem, ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913907 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 11:03:33 +0000 (11:03 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913906 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 18 Nov 2023 10:14:42 +0000 (10:14 +0000)]
Recreate the patch with r1745033 included, reset the vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913905 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 16 Nov 2023 20:12:09 +0000 (20:12 +0000)]
propose
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913856 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Nov 2023 15:31:32 +0000 (15:31 +0000)]
Adding CHANGES entry (w/o resetting Joe's vote..).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913841 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 16 Nov 2023 15:20:46 +0000 (15:20 +0000)]
Vote x2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913840 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Nov 2023 15:06:28 +0000 (15:06 +0000)]
Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913839 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Nov 2023 13:20:17 +0000 (13:20 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913836 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Nov 2023 12:06:45 +0000 (12:06 +0000)]
Propose OpenSSL 3 -Werror backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913834 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 16 Nov 2023 12:00:36 +0000 (12:00 +0000)]
ci: Disable ASan's LeakSanitizer.
The tool sometimes/somehow crashes in CI, though I can't reproduce locally.
Possibly an issue with the gcc toolchain used there.. disable for now as it
makes the tests fail.
Merges r1913830 from trunk (CTR).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913833 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 16 Nov 2023 10:52:20 +0000 (10:52 +0000)]
Update svn:mergeinfo to add r1614823-
1614824
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913831 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 16 Nov 2023 10:11:56 +0000 (10:11 +0000)]
Update svn:mergeinfo with set of revs merged in r1787728
from branches/2.4.x-openssl-1.1.0-compat
Revision list obtained from:
svn log --stop-on-copy ^/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat | grep ^Backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913829 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 2 Nov 2023 16:23:21 +0000 (16:23 +0000)]
* As r1913534 is now added this is a +1 [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913539 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 2 Nov 2023 15:31:39 +0000 (15:31 +0000)]
* Update proposal [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913536 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 2 Nov 2023 15:30:52 +0000 (15:30 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913535 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 1 Nov 2023 16:08:19 +0000 (16:08 +0000)]
fr doc small corrections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913500 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 31 Oct 2023 10:28:22 +0000 (10:28 +0000)]
Merge of /httpd/httpd/trunk:r1913466
* mod_md: Fix the reported "until" validity of a certificate in the status
handler. [Rainer Jung]
Fix possible NULL deref when logging the error that an authentication
resource could not be retrieved from the ACME server. [Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913467 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 30 Oct 2023 16:04:09 +0000 (16:04 +0000)]
* Update proposal [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913445 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 30 Oct 2023 15:27:34 +0000 (15:27 +0000)]
* Update mergeinfo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913444 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 30 Oct 2023 15:22:20 +0000 (15:22 +0000)]
* Update mergeinfo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913443 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 30 Oct 2023 15:03:15 +0000 (15:03 +0000)]
Merge r1913441 from trunk:
* Fix .gdbinit directory location
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913442 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 30 Oct 2023 14:44:54 +0000 (14:44 +0000)]
Merge r1913439 from trunk:
* .gdbinit is one level deeper
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913440 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 30 Oct 2023 14:23:18 +0000 (14:23 +0000)]
Merge r1913437 from trunk:
* Systemd based systems might process core dumps via systemd-coredump.
But we want to have local unprocessed files.
Reviewed by: ruediger
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913438 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 30 Oct 2023 12:32:42 +0000 (12:32 +0000)]
Merge r1910668 from trunk:
pyhttpd: Generate core dumps on crash and show them in the ci eventually.
Reviewed by: ruediger (CI stuff is CTR)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913435 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 27 Oct 2023 14:07:47 +0000 (14:07 +0000)]
fr doc small corrections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1913389 13f79535 -47bb-0310-9956-
ffa450edef68