]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Eric Covener [Thu, 10 Jul 2025 11:57:06 +0000 (11:57 +0000)]
publishing release httpd-2.4.64
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927106 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 15:40:38 +0000 (15:40 +0000)]
Merge r1927054 from trunk:
avoid compile error with curl < 7.44.0
Reviewed By: covener, ylavic, gbechis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927055 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 12:12:49 +0000 (12:12 +0000)]
backport
1927038 from trunk
improve h2 header error handling
Rewviewed By: icing, covener, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927046 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 12:09:30 +0000 (12:09 +0000)]
backport
1927037 from trunk
remove antiquated 'SSLEngine optional' TLS upgrade
Reviewed By: rpluem, jorton, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927045 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 12:05:49 +0000 (12:05 +0000)]
backport
1927036 from trunk
tolerate missing host header in h2 proxy
Reviewed By: jorton, icing, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927044 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 12:04:49 +0000 (12:04 +0000)]
backport
1927035 from trunk
update SNI validation
Reviewed By: rpluem, jorton, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927043 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 12:03:42 +0000 (12:03 +0000)]
backport
1927034 from trunk
escape ssl vars
Reviewed By: rpluem, jorton, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927042 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 12:02:22 +0000 (12:02 +0000)]
backport
1927033 from trunk
expand UNC checking
Reviewed By: covener, jfclere, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927041 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 12:01:02 +0000 (12:01 +0000)]
backport
1927032 from trunk
header only
Reviewed By: rpluem, jorton, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927040 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 11:59:38 +0000 (11:59 +0000)]
fix header merging
Reviewed By: rpluem, jorton, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927039 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 11:33:53 +0000 (11:33 +0000)]
make update-changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927031 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 11:33:25 +0000 (11:33 +0000)]
ported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927030 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 11:33:13 +0000 (11:33 +0000)]
port r1922115 from trunk
*) mod_proxy_ajp: Use iobuffersize set on worker level for the IO buffer
size.
Submitted By: Jari Ahonen <jah@progress.com>
Reviewed By: rpluem, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927029 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 7 Jul 2025 11:31:50 +0000 (11:31 +0000)]
vote/promote simple fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927028 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 7 Jul 2025 10:18:22 +0000 (10:18 +0000)]
Merge r1926110, r1926111 from trunk:
Correctly check return value of getline
In case of an error (e.g. file not found or readable) getline returns -1 which
causes an endless loop. Leave the loop in such cases.
* Correctly handle filenames that contain spaces
Reviewed by: rpluem, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927027 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 7 Jul 2025 09:28:16 +0000 (09:28 +0000)]
1 done, 1 vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927024 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 7 Jul 2025 09:15:21 +0000 (09:15 +0000)]
Merge r1926720, r1926722 from trunk:
* modules/ssl/ssl_private.h: For OpenSSL >= 3.5.0 drop $SSLKEYLOGFILE
handling inside mod_ssl where OpenSSL is built to handle that
internally in libssl.
* modules/ssl/ssl_private.h: Fix logic in r1926720 HAVE_OPENSSL_KEYLOG macro,
thanks to rpluem.
Reviewed by: rpluem
Submitted by: jorton
Reviewed by: jorton, rpluem, ylavic
Github: closes #538
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1927023 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 3 Jul 2025 10:27:13 +0000 (10:27 +0000)]
Vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1926934 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 30 Jun 2025 13:45:15 +0000 (13:45 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1926872 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 27 Jun 2025 12:41:04 +0000 (12:41 +0000)]
Propose x1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1926751 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2025 11:04:25 +0000 (11:04 +0000)]
Backported in r1926328.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1926329 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2025 11:04:01 +0000 (11:04 +0000)]
mod_asis: Fix the log level of the message AH01236
Change the log level from ERROR to DEBUG.
The message \"mod_asis: ap_pass_brigade failed for file ...\" was logged with
the level ERROR. This log level is inappropriate here, because a client can
trigger this log message by aborting the request.
Most other modules don't log at all or use the log level DEBUG when
ap_pass_brigade() fails.
Submitted by: Michael Kaufmann <mail michael-kaufmann.ch>
Github: closes #527
Add a change entry to give credits to the author.
Merges r1924954, r1926191 trunk
Submitted by: jorton, jailletc36
Reviewed by: jailletc36, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1926328 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2025 11:02:06 +0000 (11:02 +0000)]
Backported in r1926325.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1926327 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2025 11:01:25 +0000 (11:01 +0000)]
Sync CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1926326 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2025 11:00:37 +0000 (11:00 +0000)]
mod_session_dbd: set_cookie_name: ensure correct format
If args is an empty string, apr_strtok will return NULL and *last will never get set which results in a SIGSEGV in apr_isspace check
Submitted by: Thomas Meyer <thomas@m3y3r.de>
Github: closes #503
Follow-up to r1922931.
In set_cookie_name() and set_cookie_name2(), now that the empty 'name' argument is explicitly handled, the error message in check_string() can be simplified because the cookie name can't be empty anymore when this function is called.
Add a change entry to give credits to the author.
Merges r1922931, r1926188, r1926189 trunk
Submitted by: covener, jailletc36, jailletc36
Reviewed by: jailletc36, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1926325 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2025 10:58:50 +0000 (10:58 +0000)]
Backported in r1926323.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1926324 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2025 10:58:15 +0000 (10:58 +0000)]
avoid ap_set_content_type when processing a _Request_Header set|edit|unset Content-Type.
identified by ylavic
Merges r1820750 from trunk
Submitted by: covener
Reviewed by: covener, rpluem, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1926323 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2025 10:55:14 +0000 (10:55 +0000)]
Backported in r1926321.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1926322 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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