]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
11 months ago* Vote, promote, comment [skip ci]
Ruediger Pluem [Thu, 15 Aug 2024 08:20:59 +0000 (08:20 +0000)] 
* Vote, promote, comment [skip ci]

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

11 months ago* Vote and promote
Ruediger Pluem [Thu, 15 Aug 2024 08:17:06 +0000 (08:17 +0000)] 
* Vote and promote

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

11 months agoa few addl votes
Eric Covener [Tue, 13 Aug 2024 14:33:21 +0000 (14:33 +0000)] 
a few addl votes

[skip ci]

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

11 months agoadd/vote/promote
Eric Covener [Tue, 13 Aug 2024 14:19:32 +0000 (14:19 +0000)] 
add/vote/promote

[skip ci]

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

11 months agoAdd some compatibility notes.
Christophe Jaillet [Fri, 9 Aug 2024 09:30:31 +0000 (09:30 +0000)] 
Add some compatibility notes.

(r1919564 in trunk, modified to match the 2.4.x release versions)

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

11 months agoAdd a new <since> tag to ease writing compatibility notes.
Christophe Jaillet [Fri, 9 Aug 2024 09:26:19 +0000 (09:26 +0000)] 
Add a new <since> tag to ease writing compatibility notes.

This is much less verbose and will make wording more consistent in the generated html files.

It is declared in synopsis.xsl because its main use should be here, but it is usable anywhere.

Only the French translation is provided.

(1919560 and 1919653 in trunk

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

12 months agoPropose.
Ivan Zhakov [Sun, 4 Aug 2024 11:53:29 +0000 (11:53 +0000)] 
Propose.

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

12 months agoMerge r1919397, r1919398, r1919399, r1919411, r1919414, r1919415,
Ivan Zhakov [Sun, 4 Aug 2024 11:21:30 +0000 (11:21 +0000)] 
Merge r1919397, r1919398, r1919399, r1919411, r1919414, r1919415,
r1919416, r1919417, r1919665 from trunk [ CTR for CI changes ]

CI: Add Windows GitHub Actions job.

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

12 months agoMerge r1919395 from trunk:
Ivan Zhakov [Sun, 4 Aug 2024 11:03:16 +0000 (11:03 +0000)] 
Merge r1919395 from trunk:
  *) CMake: By default use PCRE2 CMake package if supported.

Use non-Unix build exception to backport with CTR.

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

12 months agoMerge r1902366 from trunk:
Ivan Zhakov [Sun, 4 Aug 2024 11:01:17 +0000 (11:01 +0000)] 
Merge r1902366 from trunk:

  *) CMake: Use full path to gen_test_char.exe in CUSTOM_COMMAND.

Submitted by: ivan
Reviewed By: ylavic, covener

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

12 months agoUpdate proposal
Yann Ylavic [Fri, 2 Aug 2024 01:01:37 +0000 (01:01 +0000)] 
Update proposal

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

12 months agoPropose x 3
Yann Ylavic [Thu, 1 Aug 2024 17:41:33 +0000 (17:41 +0000)] 
Propose x 3

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

12 months agoFix 2.4 versions of latest MMN entries.
Yann Ylavic [Thu, 1 Aug 2024 12:48:02 +0000 (12:48 +0000)] 
Fix 2.4 versions of latest MMN entries.

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

12 months agoAdd missing CHANGES entry from r1919548
Yann Ylavic [Thu, 1 Aug 2024 10:15:08 +0000 (10:15 +0000)] 
Add missing CHANGES entry from r1919548

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

12 months agoAdd missing CHANGES entry from r1919545
Yann Ylavic [Thu, 1 Aug 2024 10:07:59 +0000 (10:07 +0000)] 
Add missing CHANGES entry from r1919545

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

12 months agoBackported in 2.4.41 (r1860166).
Yann Ylavic [Thu, 1 Aug 2024 09:15:39 +0000 (09:15 +0000)] 
Backported in 2.4.41 (r1860166).

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

12 months agoRebased mod_rewrite rewritelog() backport.
Joe Orton [Mon, 29 Jul 2024 09:08:06 +0000 (09:08 +0000)] 
Rebased mod_rewrite rewritelog() backport.

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

12 months agoBackported in r1919548.
Yann Ylavic [Sat, 27 Jul 2024 14:19:32 +0000 (14:19 +0000)] 
Backported in r1919548.

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

