1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

33103 Commits

Author SHA1 Message Date
Jim Jagielski
5580072659 Post 2.4.63 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/tags/2.4.63-candidate@1923281 13f79535-47bb-0310-9956-ffa450edef68
2.4.63-candidate
2025-01-20 19:03:14 +00:00
Jim Jagielski
0480942e92 Tag branches/2.4.x@1923279 as 2.4.63
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/tags/2.4.63-candidate@1923280 13f79535-47bb-0310-9956-ffa450edef68
2025-01-20 19:01:57 +00:00
Jim Jagielski
27fdcd234a Prep for rolling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923279 13f79535-47bb-0310-9956-ffa450edef68
2025-01-20 19:01:18 +00:00
Joe Orton
c732147095 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
2025-01-20 12:53:06 +00:00
Joe Orton
d14aa6c69b 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
2025-01-20 11:03:42 +00:00
Joe Orton
657f33c08e Merged x2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923249 13f79535-47bb-0310-9956-ffa450edef68
2025-01-20 10:28:26 +00:00
Joe Orton
c8c469b3a9 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
2025-01-20 10:27:52 +00:00
Joe Orton
000cd2291d 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
2025-01-20 10:24:13 +00:00
Joe Orton
516588e880 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
2025-01-20 10:19:28 +00:00
Rainer Jung
018567c117 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
2025-01-19 19:48:34 +00:00
Rainer Jung
0acf2161c6 *) 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
2025-01-19 19:32:14 +00:00
Christophe Jaillet
bf53e15088 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
2025-01-19 11:05:36 +00:00
Christophe Jaillet
5162ed4a77 Propose
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923219 13f79535-47bb-0310-9956-ffa450edef68
2025-01-19 11:02:51 +00:00
Christophe Jaillet
ce298cac39 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
2025-01-19 08:15:40 +00:00
Rainer Jung
192345c2c2 Vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923190 13f79535-47bb-0310-9956-ffa450edef68
2025-01-17 19:28:16 +00:00
Jim Jagielski
9b9d1d387b 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
2025-01-17 18:36:28 +00:00
Stefan Eissing
e36b2c3f7e 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
2025-01-17 16:15:26 +00:00
Christophe Jaillet
908ce90ff2 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
2025-01-16 20:06:13 +00:00
Rainer Jung
5e628e7a06 Space police.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923172 13f79535-47bb-0310-9956-ffa450edef68
2025-01-16 17:56:33 +00:00
Stefan Eissing
db1a2d5d0c update changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923151 13f79535-47bb-0310-9956-ffa450edef68
2025-01-15 13:00:00 +00:00
Stefan Eissing
3759641d1d 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
2025-01-15 12:59:16 +00:00
Rainer Jung
125cfe993b Remove duplicate item.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923149 13f79535-47bb-0310-9956-ffa450edef68
2025-01-15 12:50:58 +00:00
Jim Jagielski
7ed7c02f1a And backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923146 13f79535-47bb-0310-9956-ffa450edef68
2025-01-15 12:04:18 +00:00
Jim Jagielski
c8c5aef865 *) 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
2025-01-15 12:03:59 +00:00
Jim Jagielski
0e76f5bd01 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
2025-01-15 12:02:49 +00:00
Jim Jagielski
650ab34a37 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923143 13f79535-47bb-0310-9956-ffa450edef68 2025-01-15 11:52:12 +00:00
Jim Jagielski
84a9b978e7 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
2025-01-15 11:51:28 +00:00
Jean-Frederic Clere
4c8fb018a8 Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923132 13f79535-47bb-0310-9956-ffa450edef68
2025-01-14 14:29:52 +00:00
Yann Ylavic
5e0802362e 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
2025-01-14 11:33:12 +00:00
Jim Jagielski
52883ded79 Propose backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923125 13f79535-47bb-0310-9956-ffa450edef68
2025-01-14 10:19:39 +00:00
Jim Jagielski
049d8f004f Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923124 13f79535-47bb-0310-9956-ffa450edef68
2025-01-14 09:52:12 +00:00
Lucien Gentis
18b2154374 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
2025-01-11 15:01:12 +00:00
Lucien Gentis
17f9aac28b 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
2025-01-11 14:59:23 +00:00
Christophe Jaillet
330bad16d0 Propose
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923017 13f79535-47bb-0310-9956-ffa450edef68
2025-01-09 21:00:39 +00:00
Christophe Jaillet
933f4bd3ab 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
2025-01-08 21:15:20 +00:00
Christophe Jaillet
fb3d30ecd7 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
2025-01-08 20:59:12 +00:00
Christophe Jaillet
fa4c1beee2 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
2025-01-08 20:38:11 +00:00
Eric Covener
269126ac65 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
2025-01-08 18:33:50 +00:00
Eric Covener
a9cea52ad1 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
2025-01-08 18:33:12 +00:00
Jim Jagielski
14d63949b3 Record merges
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1922975 13f79535-47bb-0310-9956-ffa450edef68
2025-01-07 20:10:03 +00:00
Jim Jagielski
db449098ea Record merges
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1922973 13f79535-47bb-0310-9956-ffa450edef68
2025-01-07 20:09:16 +00:00
Jim Jagielski
10545e0435 Record merges
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1922972 13f79535-47bb-0310-9956-ffa450edef68
2025-01-07 20:08:23 +00:00
Eric Covener
2072671e86 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
2025-01-07 19:36:19 +00:00
Jim Jagielski
7539602140 And committed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1922969 13f79535-47bb-0310-9956-ffa450edef68
2025-01-07 16:54:08 +00:00
Jim Jagielski
cfea547b83 Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1922968 13f79535-47bb-0310-9956-ffa450edef68
2025-01-07 16:53:52 +00:00
Jim Jagielski
d901b869de 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
2025-01-07 16:53:26 +00:00
Jim Jagielski
c7bda07bd8 VOTE
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1922966 13f79535-47bb-0310-9956-ffa450edef68
2025-01-07 16:52:24 +00:00
Jim Jagielski
c6a2675440 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
2025-01-07 16:48:45 +00:00
Jim Jagielski
e216a14fb0 Update docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1922963 13f79535-47bb-0310-9956-ffa450edef68
2025-01-07 15:09:42 +00:00
Jim Jagielski
6056e353d4 *) 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
2025-01-07 15:07:55 +00:00