* modules/http2/h2_session.c (h2_session_start):
 Restrict WebSockets options handling to with-WS builds.

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

Merge r1913016 from trunk: [RTC exception for CI changes]

Work around caching issue for CI builds with both apr&apr-util
built from source.

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

Merge r1913007 from trunk: [RTC exception for APLOGNO]

* modules/http2: Fill in APLOGNO.

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

Merge r1912015 from trunk:

mod_ssl: Silence info log message "SSL Library Error: error:0A000126:
         SSL routines::unexpected eof while reading" when using
         OpenSSL 3 by setting SSL_OP_IGNORE_UNEXPECTED_EOF if
         available. [Rainer Jung]

Reviewed by: rjung, gbechis, rpluem

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

Merge r1912015 from trunk:

mod_ssl: Silence info log message "SSL Library Error: error:0A000126:
         SSL routines::unexpected eof while reading" when using
         OpenSSL 3 by setting SSL_OP_IGNORE_UNEXPECTED_EOF if
         available. [Rainer Jung]

Reviewed by: rjung, gbechis, rpluem

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

Merge r1909137, r1911067 from trunk:

mod_alias: When an alias is declared inside a Location, make sure
the balance of the URL is preserved to match the alias declared
outside a location. Fixes an error where all requests are mapped
to the root of the location.

mod_alias: Add AliasPreservePath directive to map the full
path after the alias in a location.

Submitted by: minfrin
Reviewed by: minfrin, rpluem, covener

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

Merge of /httpd/httpd/trunk:r1913005

  *) mod_http2: enable WebSockets only when compiling against a
     recent enought nghttp2 version.

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

update CHANGES

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

Merge of /httpd/httpd/trunk:r1912999

 * mod_http2: improved early cleanup of streams.

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

Merge 1912993 from trunk:

  *) mod_macro: use our own strncmp function

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

cleanup after backport

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

Merge of 1912385 from trunk:

  *) mod_http2: fixed a bug in handling of stream timeouts.

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

cleanup after backport

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

Merge of 1912415 from trunk:

mod_http2: fixed a compile time issue on Windows builds.

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

propose backport of r1912245. [skip ci]

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

* Vote [skip ci]

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

propose backport of r1912415

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

* Vote and promote [skip ci]

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

propose 1912385 for back port

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

fr doc rebuild.

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

fr doc XML files updates.

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

misplaced "contextlist" tag.

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

Merge of /httpd/httpd/trunk:r1912180

  *) mod_proxy_http2: fix `X-Forward-Host` header to carry the correct value.
     Fixes PR66752.

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

Merge of /httpd/httpd/trunk:r1911964

  *) mod_proxy_http2: improved error handling on connection errors while
     response is already underway.

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

back port proposal

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

vote [skip ci]

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

Merge r1912085 from trunk:

Update DavBasePath availability.

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

Regenerate docs.

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

Merged x1.

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

Merge r1911651, r1911906 from trunk:

Add DAVBasePath directive to allow users to configure the real repos
root path, useful where the DAV repos is configured with a regex match.

* modules/dav/main/mod_dav.c
  (dav_get_resource): If available, pass the configured base path
  as the repos root to repos provider.
  On the error path for fetching a resource, detect and warn
  specifically when the location is configured via a regex.
  (dav_cmd_davbasepath): New function.

PR: 35077
Github: closes #377
Reviewed by: jorton, minfrin, rpluem

Merge r1911715, r1911907 from trunk:

Add docs for DavBasePath
Fix documented default for DavBasePath to match code.

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

Add backport proposal [skip ci]

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

vote/promote

[skip ci]

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

nit: 1861542,r1861569 were both mine

URL: http://svn.apache.org/viewvc?rev=1911934&view=rev
Log:
Backport to v2.4:

  *) mod_alias: Add RedirectRelative to allow relative redirect targets to be
     issued as-is.
     Trunk version of patch:
        https://svn.apache.org/r1861542
        https://svn.apache.org/r1861569
     Backport version for 2.4.x of patch:
      Trunk version of patch works
       svn merge -c 1861542,r1861569 ^/httpd/httpd/trunk .
     +1: minfrin, covener, icing

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