12 months agoMerge r1918003, r1918022, r1918035, r1918078, r1918098, r1918099, r1918257, r1918482...
Yann Ylavic [Sat, 27 Jul 2024 14:18:49 +0000 (14:18 +0000)] 
Merge r1918003, r1918022, r1918035, r1918078, r1918098, r1918099, r1918257, r1918482, r1918483, r1918491, r1919141, r1919148 from trunk

 *) mod_http2: sync with module's github.
    - on newer HTTPD versions, return connection monitoring
      to the event MPM when block on client updates.
      2.4.x versions still treat connections in the event
      MPM as KeepAlive and purge them on load in the middle
      of response processing.
    - spelling fixes
    - support for yield calls in c2 "network" filter

 mpm_event,core: Handle async POLLIN/POLLOUT in CONN_STATE_PROCESS state.

* include/httpd.h:
  Rename CONN_STATE_CHECK_REQUEST_LINE_READABLE to CONN_STATE_KEEPALIVE
  and CONN_STATE_READ_REQUEST_LINE to CONN_STATE_PROCESS, keeping the
  old enums as aliases. Rework comments about each state.

* server/mpm/event/event.c:
  Use the new states names.
  Let the process_connection hooks return CONN_STATE_PROCESS for mpm_event
  to POLLIN or POLLOUT depending on c->cs->sense being CONN_SENSE_WANT_READ
  or CONN_SENSE_WANT_WRITE respectively.
  Remove (ab)use of CONN_STATE_WRITE_COMPLETION with CONN_SENSE_WANT_READ to
  mean poll() for read (and the need for the obscure c->clogging_input_filters
  to make it work as expected). This is what CONN_STATE_PROCESS is for now.
  Update the comment about the states that can be returned by process_connection
  hooks (and their usage).
  Use the same queue (process_q renamed from write_completion_q) for polling
  connections in both CONN_STATE_PROCESS and CONN_STATE_WRITE_COMPLETION
  states since they both use the same (server_rec's) Timeout. This implies
  that both states are accounted as "write-completion" in mod_status for now.

* server/mpm/motorz/motorz.c, server/mpm/simple/simple_io.c, modules/http/http_core.c:
  Use the new states names (only).

* include/scoreboard.h:
  Change comment about process_score->write_completion to note that the
  counter refers to CONN_STATE_PROCESS connections returned to the MPM
  too.

* modules/http2/h2_c1.c:
  Return the c1 connection with the CONN_STATE_PROCESS state rather than
  CONN_STATE_WRITE_COMPLETION when waiting for a window update (i.e. ask
  the MPM to poll for read directly). This avoids the transition to
  CONN_STATE_KEEPALIVE which could kill the connection under high load.

Github: closes #448

Follow up to r1918022: MMN minor bump and checks for the new conn_state_e aliases' usability.

mpm_event: Don't spam with "Stopping process due to MaxConnectionsPerChild"

When MaxConnectionsPerChild is reached there may be some connections to process
still and the listener should stop writing this at every loop. Logging once
is enough.

* server/mpm/event/event.c(check_infinite_requests): Raise conns_this_child
  unconditionally.

mpm_event, mod_status: Separate processing and write completion queues.

As a follow up to r1918022 which handled the new CONN_STATE_PROCESS(ing) and
existing CONN_STATE_WRITE_COMPLETION in the same async queue, let's now have
two separates ones which allows more relevant async accounting in mod_status.

Rename CONN_STATE_PROCESS to CONN_STATE_PROCESSING as it's how it will be
called in mod_status.

* include/ap_mmn.h:
  MMN minor bump for process_score->processing counter.

* include/httpd.h:
  Rename CONN_STATE_PROCESS to CONN_STATE_PROCESSING.

* include/scoreboard.h:
  Add process_score->processing field.

* include/httpd.h, modules/http/http_core.c, modules/http2/h2_c1.c,
    server/mpm/event/event.c, server/mpm/motorz/motorz.c,
    server/mpm/simple/simple_io.c:
  Rename CONN_STATE_PROCESS to CONN_STATE_PROCESSING.

* server/mpm/event/event.c:
  Restore write_completion_q to handle connections in CONN_STATE_WRITE_COMPLETION.
  Use processing_q (renamed from process_q) solely for CONN_STATE_PROCESSING.
  Update process_score->processing according to the length of processing_q.

* modules/generators/mod_status.c:
  Show the value of process_score->processing in the stats.

Follow up to r1918098 (and r1918022): Push missing changes.

mpm_event,mod_http2: Keep compatibility with CONN_STATE_PROCESSING + OK

Before r1918022, returning OK with CONN_STATE_PROCESSING to mpm_event was
handled like/by CONN_STATE_LINGER "to not break old or third-party modules
which might return OK w/o touching the state and expect lingering close,
like with worker or prefork MPMs".

So we need a new return code to be allowed to apply the new POLLIN/POLLOUT
behaviour for CONN_STATE_PROCESSING, thus revive AGAIN as introduced by
Graham some times ago for a nonblocking WIP (moved to a branch/PR since then).

MPM event will advertise its ability to handle CONN_STATE_PROCESSING + AGAIN
with AP_MPMQ_CAN_AGAIN, and mod_http2 can use that to know how to return to
the MPM as expected. When !AP_MPMQ_CAN_AGAIN modules/mod_http2 can still use
CONN_STATE_WRITE_COMPLETION + CONN_SENSE_WANT_READ + c->clogging_input_filters
which will work in mpm_even-2.4.x still.

* include/ap_mmn.h:
  Bump MMN minor for AP_MPMQ_CAN_AGAIN and AGAIN.

* include/ap_mpm.h:
  Define AP_MPMQ_CAN_AGAIN.

* include/httpd.h:
  Define AGAIN.

* modules/http2/h2.h:
  No need for H2_USE_STATE_PROCESSING anymore with AP_MPMQ_CAN_AGAIN.

* modules/http2/h2_c1.c:
  For !keepalive case return to the MPM using CONN_STATE_PROCESSING + AGAIN
  or CONN_STATE_WRITE_COMPLETION + c->clogging_input_filters depending on
  AP_MPMQ_CAN_AGAIN only.

* modules/http2/h2_session.c:
  Can return to the MPM for h2_send_flow_blocked() provided it's async only.

* server/mpm/event/event.c:
  Rework process_socket()'s CONN_STATE_PROCESSING to handle AGAIN and preserve
  compatibility. Have a lingering_close label to goto there faster when
  process_lingering_close() is to be called. Improve relevant comments.

mpm_event,mod_http2,mod_status: Follow up to r1918257: CONN_STATE_ASYNC_WAITIO.

Per discussion on PR #449, have a separate state for returning the connection
to the MPM to wait for an IO (namely CONN_STATE_ASYNC_WAITIO), rather than
(ab)using CONN_STATE_PROCESSING.

This removes the need for AGAIN added in r1918257 (for now), and AP_MPMQ_CAN_AGAIN
is renamed to AP_MPMQ_CAN_WAITIO.

This is also the state that mod_status accounts for, so rename ->processing
to ->wait_io in process_score (shows as "wait-io" in mod_status and mod_lua).

mpm_event: Follow up to r1918482: CONN_STATE_ASYNC_WAITIO > CONN_STATE_LINGER.

mpm_event: Follow up to r1918482: CONN_STATE_LINGER* are not the last anymore.

Since CONN_STATE_ASYNC_WAITIO, we cannot check for < or >= CONN_STATE_LINGER
anymore to determine if in an lingering close state, so let's add a new
CONN_STATE_IS_LINGERING_CLOSE() macro for this and use it in mpm_event.

The test for state == CONN_STATE_LINGER in process_lingering_close() is a
bit weak too in order to call ap_start_lingering_close() the first time only,
so have a conn_state->linger_started flag instead.

mod_status: Follow up to r1918482: Bump colspan for the new wait-io colomn

mod_status: "Threads" span three colomns (busy, graceful, idle), not two.

Submitted by: icing, ylavic, ylavic, ylavic, ylavic, ylavic, ylavic, ylavic, ylavic, ylavic, ylavic, ylavic
Reviewed by: ylavic, icing, gbechis
Github: closes #449

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

12 months agoBackported in r1919545.
Yann Ylavic [Sat, 27 Jul 2024 13:36:31 +0000 (13:36 +0000)] 
Backported in r1919545.

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

12 months agomod_rewrite: Better question mark tracking to avoid UnsafeAllow3F. PR 69197.
Yann Ylavic [Sat, 27 Jul 2024 13:35:53 +0000 (13:35 +0000)] 
mod_rewrite: Better question mark tracking to avoid UnsafeAllow3F.  PR 69197.

Track in do_expand() whether a '?' in the uri-path comes from a literal in
the substitution string or from an expansion (variable, lookup, ...).
In the former case it's safe to assume that it's the query-string separator
but for the other case it's not (could be a decoded %3f from r->uri).

This allows to avoid [UnsafeAllow3F] for most cases.

Merges r1919325 from trunk
Reviewed by: ylavic, covener, jorton
Github: closes #462

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

12 months agoTrigger ci
Yann Ylavic [Sat, 27 Jul 2024 13:27:49 +0000 (13:27 +0000)] 
Trigger ci

Merges r1919543 from trunk

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

12 months agoVote x 1
Yann Ylavic [Fri, 26 Jul 2024 14:11:49 +0000 (14:11 +0000)] 
Vote x 1

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

12 months agofr doc rebuild.
Lucien Gentis [Fri, 26 Jul 2024 12:35:49 +0000 (12:35 +0000)] 
fr doc rebuild.

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

12 months agofr doc XML file update.
Lucien Gentis [Fri, 26 Jul 2024 12:35:11 +0000 (12:35 +0000)] 
fr doc XML file update.

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

12 months agoReenable test class, upstream bug fixed in pebble.
Rainer Jung [Wed, 24 Jul 2024 10:47:09 +0000 (10:47 +0000)] 
Reenable test class, upstream bug fixed in pebble.
Backport of r1919491 from trunk.

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

12 months agoVote&promote, propose.
Joe Orton [Tue, 23 Jul 2024 16:01:37 +0000 (16:01 +0000)] 
Vote&promote, propose.

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

12 months agoxforms
Eric Covener [Tue, 23 Jul 2024 12:56:59 +0000 (12:56 +0000)] 
xforms

[skip ci]

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

12 months agoMerge r1919468 from trunk:
Eric Covener [Tue, 23 Jul 2024 12:56:43 +0000 (12:56 +0000)] 
Merge r1919468 from trunk:

use UNCList in UNC examples

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

12 months agofr doc rebuild.
Lucien Gentis [Sat, 20 Jul 2024 13:44:57 +0000 (13:44 +0000)] 
fr doc rebuild.

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

12 months agofr doc XML files updates.
Lucien Gentis [Sat, 20 Jul 2024 13:43:33 +0000 (13:43 +0000)] 
fr doc XML files updates.

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

12 months agovote/promote/stall
Eric Covener [Wed, 17 Jul 2024 23:34:06 +0000 (23:34 +0000)] 
vote/promote/stall

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

12 months agoSkip more h2 tests in prefork.
Rainer Jung [Wed, 17 Jul 2024 22:12:49 +0000 (22:12 +0000)] 
Skip more h2 tests in prefork.
Backport of r1919334 from trunk.

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

12 months agoSkip h2 tests on prefork.
Rainer Jung [Wed, 17 Jul 2024 22:04:01 +0000 (22:04 +0000)] 
Skip h2 tests on prefork.
Backport of r1919332 from trunk.

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

12 months agoFix typo in test name.
Rainer Jung [Wed, 17 Jul 2024 21:59:39 +0000 (21:59 +0000)] 
Fix typo in test name.
Backport of r1919330 from trunk.

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

12 months agoPropose x 1, vote x 1
Yann Ylavic [Wed, 17 Jul 2024 21:51:33 +0000 (21:51 +0000)] 
Propose x 1, vote x 1

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

12 months agoFix copy and paste typo in comment
Rainer Jung [Wed, 17 Jul 2024 18:37:41 +0000 (18:37 +0000)] 
Fix copy and paste typo in comment

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

12 months agopublishing release httpd-2.4.62
Eric Covener [Wed, 17 Jul 2024 18:20:34 +0000 (18:20 +0000)] 
publishing release httpd-2.4.62

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

12 months agoMake sure pytest shuts down the web server after each package.
Rainer Jung [Mon, 15 Jul 2024 22:42:20 +0000 (22:42 +0000)] 
Make sure pytest shuts down the web server after each package.

Backport of r1919265 from trunk.

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

12 months agoxforms
Eric Covener [Mon, 15 Jul 2024 12:09:05 +0000 (12:09 +0000)] 
xforms

[skip ci]

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

12 months agoMerge r1919247 from trunk:
Eric Covener [Mon, 15 Jul 2024 12:08:30 +0000 (12:08 +0000)] 
Merge r1919247 from trunk:

copy the trusted flag from the subrequest

Submitted By: covener
Reviewed By: covener, ylavic, gbechis

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

12 months agoMerge r1919246 from trunk:
Eric Covener [Mon, 15 Jul 2024 12:07:57 +0000 (12:07 +0000)] 
Merge r1919246 from trunk:

merge leading slashes by default

Submitted By: ylavic, covener
Reviewed By: ylavic, covener, gbechis

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

12 months agoMove r1902366 backport proposal to correct section in STATUS file.
Ivan Zhakov [Sat, 13 Jul 2024 19:55:32 +0000 (19:55 +0000)] 
Move r1902366 backport proposal to correct section in STATUS file.

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

12 months agofr doc rebuild.
Lucien Gentis [Sat, 13 Jul 2024 12:09:59 +0000 (12:09 +0000)] 
fr doc rebuild.

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

12 months agofr doc XML file update.
Lucien Gentis [Sat, 13 Jul 2024 12:09:01 +0000 (12:09 +0000)] 
fr doc XML file update.

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

12 months agoMore adjustments for PR 449.
Yann Ylavic [Thu, 11 Jul 2024 15:03:20 +0000 (15:03 +0000)] 
More adjustments for PR 449.

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

12 months agoBackported in r1919145.
Yann Ylavic [Thu, 11 Jul 2024 14:35:35 +0000 (14:35 +0000)] 
Backported in r1919145.

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

12 months agoDon't reset the balancer when we create a new child
Yann Ylavic [Thu, 11 Jul 2024 14:35:05 +0000 (14:35 +0000)] 
Don't reset the balancer when we create a new child
and don't change shared memory the load balancer is not using.

Merges r1916004 from trunk
Submitted by: jfclere
Reviewed by: jfclere, rpluem, gbechis

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

12 months agoMerged in r1919123
Yann Ylavic [Thu, 11 Jul 2024 14:33:31 +0000 (14:33 +0000)] 
Merged in r1919123

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

12 months agoPromote x 1.99
Yann Ylavic [Thu, 11 Jul 2024 14:19:08 +0000 (14:19 +0000)] 
Promote x 1.99

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

12 months agoBackported.
Yann Ylavic [Thu, 11 Jul 2024 13:58:47 +0000 (13:58 +0000)] 
Backported.

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

12 months agomod_proxy: Avoid AH01059 parsing error for SetHandler "unix:" URLs. PR 69160
Yann Ylavic [Thu, 11 Jul 2024 13:58:12 +0000 (13:58 +0000)] 
mod_proxy: Avoid AH01059 parsing error for SetHandler "unix:" URLs.  PR 69160

The hostname part of the URL is not mandated for UDS though the canon_handler
hooks will require it, so add "localhost" if it's missing (won't be used anyway
for an AF_UNIX socket).

