]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
7 weeks agomod_ssl: Remove warning over potential uninitialised value
Yann Ylavic [Tue, 10 Jun 2025 10:54:44 +0000 (10:54 +0000)] 
mod_ssl: Remove warning over potential uninitialised value
for ssl protocol prior to protocol selection.

Merges r1924757 trunk
Submitted by: minfrin
Reviewed by: minfrin, rpluem, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926321 13f79535-47bb-0310-9956-ffa450edef68

7 weeks agoBackported in r1926319.
Yann Ylavic [Tue, 10 Jun 2025 10:52:22 +0000 (10:52 +0000)] 
Backported in r1926319.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926320 13f79535-47bb-0310-9956-ffa450edef68

7 weeks agoRemove awk dependency when building using CMake. Before this awk was required
Yann Ylavic [Tue, 10 Jun 2025 10:51:35 +0000 (10:51 +0000)] 
Remove awk dependency when building using CMake. Before this awk was required
for -DWITH_MODULES option.

* build/build-modules-c.cmake:
  (generate_builtin_modules_c): Function to generate modules.c.

* CMakeLists.txt
  (): Use generate_builtin_modules_c() instead of `awk -f build/build-modules-c.awk`
  to generate modules.c file.

* README.cmake:
  (Prerequisites, How to build): Do not mention awk as prerequisite.

Follow-up to r1919413: CMake: Use configure_file() instead of file(write)
to generate modules.c file because configure_file() doesn't change
timestamp of file if contents is the the same.

Follow-up to r1919587: CMake: Fix type in variable name (MODULES_SYNMBOLS -> MODULES_SYMBOLS)

Merges r1919413, r1919587, r1919602 from trunk
Submitted by: ivan
Reviewed by: CTR

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926319 13f79535-47bb-0310-9956-ffa450edef68

7 weeks agoBackported in r1926317.
Yann Ylavic [Tue, 10 Jun 2025 10:44:49 +0000 (10:44 +0000)] 
Backported in r1926317.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926318 13f79535-47bb-0310-9956-ffa450edef68

7 weeks agoMerge r1912460, r1925743 from trunk:
Yann Ylavic [Tue, 10 Jun 2025 10:43:58 +0000 (10:43 +0000)] 
Merge r1912460, r1925743 from trunk:

mod_proxy: Consistently close the socket on failure to reuse the connection.

proxy_connection_create() and ap_proxy_connect_backend() sometimes close the
connection on failure, sometimes not. Always close it.

mod_proxy: restore reuse of ProxyRemote connections when possible.

Fixes a regression from 2.4.59 (r1913907).

For a reverse proxy setup with a worker (enablereuse=on) and a
forward/CONNECT ProxyRemote to reach it, an open connection/tunnel
to/through the remote proxy for the same origin server (and using the
same proxy auth) should be reusable. Avoid closing them like r1913534
did.

* modules/proxy/proxy_util.c:
  Rename the struct to remote_connect_info since it's only used for
  connecting through remote CONNECT proxies. Axe the use_http_connect
  field, always true.

* modules/proxy/proxy_util.c(ap_proxy_connection_reusable):
  Remote CONNECT (forward) proxy connections can be reused if the auth
  and origin server infos are the same, so conn->forward != NULL is not
  a condition to prevent reusability.

* modules/proxy/proxy_util.c(ap_proxy_determine_connection):
  Fix the checks around conn->forward reuse and connection cleanup if
  that's not possible.

Submitted by: jfclere, ylavic
Reviewed by: ylavic, jfclere, rpluem

Github: closes #532

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926317 13f79535-47bb-0310-9956-ffa450edef68

7 weeks agovote x 3, promote x 2
Yann Ylavic [Tue, 10 Jun 2025 10:32:25 +0000 (10:32 +0000)] 
vote x 3, promote x 2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926314 13f79535-47bb-0310-9956-ffa450edef68

7 weeks ago* Vote
Ruediger Pluem [Tue, 10 Jun 2025 09:54:20 +0000 (09:54 +0000)] 
* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926313 13f79535-47bb-0310-9956-ffa450edef68

7 weeks ago* Vote and promote
Ruediger Pluem [Tue, 10 Jun 2025 08:32:51 +0000 (08:32 +0000)] 
* Vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926312 13f79535-47bb-0310-9956-ffa450edef68

8 weeks agofr doc rebuild.
Lucien Gentis [Sat, 7 Jun 2025 12:45:14 +0000 (12:45 +0000)] 
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926216 13f79535-47bb-0310-9956-ffa450edef68