mod_http2: update version that has become v2.0.22 in github release

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

update after back port

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

Merge from trunk:

  *) mod_http2: added support for bootstrapping WebSockets via HTTP/2, as
     described in RFC 8441. A new directive 'H2WebSockets on|off' has been
     added. The feature is by default not enabled.
     As also discussed in the manual, this feature should work for setups
     using "ProxyPass backend-url upgrade=websocket" without further changes.
     Special server modules for WebSockets will have to be adapted,
     most likely, as the handling if IO events is different with HTTP/2.
     HTTP/2 WebSockets are supported on platforms with native pipes. This
     excludes Windows.
     New directive `H2ProxyRequests on|off` to enable handling
     of HTTP/2 requests in a forward proxy configuration.
     General forward proxying is enabled via `ProxyRequests`. If the
     HTTP/2 protocol is also enabled for such a server/host, this new
     directive is needed in addition.

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

vote [skip ci]

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

Backport proposal for mod_proxy_http2 error fix

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

* Vote [skip ci]

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

* Vote and promote [skip ci]

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

Add an hyper-link.
Fix a typo (s/a an/an/)
Be less agressive (s/ON/On/) and reorder "On|Off".
(r1911948 intrunk)

Fix <compatibility> version

[skip ci]

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

Vote.

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

Vote.

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

Update proposal.

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

Patch re-applied.

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

Backport to v2.4:

  *) mod_alias: Add RedirectRelative to allow relative redirect targets to be
     issued as-is.
     Trunk version of patch:
        https://svn.apache.org/r1861542
        https://svn.apache.org/r1861569
     Backport version for 2.4.x of patch:
      Trunk version of patch works
       svn merge -c 1861542,r1861569 ^/httpd/httpd/trunk .
     +1: minfrin, covener, icing

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

Update and reset.

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

Merge r1909429 and r1909606 from trunk:

mod_status: Remove duplicate keys "BusyWorkers" and "IdleWorkers".

Resolve inconsistency between the previous two occurrences by
counting workers in state SERVER_GRACEFUL no longer as busy,
but instead in a new counter "GracefulWorkers" (or on HTML
view as "workers gracefully restarting"). Also add the graceful
counter as a new column to the existing HTML per process table
for async MPMs.

PR 63300
Submitted by: rjung
Reviewed by: rjung, jorton, icing

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

vote

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

vote and promote

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

Vote, propose.

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

Propose.

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

Fix an URL.

PR 66630 [Samuel Joly <samueljoly0 gmail.com>]

r1911878 in trunk

[skip ci]

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

Remove an extra word.

Follow up to r1909084 (in trunk).

[skip ci]

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

Add compatibility version, typo (s/hader/header and s/representatins/representations) and trailing spaces.

Move the new directive at the correct place in the file. [Lucien Gentis]

Mostly r1911874 in trunk.

[skip ci]

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

cleanup after merge

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

Merge r1911291 from trunk:

  *) mod_http2: Fix reporting of `Total Accesses` in server-status to not count
     HTTP/2 requests twice. Fixes PR 66801.

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

* Vote and promote [skip ci]

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

vote [skip ci]

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

fr doc rebuild.

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

fr doc XML file update.

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

Merge /httpd/httpd/trunk:r1910996,1911721

 * mod_md:
   - New directive `MDMatchNames all|servernames` to allow more control over how
     MDomains are matched to VirtualHosts.
   - New directive `MDChallengeDns01Version`. Setting this to `2` will provide
     the command also with the challenge value on `teardown` invocation. In version
     1, the default, only the `setup` invocation gets this parameter.
     Refs #312. Thanks to @domrim for the idea.
   - For Managed Domain in "manual" mode, the checks if all used ServerName and
     ServerAlias are part of the MDomain now reports a warning instead of an error
     (AH10040) when not all names are present.
   - MDChallengeDns01 can now be configured for individual domains.
     Using PR from Jérôme Billiras (@bilhackmac) and adding test case and fixing proper working
   - Fixed a bug found by Jérôme Billiras (@bilhackmac) that caused the challenge
     teardown not being invoked as it should.

 * mod_md: fixed passing of the server environment variables to programs
   started via MDMessageCmd and MDChallengeDns01 on *nix system.
   See <https://github.com/icing/mod_md/issues/319>.

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