This can trigger with SetHandler "unix:" URLs which are now also fixed up.

Follow up to r1919015: fix compilation.

mod_proxy: Fix canonicalisation and FCGI env (PATH_INFO, SCRIPT_NAME) for
           "balancer:" URLs set via SetHandler, also allowing for "unix:"
           sockets with BalancerMember(s).  PR 69168.

* modules/proxy/proxy_util.h, modules/proxy/proxy_util.c:
  Move proxy_interpolate() from mod_proxy.c to ap_proxy_interpolate(),
  exported locally only (non public).
  Move proxy_fixup() from mod_proxy.c to ap_proxy_canon_url(), exported
  locally only too (non public).
  Rollback ap_proxy_fixup_uds_filename() to a local fixup_uds_filename()
  usable from proxy_util.c only. The public function will be removed in
  a following commit.

* modules/proxy/mod_proxy.h:
  Note that ap_proxy_fixup_uds_filename() is deprecated.

* modules/proxy/mod_proxy.c:
  Just use ap_proxy_canon_url() from proxy_fixup() and proxy_handler()
  for SetHandler URLs.

* modules/proxy/mod_proxy_balancer.c:
  Do not canonicalize the path from proxy_balancer_canon() anymore but
  rather from balancer_fixup() where the balancer URL is rewritten to
  the BalancerMember URL.

