]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Joe Orton [Wed, 9 Apr 2025 15:53:57 +0000 (15:53 +0000)]
Merge r1921307, r1921308, r1921309 from trunk:
CI: Flush the CPAN cache if /usr/bin/perl has been updated since
the cache was built. Possible fix for 2.4.x failure seen here:
https://github.com/apache/httpd/actions/runs/
11322484507 /job/
31483266212
SSLeay.c: loadable library and perl binaries are mismatched (got first handshake key 0xeb00080, needed 0xf380080)
perldiag(1) describes this as a mismatch between libraries and binaries,
likely solved by reinstalling XS modules:
https://github.com/Perl/perl5/blob/
77b78882c76e7461ccc4dcf2eb3afb9644836a72 /pod/perldiag.pod#L3617
CI: Second attempt to fix stale XS cache issue.
Cache the "perl -V" output and flush the cache if it changes.
CI: Fix borked test for perl -V in r1921308.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924964 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 9 Apr 2025 15:18:19 +0000 (15:18 +0000)]
Merge r1924958 from trunk:
CI: Use the git commit hash to determine the revision of APR/APR-util
from the github repos, and build exactly that, rather than relying on SVN:
- works if apr/apr-util moves to a r/w git in the future
- removes a race for branches where the git revision tested
could be different to the SVN revision retrieved before
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924962 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 3 Apr 2025 14:42:41 +0000 (14:42 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924759 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 27 Mar 2025 08:50:24 +0000 (08:50 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924655 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 27 Mar 2025 08:41:50 +0000 (08:41 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924654 13f79535 -47bb-0310-9956-
ffa450edef68
rpluem [Thu, 27 Mar 2025 08:26:46 +0000 (08:26 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924652 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 26 Mar 2025 16:05:24 +0000 (16:05 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924637 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 24 Mar 2025 12:51:52 +0000 (12:51 +0000)]
propose back port
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924555 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 6 Mar 2025 08:37:00 +0000 (08:37 +0000)]
update log tag revision for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924198 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 4 Mar 2025 09:10:56 +0000 (09:10 +0000)]
update backport revisions with proper module name in change entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924165 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 3 Mar 2025 12:34:48 +0000 (12:34 +0000)]
proposing r1924145 for back port
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924146 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 3 Mar 2025 11:45:31 +0000 (11:45 +0000)]
Nominate mod_lua fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1924144 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 14 Feb 2025 10:06:52 +0000 (10:06 +0000)]
added
1923806 to scoreboard backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923807 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 14 Feb 2025 09:16:37 +0000 (09:16 +0000)]
Merged x1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923805 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 14 Feb 2025 09:16:23 +0000 (09:16 +0000)]
Merge r1917017, r1923218 from trunk:
* server/core.c (set_override): Catch errors returned by
set_allow_opts() for a parsing fail in an Options= argument.
Submitted by: Zhou Qingyang <zhou1615 umn.edu>
Github: closes #310
Add a Changes entry related to r1917017
While at it, fix a small style issue (tab vs spaces)
Submitted by: jorton, jailletc36
Reviewed by: rjung (reduce code drift), jorton, jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923804 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 14 Feb 2025 09:13:41 +0000 (09:13 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923803 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 12 Feb 2025 09:47:35 +0000 (09:47 +0000)]
proposing r1923754 for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923755 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 10 Feb 2025 14:29:27 +0000 (14:29 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923699 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 10 Feb 2025 14:22:43 +0000 (14:22 +0000)]
* Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923697 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 5 Feb 2025 12:41:51 +0000 (12:41 +0000)]
*) mod_md: full squash of all changes in trunk, since people
do changes and miss proposing them for backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923593 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 31 Jan 2025 14:38:37 +0000 (14:38 +0000)]
Merge r1923479 from trunk:
CI: Try to cope with CentOS Stream containers being out-of-sync with
the yum repos when building the slapd container.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923480 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 23 Jan 2025 20:50:10 +0000 (20:50 +0000)]
publishing release httpd-2.4.63
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923339 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 20 Jan 2025 20:33:47 +0000 (20:33 +0000)]
Vote
(thanks for fixing my Cut'n'Paste mistake with the trunk commit to backport)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923287 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Jan 2025 19:01:18 +0000 (19:01 +0000)]
Prep for rolling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923279 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 20 Jan 2025 12:53:06 +0000 (12:53 +0000)]
Merge r1915651, r1916381, r1920589, r1923133 from trunk: [under CTR for docs]
mod_dav: Update redirect-carefully example BrowserMatch config to
match more recent client versions.
PR: 66148, 67039
Submitted by: Michal Maloszewski <michal.maloszewski canonical.com>
Fix BrowserMatch for gvfs.
PR: 66148
Submitted by: Romain Tartière <romain blogreen.org>
Add jxl mime type
Submitted by: printfn <printfn users.noreply.github.com>
Github: closes #478
Fix typo in charset.conv
\"Croation\" is a misspelling. It should be \"Croatian\".
Submitted by: Michael Hospedales <hospedales me.com>
Github: closes #508
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923263 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 20 Jan 2025 11:03:42 +0000 (11:03 +0000)]
Update mergeinfo for already-merged mod_cgi/cgid changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923253 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 20 Jan 2025 10:28:26 +0000 (10:28 +0000)]
Merged x2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923249 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 20 Jan 2025 10:27:52 +0000 (10:27 +0000)]
Merge r1916054 from trunk:
mod_ssl: Check SSL_CTX_new() return value
SSL_CTX_new() will return NULL if there was an error creating a new SSL context.
Submitted by: StephenWall
Github: closes #402
Reviewed by: jailletc36, rjung, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923248 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 20 Jan 2025 10:24:13 +0000 (10:24 +0000)]
Merge r1921067 from trunk:
* Take care for the case where nkey is NULL
PR: 69358
Reported by: <zhora.budyukin111 gmail.com>
Submitted by: rpluem
Reviewed by: jailletc36, rjung, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923247 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 20 Jan 2025 10:19:28 +0000 (10:19 +0000)]
Vote x3, promote x2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923246 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 19 Jan 2025 19:48:34 +0000 (19:48 +0000)]
Three votes.
Fix one revision number and restart vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923239 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 19 Jan 2025 19:32:14 +0000 (19:32 +0000)]
*) mod_http2: fix test_h2_200_17+18 for newer curl versions. Just add log
output and add to test checks. No functional change.
Merges r1923187 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923238 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 19 Jan 2025 11:05:36 +0000 (11:05 +0000)]
Fix proposal
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923220 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 19 Jan 2025 11:02:51 +0000 (11:02 +0000)]
Propose
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923219 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 19 Jan 2025 08:15:40 +0000 (08:15 +0000)]
Rebuild the doc
build.sh all
Mostly some s/2024/2025/ stuff
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923216 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 17 Jan 2025 19:28:16 +0000 (19:28 +0000)]
Vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923190 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 17 Jan 2025 18:36:28 +0000 (18:36 +0000)]
looks safe to me. Tests OK too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923189 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 17 Jan 2025 16:15:26 +0000 (16:15 +0000)]
propose backport of h2 test fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923188 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 16 Jan 2025 20:06:13 +0000 (20:06 +0000)]
Sanitize some bugzilla referrences that break one of my script.
s/BZ/PR/
Remove ":" between PR and bug number
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923174 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 16 Jan 2025 17:56:33 +0000 (17:56 +0000)]
Space police.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923172 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 15 Jan 2025 13:00:00 +0000 (13:00 +0000)]
update changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923151 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 15 Jan 2025 12:59:16 +0000 (12:59 +0000)]
Merge /httpd/httpd/trunk:r1923148
*) mod_md: update to version 2.4.31
- Improved error reporting when waiting for ACME server to verify domains
or finalizing the order fails, e.g. times out.
- Increasing the timeouts to wait for ACME server to verify domain names
and issue the certificate from 30 seconds to 5 minutes.
- Change a log level from error to debug when Stapling is enabled but a
certificate carries no OCSP responder URL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923150 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 15 Jan 2025 12:50:58 +0000 (12:50 +0000)]
Remove duplicate item.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923149 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 15 Jan 2025 12:04:18 +0000 (12:04 +0000)]
And backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923146 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 15 Jan 2025 12:03:59 +0000 (12:03 +0000)]
*) Do not add a space before '|' when setting the value for stickysession in the
balancer manager as this breaks the stickysession configuration once a new
configuration is submitted by the balancer manager. PR: 69510
trunk patch: https://svn.apache.org/r1923101
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923145 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 15 Jan 2025 12:02:49 +0000 (12:02 +0000)]
Update CHANGES via 'make update-changes'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923144 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 15 Jan 2025 11:52:12 +0000 (11:52 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923143 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 15 Jan 2025 11:51:28 +0000 (11:51 +0000)]
svn merge -c
1910518 ,
1910847 ,
1912477 ,
1918297 ^/httpd/httpd/trunk .
*) Easy patches: synch 2.4.x and trunk
- ab: Increase MAX_CONCURRENCY hard limit (from 20K to 200K)
- ab: Fix X509 * leak
- dav/fs/dbm.c: Remove error message references to "property" databases
- httpd.h: Fix comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923142 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 14 Jan 2025 14:29:52 +0000 (14:29 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923132 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 14 Jan 2025 11:33:12 +0000 (11:33 +0000)]
2 votes, 1 promotion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923127 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 14 Jan 2025 10:19:39 +0000 (10:19 +0000)]
Propose backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923125 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 14 Jan 2025 09:52:12 +0000 (09:52 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923124 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Jan 2025 15:01:12 +0000 (15:01 +0000)]
fr doc rebuild with new year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923075 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 11 Jan 2025 14:59:23 +0000 (14:59 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923074 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 9 Jan 2025 21:00:39 +0000 (21:00 +0000)]
Propose
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923017 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 8 Jan 2025 21:15:20 +0000 (21:15 +0000)]
Use <highlight language="config"> instead of <example> in order to have syntax highlight work correctly.
r1923003 on trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923004 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 8 Jan 2025 20:59:12 +0000 (20:59 +0000)]
Rebuild prettify.min.js as well, it's much more useful
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923002 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 8 Jan 2025 20:38:11 +0000 (20:38 +0000)]
Rebuild tag list for prettify.js
./build.sh prettify
+ manual updating of prettify.js based on "list_for_prettify.txt"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1923001 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 8 Jan 2025 18:33:50 +0000 (18:33 +0000)]
xforms to restore site
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922996 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 8 Jan 2025 18:33:12 +0000 (18:33 +0000)]
escape brackets
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922995 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 20:10:03 +0000 (20:10 +0000)]
Record merges
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922975 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 20:09:16 +0000 (20:09 +0000)]
Record merges
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922973 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 20:08:23 +0000 (20:08 +0000)]
Record merges
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922972 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 7 Jan 2025 19:36:19 +0000 (19:36 +0000)]
make update-changes
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922971 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 16:54:08 +0000 (16:54 +0000)]
And committed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922969 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 16:53:52 +0000 (16:53 +0000)]
Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922968 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 16:53:26 +0000 (16:53 +0000)]
As per Email on dev@
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922967 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 16:52:24 +0000 (16:52 +0000)]
VOTE
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922966 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 16:48:45 +0000 (16:48 +0000)]
oops... cut/paste error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922965 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 15:09:42 +0000 (15:09 +0000)]
Update docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922963 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 15:07:55 +0000 (15:07 +0000)]
*) mod_lua: Make r.ap_auth_type writable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922962 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 15:07:17 +0000 (15:07 +0000)]
*) mod_log_config: Fix LogFormat directive merging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922961 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 15:06:41 +0000 (15:06 +0000)]
*) mod_http2: Fix failed request counting and keepalive timeout
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922960 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 15:06:06 +0000 (15:06 +0000)]
*) mod_proxy_fcgi: Fix proxy-fcgi-pathinfo=full
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922959 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 15:05:35 +0000 (15:05 +0000)]
*) mod_proxy: Honor parameters of ProxyPassMatch workers with substitution
in the host name or port. PR 69233.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922958 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 15:04:23 +0000 (15:04 +0000)]
*) Add the ldap-search option to mod_authnz_ldap, allowing authorization
to be based on arbitrary expressions that do not include the username.
Make sure that when ldap searches are too long, we explicitly log the
error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922957 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 15:00:40 +0000 (15:00 +0000)]
*) Easy patches: synch 2.4.x and trunk
- server: Use apr_size_t instead of int to harden against overflows
- mod_http2: DOXYGEN has nothing to do here, just remove this
strange "#if defined(DOXYGEN)"
- test: make the compiler happy when using --enable-maintainer-mode
- mod_proxy: Fix format string type check
- mod_http2: Fix comment, no functional change
- <various>: Remove unnecessary APLOGNO() use in TRACE-level logging
- mod_cache_socache: Update comment only, to remove reference to
session cache
- mod_dav: Fix error message formatting if an unauthenticated user
tries to use an authenticated user's lock token
- <none>: trigger ci
- server: Fix typo in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922956 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 14:15:15 +0000 (14:15 +0000)]
Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922955 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 7 Jan 2025 14:14:25 +0000 (14:14 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922954 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 7 Jan 2025 08:48:13 +0000 (08:48 +0000)]
Review x1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922946 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 7 Jan 2025 08:46:13 +0000 (08:46 +0000)]
Merged.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922945 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 7 Jan 2025 08:45:31 +0000 (08:45 +0000)]
Merge r1921971 from trunk:
* modules/aaa/mod_authnz_ldap.c (create_authnz_ldap_dir_config): Fix allocation
of sgAttributes, found by gcc -fanalyzer:
modules/aaa/mod_authnz_ldap.c: scope_hint: In function 'create_authnz_ldap_dir_config'
modules/aaa/mod_authnz_ldap.c:356:23: warning[-Wanalyzer-allocation-size]: allocated buffer size is not a multiple of the pointee's size
Reviewed by: jorton, jailletc36, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922944 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 6 Jan 2025 20:25:14 +0000 (20:25 +0000)]
quick votes
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922932 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 6 Jan 2025 19:17:17 +0000 (19:17 +0000)]
xform
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922930 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 6 Jan 2025 19:16:37 +0000 (19:16 +0000)]
fix value inconsistency in LimitXMLRequestBody example
value of 1 MiB =
1048576
Submitted by: Chenjp <ch_jp@msn.com>
backport from
1922928 .
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922929 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 3 Jan 2025 16:26:07 +0000 (16:26 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922864 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Jan 2025 11:13:49 +0000 (11:13 +0000)]
Happy New Year 2025
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922819 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 14 Dec 2024 15:16:07 +0000 (15:16 +0000)]
Easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922498 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 13 Dec 2024 15:49:24 +0000 (15:49 +0000)]
One more small patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922467 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 13 Dec 2024 15:10:51 +0000 (15:10 +0000)]
2 small backports.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922466 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 12 Dec 2024 17:54:24 +0000 (17:54 +0000)]
Merge r1921310, r1922412 from trunk: [CTR for CI changes]
CI: Further fixes for ubuntu-latest image updates on GitHub Actions.
CI: Switch down to GCC 12, the ubuntu-latest image is not consistently
an Ubuntu 24.04 environment yet, this version should be available in
both the -22.04 and -24.04 images.
Github: closes #498
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922457 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 11 Dec 2024 12:44:56 +0000 (12:44 +0000)]
Merge /httpd/httpd/trunk:r1922429
*) mod_md: change log level from error to debug when MDStapling
is enabled but a certificate carries no OCSP url.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922430 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Dec 2024 14:43:13 +0000 (14:43 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922365 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Dec 2024 14:42:23 +0000 (14:42 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922364 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 3 Dec 2024 09:59:46 +0000 (09:59 +0000)]
Merge /httpd/httpd/trunk:r1922279
*) mod_md: update to version 2.4.29
- Fixed HTTP-01 challenges to not carry a final newline, as some ACME
server fail to ignore it. [Michael Kaufmann (@mkauf)]
- Fixed missing label+newline in server-status plain text output when
MDStapling is enabled.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922280 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 1 Dec 2024 14:17:20 +0000 (14:17 +0000)]
xforms
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922248 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 1 Dec 2024 14:17:01 +0000 (14:17 +0000)]
Merge r1922246 from trunk:
Don't use AuthFormLoginRequiredLocation in inline
Intro to inline says:
If a non-authenticated user attempts to access a page protected by
mod_auth_form that isn't configured with a AuthFormLoginRequiredLocation
directive, a HTTP_UNAUTHORIZED status code is returned to the browser
indicating to the user that they are not authorized to view the page.
The entire point seems to be to keep the URL the same by using an internal redirect
via ErrorDocument, and AuthFormLoginRequiredLocation conflicts with it.
Submitted By: Rishikeshan Lavakumar/Sulochana <oss AT @rishikeshan.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922247 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Nov 2024 13:05:06 +0000 (13:05 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922236 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Nov 2024 13:04:13 +0000 (13:04 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922235 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 27 Nov 2024 15:41:21 +0000 (15:41 +0000)]
xforms
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1922172 13f79535 -47bb-0310-9956-
ffa450edef68