Merge of r1911718 from trunk

Tests, workarounds for bugs in curl 8.1.x

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

vote and promote

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

propose backport of r1911291.

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

Remove a not that helpful backport summary on tiny things.

Credit Yann who did most of the job in optimizing send_brigade_nonblocking()

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

vote/comment

[skip ci]

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

fr doc XML file update.

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

fr doc XML file update.

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

Backport to v2.4:

  *) core: Add formats %{z} and %{strftime-format} to ErrorLogFormat, and make
     sure that if the format is configured early enough it applies to every log
     line.  PR 62161.
     trunk patch: https://svn.apache.org/r1908380
                  https://svn.apache.org/r1908383
                  https://svn.apache.org/r1908384
                  https://svn.apache.org/r1908388
                  https://svn.apache.org/r1908389
                  https://svn.apache.org/r1908390
                  https://svn.apache.org/r1908393
                  https://svn.apache.org/r1908394
                  https://svn.apache.org/r1908406
                  https://svn.apache.org/r1908407
                  https://svn.apache.org/r1908556
                  https://svn.apache.org/r1908557
     2.4.x patch: svn merge -c 1908380,1908383-1908384,1908388-1908390,1908393-1908394,1908406-1908407,1908556-1908557 ^/httpd/httpd/trunk .
                  (merge works modulo MMN, or patch/PR below)
                  https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/350.diff
                  https://github.com/apache/httpd/pull/350
     +1: ylavic, rpluem, minfrin

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

Vote and promote.

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

Update proposal.

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

Backport proposal already backported in r1911060.

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

Backport to v2.4:

  *) mod_deflate: Add DeflateAlterETag to control how the ETag
     is modified. The 'NoChange' parameter mimics 2.2.x behavior.
     PR 45023, PR 39727.
     Trunk version of patch:
        https://svn.apache.org/r1586542
     Backport version for 2.4.x of patch:
      https://raw.githubusercontent.com/jfclere/patch/main/mod_deflate.patch
     +1: jfclere, rpluem, ylavic
     rpluem says: Does anyone know why we don't merge the server config?

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

Backport to v2.4:

  *) core: Optimize send_brigade_nonblocking()
     trunk patch:
        https://svn.apache.org/r1892450
        https://svn.apache.org/r1909966
     2.4.x patch: svn merge -c 1892450,1909966 ^/httpd/httpd/trunk .
     +1: jailletc36, rpluem, icing

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

Backport to v2.4:

  *) Easy patches: synch 2.4.x and trunk
         - core: constify pointers in ap_expr lookup tables.  ~1/2Kb moves to r/o text section
         - core: Optimize performance in ap_normalize_path()
         - core: Optimize code flow in log_backtrace()
         - Fix a typo in README.cmake
         - Add a missing 'be' in README.CHANGES
     trunk patch:
          https://svn.apache.org/r1877350
          https://svn.apache.org/r1894021
          https://svn.apache.org/r1906379
          https://svn.apache.org/r1908657
          https://svn.apache.org/r1908150
     2.4.x patch: svn merge -c 1877350,1894021,1906379,1908657,1908150 ^/httpd/httpd/trunk .
     +1: jailletc36, rpluem, gbechis

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

mod_alias proposal.

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

Update proposal.

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

Propose.

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

Merge r1884511, r1901273, r1910843, r1910849 from trunk:

Add .opus extension for audio/ogg mimetype, per RFC 7845