mod_proxy: Don't mangle r->filename when ap_proxy_canon_netloc() fails.

ap_proxy_canon_netloc() called from the canon_handler hooks modifies its
given url in place, hence &r->filename[6] passed from ap_proxy_canon_url().

This is not an issue if the canon_handler hook succeeds (or declines) since
r->filename is usually completely rewritten finally, but on failure it gets
truncated.

Avoid this by passing a copy of r->filename from the start, the proxy *url
and r->filename don't need to point to the same data.

* proxy/proxy_util.c(ap_proxy_canon_url):
  Pass a copy of r->filename to the canon_handler hooks.

Follow up to r1919023: fix compilation.

Merges r1919015, r1919019, r1919022, r1919023, r1919024 from trunk
Reviewed by: rpluem, covener, ylavic

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

12 months agovote [skip ci]
Giovanni Bechis [Thu, 11 Jul 2024 13:54:50 +0000 (13:54 +0000)] 
vote [skip ci]

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

12 months agoSync CHANGES.
Yann Ylavic [Thu, 11 Jul 2024 13:50:42 +0000 (13:50 +0000)] 
Sync CHANGES.

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

12 months agoBackported.
Yann Ylavic [Thu, 11 Jul 2024 13:48:56 +0000 (13:48 +0000)] 
Backported.

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