8 weeks agofr doc XML file update.
Lucien Gentis [Sat, 7 Jun 2025 12:43:50 +0000 (12:43 +0000)] 
fr doc XML file update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926215 13f79535-47bb-0310-9956-ffa450edef68

8 weeks agofr doc XML files updates.
Lucien Gentis [Sat, 7 Jun 2025 12:40:45 +0000 (12:40 +0000)] 
fr doc XML files updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926214 13f79535-47bb-0310-9956-ffa450edef68

8 weeks agoProposal
Christophe Jaillet [Fri, 6 Jun 2025 20:35:07 +0000 (20:35 +0000)] 
Proposal

No vote from me, not able to test.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926193 13f79535-47bb-0310-9956-ffa450edef68

8 weeks agoPropose an easy vote
Christophe Jaillet [Fri, 6 Jun 2025 20:28:11 +0000 (20:28 +0000)] 
Propose an easy vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926192 13f79535-47bb-0310-9956-ffa450edef68

8 weeks agoPropose an easy vote
Christophe Jaillet [Fri, 6 Jun 2025 20:23:10 +0000 (20:23 +0000)] 
Propose an easy vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926190 13f79535-47bb-0310-9956-ffa450edef68

8 weeks agoVote x 1
Yann Ylavic [Fri, 6 Jun 2025 12:44:27 +0000 (12:44 +0000)] 
Vote x 1

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926175 13f79535-47bb-0310-9956-ffa450edef68

8 weeks agosystemd socket activation is a new feature for 2.4,
Joe Orton [Fri, 6 Jun 2025 10:46:54 +0000 (10:46 +0000)] 
systemd socket activation is a new feature for 2.4,
Paul wrote the first patch in this series, credit
everyone (I hope) appropriately.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926173 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerge r1511033, r1528032, r1608686, r1608694, r1608703, r1899784, r1916312, r1916344...
Ruediger Pluem [Wed, 4 Jun 2025 09:41:25 +0000 (09:41 +0000)] 
Merge r1511033, r1528032, r1608686, r1608694, r1608703, r1899784, r1916312, r1916344, r1838271, r1926091 from trunk:

Add support for systemd socket activation to listener sockets.

* configure.in: Simplify/fix systemd detection: move later to fix
  autoconf warnings; define HAVE_SYSTEMD rather than using CPPFLAGS.

* server/listen.c: Use HAVE_SYSTEMD for systemd #define.

* modules/arch/unix/config5.m4: Update systemd headers check.

* server/listen.c: duplicate sockets correctly when using systemd socket
activation, fix addrlen in getsockname() call.

Follow up r1608686, pass process to alloc_systemd_listener.

* server/listen.c: detect systemd socket activation using sd_listen_fds(),
drop the support for "Listen systemd" and use standard Listen syntax instead.

This allows using the same configuration file with or without socket activation
and allows setting protocol when using socket activation.

Remove libsystemd dependency from main httpd binary

Until this change httpd was linking libsystemd to the main httpd binary. If you want to run lightweight version of httpd in container, sometimes you just want to install
httpd binary with as little dependencies as possible to make container small in size and do not pull uncencessary dependencies and libraries.

This change will move all systemd library calls from listen.c to mod_systemd module and remove systemd linking from the main httpd bin.
Fixed mixed declaration and wrongly declared variable.

Submitted by: Luboš Uhliarik <luhliari redhat.com>

mod_systemd: Axe APR_OPTIONAL_FN redeclarations to avoid compiler warning.

ap_find_systemd_socket() and ap_systemd_listen_fds() are already declared in
"ap_listen.h", so just include them.

mod_systemd: if SELinux is available and enabled, log the SELinux
context at startup, since this may vary when httpd is started via
systemd vs being started directly.

* modules/arch/unix/mod_systemd.c (systemd_post_config):
  Do nothing for the pre-config iteration.
  Log the SELinux context if available.

* modules/arch/unix/config5.m4: Detect libselinux.

Have at least one CI job build mod_systemd.

Fix a cppcheck warning.

Remove some dead code. Updating 'last' is pointless here.

Ensure that ALL fields of the ap_listen_rec structure are initialized

alloc_listener initializes more fields in the created ap_listen_rec structure
than alloc_systemd_listener as it has more data to add to this structure.
Ensure that all fields of the ap_listen_rec structure are initialized at
least with 0 as later code using this structure depends on this.

Reviewed by: rpluem, jorton, ylavic

Github: closes #515

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926113 13f79535-47bb-0310-9956-ffa450edef68

2 months ago* Add proposal
Ruediger Pluem [Wed, 4 Jun 2025 09:34:40 +0000 (09:34 +0000)] 
* Add proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926112 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerge r1923806 from trunk:
Ruediger Pluem [Wed, 4 Jun 2025 07:37:32 +0000 (07:37 +0000)] 
Merge r1923806 from trunk:

Fix variable declaration warning in scoreboard.c

Submitted by: Vladimír Chlup <vchlup redhat.com>
Github: closes #516

Reviewed by: rpluem, jorton, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926108 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerge r1925109 from trunk:
Ruediger Pluem [Wed, 4 Jun 2025 07:36:11 +0000 (07:36 +0000)] 
Merge r1925109 from trunk:

* Temporarily add back the query string to the URL as it might contain the
  routing information for sticky sessions.

PR: 69443

Reviewed by: rpluem, covener, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926107 13f79535-47bb-0310-9956-ffa450edef68

2 months agoVote/promote x 2
Yann Ylavic [Tue, 3 Jun 2025 17:00:18 +0000 (17:00 +0000)] 
Vote/promote x 2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926097 13f79535-47bb-0310-9956-ffa450edef68

2 months agoVotes.
Joe Orton [Tue, 3 Jun 2025 15:57:36 +0000 (15:57 +0000)] 
Votes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926096 13f79535-47bb-0310-9956-ffa450edef68

2 months ago* Move proposals to correct section
Ruediger Pluem [Tue, 3 Jun 2025 15:50:15 +0000 (15:50 +0000)] 
* Move proposals to correct section

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926095 13f79535-47bb-0310-9956-ffa450edef68

2 months ago* Add proposal
Ruediger Pluem [Tue, 3 Jun 2025 15:47:55 +0000 (15:47 +0000)] 
* Add proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926094 13f79535-47bb-0310-9956-ffa450edef68

2 months ago* Fix typo in r1926080
Ruediger Pluem [Tue, 3 Jun 2025 15:35:27 +0000 (15:35 +0000)] 
* Fix typo in r1926080

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926093 13f79535-47bb-0310-9956-ffa450edef68

2 months ago* Add revision to address jailletc36 concern and reset votes
Ruediger Pluem [Tue, 3 Jun 2025 15:19:17 +0000 (15:19 +0000)] 
* Add revision to address jailletc36 concern and reset votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926092 13f79535-47bb-0310-9956-ffa450edef68

2 months agoVote.
Jean-Frederic Clere [Tue, 3 Jun 2025 08:24:08 +0000 (08:24 +0000)] 
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926087 13f79535-47bb-0310-9956-ffa450edef68

2 months agoupdate mod_md documentation now in line with trunk
Stefan Eissing [Tue, 3 Jun 2025 08:22:43 +0000 (08:22 +0000)] 
update mod_md documentation now in line with trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926086 13f79535-47bb-0310-9956-ffa450edef68

2 months agoupdate after backport
Stefan Eissing [Tue, 3 Jun 2025 08:21:19 +0000 (08:21 +0000)] 
update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926085 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerge modules/md/md_version.h
Stefan Eissing [Tue, 3 Jun 2025 08:20:55 +0000 (08:20 +0000)] 
Merge modules/md/md_version.h

  *) mod_md: update to version 2.5.2
     - Fixed TLS-ALPN-01 challenges when multiple `MDPrivateKeys` are specified
       with EC keys before RSA ones. Fixes #377. [Stefan Eissing]
     - Fixed missing newlines in the status page output. [Andreas Groth]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926084 13f79535-47bb-0310-9956-ffa450edef68

2 months agoupdate after backport
Stefan Eissing [Tue, 3 Jun 2025 08:08:00 +0000 (08:08 +0000)] 
update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926083 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerge of /httpd/httpd/trunk:r1925975
Stefan Eissing [Tue, 3 Jun 2025 08:07:31 +0000 (08:07 +0000)] 
Merge of /httpd/httpd/trunk:r1925975

  *) mod_http2: update to version 2.0.32
     The code setting the connection window size was set wrong,
     preventing `H2WindowSize` to work.
     Fixed <https://github.com/icing/mod_h2/issues/300>.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926082 13f79535-47bb-0310-9956-ffa450edef68

2 months agoupdate after backport
Stefan Eissing [Tue, 3 Jun 2025 08:03:00 +0000 (08:03 +0000)] 
update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926081 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerge /httpd/httpd/trunk:r1923754
Stefan Eissing [Tue, 3 Jun 2025 08:02:35 +0000 (08:02 +0000)] 
Merge  /httpd/httpd/trunk:r1923754

  *) scoreboard/mod_http2: record durations of HTTP/2 requests.
     PR 69579 [Pierre Brochard <pierre.brochard.1982@m4x.org>]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926080 13f79535-47bb-0310-9956-ffa450edef68