RFC 7845: https://tools.ietf.org/html/rfc7845#section-9

Submitted by: Richard de Boer <richard tubul.net>
Github: closes #144

Merge of PR 318:

  *) core: the conf/mime.types has been updated in conformance with RFC 9239:
     - .js moved from 'application/javascript' to 'text/javascript'
     - .mjs was added as 'text/javascript'
     [Mathias Bynens <@mathiasbynens> via PR 318]

Add application/vnd.geogebra.slides mime type

Submitted by: Zbynek Konecny <zbynek1729 gmail.com>
Github: closes #207

Add WebAssembly MIME type and file extension

Submitted by: Dave Hodder <dmh dmh.org.uk>
Github: closes #332
Reviewed by: jorton, icing, covener

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

vote/promote

[skip ci]

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

backported

[skip ci]

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

Backport rewrite changes 1910649:1910705 from trunk

PR66672 trailing ? and QSA together regression

Reviewed By: covener, gbechis, ylavic

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

vote and propose h2 websockets for backport

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

fr doc rebuild.

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

fr doc XML file update.

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

Merged x3, propose x1.

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

Merge r1909241 from trunk:

* Add server directory to include path as mod_rewrite requires test_char.h.

PR: 66571
Submitted by: Valeria Petrov <valeria.petrov@spinetix.com>
Reviewed by: rpluem, icing, ylavic
Submitted by: rpluem

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

Merge r1908502 from trunk:

mod_http2: Fix memory leak in calc_sha256_hash().
Submitted by: ylavic
Reviewed by: icing, jorton, covener

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

Merge r1878890 from trunk:

mod_ldap: Use the LDAP API directly to implement the rebind callback
for modern versions of OpenLDAP, avoiding the overhead of the apr-util
implementation.

* modules/ldap/util_ldap.c:
  Define USE_APR_LDAP_REBIND if a modern version of OpenLDAP is used.
  (uldap_rebind_proc): New function.
  (uldap_rebind_init, uldap_rebind_add): Define, using either the
  callback or the (bad) APR-util versions.
  (uldap_connection_unbind): Clear the rebind pool to remove rebind
  references prior to destroying the LDAP *.
  Omit for !USE_APR_LDAP_REBIND.
  (uldap_connection_init): Use new wrappers, only create the rebind
  pool if USE_APR_LDAP_REBIND.

* include/util_ldap.h: Don't include apr_ldap_rebind.h here.

PR: 64414
Github: closes #124
Reviewed by: jorton, covener, ylavic (by inspection)

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

Merge r1910815 from trunk:

mod_rewrite: Fix a possible NULL pointer dereference in hook_uri2file

is_absolute_uri() dereferences r->filename in the function body, but
there is no check if r->filename == NULL before.

Submitted by: Luboš Uhliarik <luhliari redhat.com>
Reviewed by: jorton, covener, ylavic
Github: closes #355

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

Vote, promote.

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

vote/promote

[skip ci]

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

Merge, vote, propose.

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

Reference correct PR.

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

Fix some typo in CHANGES entry

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

Unless I missed somthing:
  - H2StreamTimeout has been introduced in 2.4.55
  - H2MaxDataFrameLen and H2MaxDataFrameLen will be available in the next 2.4.58.

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

Merge r1875355 from trunk:

* modules/ssl/ssl_util_stapling.c (stapling_check_response) Don't stop
  Certificate Revoked messages.

  Certificate Revoked Responder messages don't belong to 'error' class.
  When the server receives one, it MUST be passed on to the client.
  And stored for the normal period of basic responses.

  Also don't log an error each time it is retrieved from cache,
  only once when it is retrieved from the OCSP responder.

PR: 60182
Obtained from: https://github.com/apache/httpd/commit/7db9795f45fd4688ceb13ee36090e4e2becbc709.diff
Submitted by: <gmoniker gmail.com>
Reviewed by: gbechis, icing, ylavic

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

Propose x1.

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

fr doc rebuild.

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