12 months agompm_event: Simplify pollset "good methods" vs APR_POLLSET_WAKEABLE.
Yann Ylavic [Thu, 11 Jul 2024 13:48:18 +0000 (13:48 +0000)] 
mpm_event: Simplify pollset "good methods" vs APR_POLLSET_WAKEABLE.

* server/mpm/event/event.c(setup_threads_runtime):
  Simplify pollset creation code.

All pollset "good methods" implement APR_POLLSET_WAKEABLE and wake-ability
is quite important for MPM event's correctness anyway so simplify code around
pollset creation so as not to suggest that APR_POLLSET_NODEFAULT if favored
against APR_POLLSET_WAKEABLE.

While at it account for the wakeup pipe in the pollset_size since not all
pollset methods seem to do it internally in APR.

mpm_worker: Fix AH00045 about children processes not terminating timely.

* server/mpm/worker/worker.c(setup_threads_runtime):
  Create pollset with APR_POLLSET_WAKEABLE to be able to wake up the listener
  when stopping.

* server/mpm/worker/worker.c(wakeup_listener):
  Wake up the listener using the wakeup pipe (apr_pollset_wakeup).

* server/mpm/worker/worker.c(join_workers):
  Like mpm_event, don't depend on `pthread_kill(listener_thread, 0)` to check
  whether the listener has exited (this does not work on some systems), but use
  the "dying" global variable instead which is set by the listener just before
  exiting.