2 months agoupdate after backport
Stefan Eissing [Tue, 3 Jun 2025 07:48:32 +0000 (07:48 +0000)] 
update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926079 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerge /httpd/httpd/trunk:r1924554
Stefan Eissing [Tue, 3 Jun 2025 07:48:08 +0000 (07:48 +0000)] 
Merge /httpd/httpd/trunk:r1924554

  * mod_proxy_http2: revert r1912193 for detecting broken backend connections
    as this interferes with backend selection who a node is unresponsive.
    PR69624.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926078 13f79535-47bb-0310-9956-ffa450edef68

2 months agoupdate after backport
Stefan Eissing [Tue, 3 Jun 2025 07:41:09 +0000 (07:41 +0000)] 
update after backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926077 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerge of /httpd/httpd/trunk:r1924145,1924164,1924197
Stefan Eissing [Tue, 3 Jun 2025 07:40:48 +0000 (07:40 +0000)] 
Merge of /httpd/httpd/trunk:r1924145,1924164,1924197

  *) mod_http2: update to version 2.0.30
     - Fixed bug in handling over long response headers. When the 64 KB limit
       of nghttp2 was exceeded, the request was not reset and the client was
       left hanging, waiting for it. Now the stream is reset.
     - Added new directive `H2MaxHeaderBlockLen` to set the limit on response
       header sizes.
     - Fixed handling of Timeout vs. KeepAliveTimeout when first request on a
       connection was reset.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926076 13f79535-47bb-0310-9956-ffa450edef68