mpm_event,mpm_worker: Comment about pollset sizing when APR_POLLSET_WAKEABLE.

Follow up to r1916925 and r1916926.

Merges r1916925, r1916926, r1916929 from trunk
Reviewed by: rjung, ylavic, jorton

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

12 months agoVote and promote
Yann Ylavic [Thu, 11 Jul 2024 13:36:01 +0000 (13:36 +0000)] 
Vote and promote

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

12 months agovote/remind
Eric Covener [Thu, 11 Jul 2024 12:45:19 +0000 (12:45 +0000)] 
vote/remind

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

12 months agothe big pytest test suite sync with trunk
Stefan Eissing [Thu, 11 Jul 2024 08:18:12 +0000 (08:18 +0000)] 
the big pytest test suite sync with trunk

all the good stuff collected over the aeons now
also in the 2.4.x maintenance branch

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

12 months agoRegenerate docs.
Joe Orton [Thu, 11 Jul 2024 07:57:42 +0000 (07:57 +0000)] 
Regenerate docs.

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

12 months agoMerge r1914365, r1914622, r1916057, r1918024 from trunk:
Joe Orton [Thu, 11 Jul 2024 07:28:53 +0000 (07:28 +0000)] 
Merge r1914365, r1914622, r1916057, r1918024 from trunk:

mod_ssl: Add support for loading keys from OpenSSL 3.x providers via
the STORE API. Separates compile-time support for the STORE API
(supported in 3.x) from support for the ENGINE API (deprecated in
3.x).

* modules/ssl/ssl_private.h: Define MODSSL_HAVE_OPENSSL_STORE for
  OpenSSL 3.0+.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_store_uri,
  modssl_load_keypair_store): New functions.
  (modssl_load_keypair_engine): Renamed from modssl_load_keypair_engine.
  (modssl_load_engine_keypair): Reimplement to use new STORE-based
  functions if SSLCryptoDevice was not configured, or else old
  ENGINE implementation.

* modules/ssl/ssl_util.c (modssl_is_engine_id): Match pkcs11: URIs
  also for the OpenSSL 3.x STORE API.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Tweak log
  message on error paths for the provider/STORE case.

Signed-off-by: Ingo Franzki <ifranzki linux.ibm.com>
Submitted by: Ingo Franzki <ifranzki linux.ibm.com>

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair): Fix
  build (hopefully) for OpenSSL 3.x with OPENSSL_NO_ENGINE defined.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair):
  Update to avoid GCC warning for no-engine builds where the
  SSLModConfigRec is not used. Also log an error for the ENOTIMPL
  path.

Fix ENGINE use with OpenSSL 3.2, which appears to be broken due to a
refcounting issue in mod_ssl.

* modules/ssl/ssl_engine_pphrase.c (modssl_engine_cleanup):
  New function.
  (modssl_load_keypair_engine): Take pconf & ptemp arguments, don't
  call ENGINE_finish() immediately but register the above cleanup.
  (modssl_load_engine_keypair): Pass through pconf & ptemp.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs):
  Pass through pconf and ptemp to modssl_load_engine_keypair.

Submitted by: jorton
Reviewed by: jorton, ylavic, rpluem
Github: closes #455

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

12 months ago* Vote
Ruediger Pluem [Thu, 11 Jul 2024 06:58:51 +0000 (06:58 +0000)] 
* Vote

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

12 months ago* Vote, promote, comment
Ruediger Pluem [Thu, 11 Jul 2024 06:46:15 +0000 (06:46 +0000)] 
* Vote, promote, comment

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

12 months ago* Add proposal
Ruediger Pluem [Thu, 11 Jul 2024 06:31:16 +0000 (06:31 +0000)] 
* Add proposal

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

12 months agoVote/promote x1.
Joe Orton [Wed, 10 Jul 2024 15:03:53 +0000 (15:03 +0000)] 
Vote/promote x1.

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

12 months agofr doc rebuild.
Lucien Gentis [Sat, 6 Jul 2024 15:26:02 +0000 (15:26 +0000)] 
fr doc rebuild.

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

12 months agofr doc XML files updates.
Lucien Gentis [Sat, 6 Jul 2024 15:24:42 +0000 (15:24 +0000)] 
fr doc XML files updates.

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

13 months agoOn '2.4.x' branch:
Ivan Zhakov [Fri, 5 Jul 2024 09:11:38 +0000 (09:11 +0000)] 
On '2.4.x' branch:
  * CHANGES: Fix typo.

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

13 months agoMerge r1918880, r1918881, r1918883 from trunk:
Ruediger Pluem [Thu, 4 Jul 2024 15:58:17 +0000 (15:58 +0000)] 
Merge r1918880, r1918881, r1918883 from trunk:

* Restore SSL dumping for OpenSSL >= 3.0.

  Since r1908537 BIO_set_callback_ex is used with OpenSSL >= 3.0 instead of
  BIO_set_callback to set the BIO callback. The meaning of parameters and
  their range of values in the callback function set by BIO_set_callback_ex
  has changed compared to the callback function set by BIO_set_callback
  although parameters kept their names. Accommodate for this and adjust the
  code accordingly.
  Furthermore limit the size of dumps to APR_UINT16_MAX bytes. Given the length
  of SSL records of 16k this should not have practical implications.

* Changelog for r1918880

mod_ssl: Let modssl_set_io_callbacks() decide which callback is needed.

* modules/ssl/ssl_private.h:
  Add conn_rec and server_rec args to modssl_set_io_callbacks().

* modules/ssl/ssl_engine_io.c(modssl_set_io_callbacks):
  Don't set modssl_io_cb for log levels below TRACE4.

* modules/ssl/ssl_engine_io.c(ssl_io_filter_init),
  modules/ssl/ssl_engine_kernel.c(ssl_find_vhost):
  Call modssl_set_io_callbacks() unconditionally.

* modules/ssl/ssl_engine_io.c(modssl_io_cb):
  While at it, (cmd & BIO_CB_WRITE) is enough to differentiate a
  write from read.

Reviewed by: rpluem, ylavic, jorton

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

13 months agoVote/promote.
Joe Orton [Thu, 4 Jul 2024 09:29:29 +0000 (09:29 +0000)] 
Vote/promote.

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

13 months agoVote x 2
Yann Ylavic [Thu, 4 Jul 2024 09:23:01 +0000 (09:23 +0000)] 
Vote x 2

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

13 months ago* Propose
Ruediger Pluem [Thu, 4 Jul 2024 07:44:04 +0000 (07:44 +0000)] 
* Propose

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

13 months agoxforms
Eric Covener [Wed, 3 Jul 2024 22:30:28 +0000 (22:30 +0000)] 
xforms

[skip ci]

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

13 months agoMerge r1918892 from trunk:
Eric Covener [Wed, 3 Jul 2024 22:30:14 +0000 (22:30 +0000)] 
Merge r1918892 from trunk:

mention quirks, add example, clarify

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

13 months agopublishing release httpd-2.4.61
Eric Covener [Wed, 3 Jul 2024 15:00:11 +0000 (15:00 +0000)] 
publishing release httpd-2.4.61

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

13 months agobackported
Eric Covener [Tue, 2 Jul 2024 13:10:18 +0000 (13:10 +0000)] 
backported

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

13 months agoMerge r1918795, r1918814 from trunk:
Eric Covener [Tue, 2 Jul 2024 13:07:17 +0000 (13:07 +0000)] 
Merge r1918795, r1918814 from trunk:

maintain trusted flag

* Always trust content types that we set literally

Submitted by: covener, rpluem
Reviewed by: covener, jorton, rpluem

Github: closes #459

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

13 months ago* Vote and promote
Ruediger Pluem [Tue, 2 Jul 2024 12:45:01 +0000 (12:45 +0000)] 
* Vote and promote

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

13 months agoVote.
Joe Orton [Tue, 2 Jul 2024 12:12:05 +0000 (12:12 +0000)] 
Vote.

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