2 months agoUpdate comment :(
Christophe Jaillet [Mon, 2 Jun 2025 19:44:55 +0000 (19:44 +0000)] 
Update comment :(

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926068 13f79535-47bb-0310-9956-ffa450edef68

2 months agoComment on a backport proposal
Christophe Jaillet [Mon, 2 Jun 2025 19:39:33 +0000 (19:39 +0000)] 
Comment on a backport proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926067 13f79535-47bb-0310-9956-ffa450edef68

2 months agoVote/promote x 3, propose x 1
Yann Ylavic [Mon, 2 Jun 2025 18:52:00 +0000 (18:52 +0000)] 
Vote/promote x 3, propose x 1

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926066 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerged x2, Vote+Promote x1.
Joe Orton [Mon, 2 Jun 2025 14:54:13 +0000 (14:54 +0000)] 
Merged x2, Vote+Promote x1.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926065 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerge r1923639 from trunk:
Joe Orton [Mon, 2 Jun 2025 14:52:51 +0000 (14:52 +0000)] 
Merge r1923639 from trunk:

Add API exposing the DavBasePath setting for use by DAV repository
backend modules (mod_dav_svn needs this for POST method handling).

* modules/dav/main/mod_dav.c (dav_get_base_path): New function.

* include/ap_mmn.h: Bump MMN minor.

Github: closes #526
Reviewed by: jorton, rpluem, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926064 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerge r1924095 from trunk:
Joe Orton [Mon, 2 Jun 2025 14:48:53 +0000 (14:48 +0000)] 
Merge r1924095 from trunk:

mod_lua: Fix memory handling in output filters.

* modules/lua/mod_lua.c (lua_output_filter_handle): Fix brigade
  iteration to use constant memory.

Submitted by: G.Grandes <guillermo.grandes gmail.com>
PR: 69590
Github: closes #517
Reviewed by: jorton, rpluem, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926063 13f79535-47bb-0310-9956-ffa450edef68

2 months agoeasier votes, promote
Eric Covener [Mon, 2 Jun 2025 13:01:04 +0000 (13:01 +0000)] 
easier votes, promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926062 13f79535-47bb-0310-9956-ffa450edef68

2 months ago* Add proposal
Ruediger Pluem [Mon, 2 Jun 2025 11:20:18 +0000 (11:20 +0000)] 
* Add proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926060 13f79535-47bb-0310-9956-ffa450edef68

2 months ago* Vote
Ruediger Pluem [Mon, 2 Jun 2025 11:10:52 +0000 (11:10 +0000)] 
* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1926059 13f79535-47bb-0310-9956-ffa450edef68

2 months agopropose r1820750
Eric Covener [Fri, 30 May 2025 16:51:15 +0000 (16:51 +0000)] 
propose r1820750

https://github.com/apache/httpd/pull/533

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1925992 13f79535-47bb-0310-9956-ffa450edef68

2 months agopropose backport of r1925979
Stefan Eissing [Fri, 30 May 2025 12:47:28 +0000 (12:47 +0000)] 
propose backport of r1925979

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1925980 13f79535-47bb-0310-9956-ffa450edef68

2 months agopropose r1925975 for backport
Stefan Eissing [Fri, 30 May 2025 12:21:38 +0000 (12:21 +0000)] 
propose r1925975 for backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1925976 13f79535-47bb-0310-9956-ffa450edef68

2 months agoVote, promote.
Joe Orton [Fri, 30 May 2025 08:07:55 +0000 (08:07 +0000)] 
Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1925972 13f79535-47bb-0310-9956-ffa450edef68

2 months agofr doc rebuild.
Lucien Gentis [Sat, 17 May 2025 13:40:09 +0000 (13:40 +0000)] 
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1925632 13f79535-47bb-0310-9956-ffa450edef68

2 months agofr doc XML file update.
Lucien Gentis [Sat, 17 May 2025 13:38:35 +0000 (13:38 +0000)] 
fr doc XML file update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1925631 13f79535-47bb-0310-9956-ffa450edef68

2 months agoRegenerate docs.
Joe Orton [Mon, 12 May 2025 14:01:21 +0000 (14:01 +0000)] 
Regenerate docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1925514 13f79535-47bb-0310-9956-ffa450edef68

2 months agoMerge r1924774 from trunk:
Joe Orton [Mon, 12 May 2025 14:00:00 +0000 (14:00 +0000)] 
Merge r1924774 from trunk:

Update mod_ssl docs to reference current & working openssl.org
URIs throughout.

PR: 69682

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1925513 13f79535-47bb-0310-9956-ffa450edef68

3 months agoPropose x1.
Joe Orton [Wed, 23 Apr 2025 08:02:06 +0000 (08:02 +0000)] 
Propose x1.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1925226 13f79535-47bb-0310-9956-ffa450edef68

3 months agoUpdate svn:mergeinfo after r1924965, [skip ci]
Joe Orton [Wed, 9 Apr 2025 16:05:09 +0000 (16:05 +0000)] 
Update svn:mergeinfo after r1924965, [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1924966 13f79535-47bb-0310-9956-ffa450edef68

3 months agoMerge r1923271, r1923300, r1923302 from trunk:
Joe Orton [Wed, 9 Apr 2025 16:02:25 +0000 (16:02 +0000)] 
Merge r1923271, r1923300, r1923302 from trunk:

CI: Add 64-bit ARM job to Linux workflow. See:
https://github.blog/changelog/2025-01-16-linux-arm64-hosted-runners-now-available-for-free-in-public-repositories-public-preview/

Disable the arm64 job, it appears there are not enough runners.

CI: Retry arm64 workflow with the correct label this time.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1924965 13f79535-47bb-0310-9956-ffa450edef68

3 months agoMerge r1921307, r1921308, r1921309 from trunk:
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

3 months agoMerge r1924958 from trunk:
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

4 months agoPropose.
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

4 months ago* Vote
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

4 months ago* Vote
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

4 months ago* Vote
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

4 months ago* Vote
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

4 months agopropose back port
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

4 months agoupdate log tag revision for backport
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

5 months agoupdate backport revisions with proper module name in change entry
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

5 months agoproposing r1924145 for back port
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

5 months agoNominate mod_lua fix.
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

5 months agoadded 1923806 to scoreboard backport
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

5 months agoMerged x1.
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

5 months agoMerge r1917017, r1923218 from trunk:
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

5 months agoVote.
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

5 months agoproposing r1923754 for backport
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

5 months ago* Promote
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

5 months ago* Propose
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

5 months ago *) mod_md: full squash of all changes in trunk, since people
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

6 months agoMerge r1923479 from trunk:
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

6 months agopublishing release httpd-2.4.63
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

6 months agoVote
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

6 months agoPrep for rolling
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

6 months agoMerge r1915651, r1916381, r1920589, r1923133 from trunk: [under CTR for docs]
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

6 months agoUpdate mergeinfo for already-merged mod_cgi/cgid changes.
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

6 months agoMerged x2.
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

6 months agoMerge r1916054 from trunk:
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

6 months agoMerge r1921067 from trunk:
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

6 months agoVote x3, promote x2.
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

6 months agoThree votes.
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

6 months ago*) mod_http2: fix test_h2_200_17+18 for newer curl versions. Just add log
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

6 months agoFix proposal
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

6 months agoPropose
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

6 months agoRebuild the doc
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

6 months agoVote, promote
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

6 months agolooks safe to me. Tests OK too
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

6 months agopropose backport of h2 test fix
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

6 months agoSanitize some bugzilla referrences that break one of my script.
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

6 months agoSpace police.
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

6 months agoupdate changes
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

6 months agoMerge /httpd/httpd/trunk:r1923148
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