13 months agoadd/reset
Eric Covener [Tue, 2 Jul 2024 12:06:11 +0000 (12:06 +0000)] 
add/reset

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

13 months agoupdate reporter
Eric Covener [Tue, 2 Jul 2024 10:27:08 +0000 (10:27 +0000)] 
update reporter

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

13 months agoVote
Yann Ylavic [Mon, 1 Jul 2024 21:19:05 +0000 (21:19 +0000)] 
Vote

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

13 months agopropose
Eric Covener [Mon, 1 Jul 2024 19:25:48 +0000 (19:25 +0000)] 
propose

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

13 months agomore intuitive dropin
Eric Covener [Mon, 1 Jul 2024 19:21:01 +0000 (19:21 +0000)] 
more intuitive dropin

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

13 months agocleanup changes entries for CVEs, add Content-Type
Eric Covener [Mon, 1 Jul 2024 18:57:32 +0000 (18:57 +0000)] 
cleanup changes entries for CVEs, add Content-Type

note.

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

13 months agoxforms
Eric Covener [Mon, 1 Jul 2024 18:39:11 +0000 (18:39 +0000)] 
xforms

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

13 months agoMerge r1918789 from trunk:
Eric Covener [Mon, 1 Jul 2024 18:38:46 +0000 (18:38 +0000)] 
Merge r1918789 from trunk:

remove openssl vs. event comment

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

13 months agopublishing release httpd-2.4.60
Eric Covener [Mon, 1 Jul 2024 12:31:58 +0000 (12:31 +0000)] 
publishing release httpd-2.4.60

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

13 months agoPropose
Rainer Jung [Thu, 27 Jun 2024 11:17:12 +0000 (11:17 +0000)] 
Propose

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

13 months agoBackported x 2
Yann Ylavic [Wed, 26 Jun 2024 15:00:40 +0000 (15:00 +0000)] 
Backported x 2

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

13 months agofactor out IS_SLASH, perdir fix
Yann Ylavic [Wed, 26 Jun 2024 14:56:47 +0000 (14:56 +0000)] 
factor out IS_SLASH, perdir fix

in per-dir, the filename will be internally redirected, so / is OK too.

don't add / to / in the non-perdir

match AP_IS_SLASH macro

followup to 1918651

Merges r1918651, r1918652, r1918663 from trunk
Reviewed by: covener, ylavic, rpluem
GH: close #458

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

13 months agomod_proxy: Fixup UDS filename for mod_proxy called through r->handler.
Yann Ylavic [Wed, 26 Jun 2024 14:51:32 +0000 (14:51 +0000)] 
mod_proxy: Fixup UDS filename for mod_proxy called through r->handler.

* modules/proxy/proxy_util.c:
  Export ap_proxy_fixup_uds_filename() from fix_uds_filename.
  Call it from ap_proxy_pre_request() even for rewritten balancer workers.

* modules/proxy/mod_proxy.h:
  Declare ap_proxy_fixup_uds_filename()

* modules/proxy/mod_proxy.c:
  Fixup UDS filename from r->handler in proxy_handler().

* include/ap_mmn.h:
  Bump MMN minor for ap_proxy_fixup_uds_filename()

mod_proxy: follow up to r1918626: Simplify ap_proxy_fixup_uds_filename() and callers.

Merges r1918626, r1918647 from trunk
GH: closes #457

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

13 months ago* Vote and promote
Ruediger Pluem [Wed, 26 Jun 2024 14:04:07 +0000 (14:04 +0000)] 
* Vote and promote

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

13 months agoupdate, leave vote
Eric Covener [Wed, 26 Jun 2024 13:40:42 +0000 (13:40 +0000)] 
update, leave vote

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

13 months agoVote.
Yann Ylavic [Wed, 26 Jun 2024 13:02:31 +0000 (13:02 +0000)] 
Vote.

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

13 months agoMerge proposals.
Yann Ylavic [Wed, 26 Jun 2024 12:58:48 +0000 (12:58 +0000)] 
Merge proposals.

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

13 months agotypo
Eric Covener [Wed, 26 Jun 2024 12:34:48 +0000 (12:34 +0000)] 
typo

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

13 months agopropose yanns showstopper
Eric Covener [Wed, 26 Jun 2024 12:25:58 +0000 (12:25 +0000)] 
propose yanns showstopper

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

13 months agopropose rewrite followup
Eric Covener [Wed, 26 Jun 2024 11:16:50 +0000 (11:16 +0000)] 
propose rewrite followup

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

13 months agoPropose.
Yann Ylavic [Wed, 26 Jun 2024 10:07:46 +0000 (10:07 +0000)] 
Propose.

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