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

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

Backported in r1919145.

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

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

Merged in r1919123

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

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

Backported.

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

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

vote [skip ci]

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

Sync CHANGES.

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

Backported.

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

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

Vote and promote

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

vote/remind

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

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

Regenerate docs.

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

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

* Vote

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

* Vote, promote, comment

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

* Add proposal

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

Vote/promote x1.

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1918973 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@1918972 13f79535-47bb-0310-9956-ffa450edef68

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

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

Vote/promote.

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

Vote x 2

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

* Propose

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

xforms

[skip ci]

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

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

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

backported

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

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

* Vote and promote

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

Vote.

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

add/reset

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

update reporter

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

Vote

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

propose

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

more intuitive dropin

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

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

xforms

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

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

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

Propose

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

Backported x 2

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

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

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

* Vote and promote

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

update, leave vote

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

Vote.

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

Merge proposals.

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

typo

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

propose yanns showstopper

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

propose rewrite followup

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

Propose.

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

Really bump MMN.

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

mod_proxy_http2: ap_proxy_determine_connection()'s given &url is in/out.

* modules/http2/mod_proxy_http2.c(proxy_http2_handler):
  Restart from the original URL on reconnect.

Merges r1918627 from trunk (experimental/CTR).

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

Merge r1918623 from trunk:

fix comparison of local path on Windows

Submitted By: Yann Ylavic

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

xforms

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

backport logno from r1918604

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

Merge r1918606 from trunk:

validate hostname

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

Merge r1918553 from trunk:

block inadvertent subst of special filenames

+ cosmetic merge conflicts

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

pytest: fix asset list extraction from nghttp output
Provided by rpluem.

Backport of r1918576 from trunk.
CTR.

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

Merge r1918565 from trunk:

docs bld break

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

make update-changes

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

MMN bump for recent additions

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

Merge r1918552 from trunk:

tighten up prefix_stat and %3f handling

Require opt-ins for unsafe substitutions

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

Merge r1918551 from trunk:

add ap_set_content_type_ex to differentiate

trusted sources

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

Merge r1918550 from trunk:

mod_proxy: escape for non-proxypass configuration

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

Merge r1918549 from trunk:

add UNCList directive on Windows

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

Merge r1918548 from trunk:

mod_http2: early exit if bb is null

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

cleanup after merge

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

Merge GH PR #454

  *) mod_proxy: Fix DNS requests and connections closed before the
     configured addressTTL.  BZ 69126.  [Yann Ylavic]

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

vote and promote

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

update after merge

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

vote and promote

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

Merge of GH PR #440

  *) core: Support zone/scope in IPv6 link-local addresses in Listen and
     VirtualHost directives (requires APR 1.7.x or later).  PR 59396
     [Joe Orton]

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1918509 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@1918508 13f79535-47bb-0310-9956-ffa450edef68

Sync proposal (keeping icing's vote)

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

Merged x2.

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

Merge r1917578 from trunk:

On Linux use the real thread id via gettid() in error logging,
where available, rather than the (meaningless) default
pthread_self()-as-integer interpretation:

* configure.in: Define DEFAULT_LOG_TID on Linux if gettid() is available.

* server/log.c: Define DEFAULT_LOG_TID as NULL by default.
  (do_errorlog_default): Use DEFAULT_LOG_TID as the argument to log_tid().

Reviewed by: jorton, ylavic, icing

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

Merge r1877397, r1877795 from trunk:

mod_ssl: Switch to using SSL_OP_NO_RENEGOTATION (where available) to
block client-initiated renegotiation with TLSv1.2 and earlier.

* modules/ssl/ssl_private.h: Define modssl_reneg_state enum,
  modssl_set_reneg_state function.

* modules/ssl/ssl_engine_io.c (bio_filter_out_write,
  bio_filter_in_read): #ifdef-out reneg protection if
  SSL_OP_NO_RENEGOTATION is defined.

* modules/ssl/ssl_engine_init.c (ssl_init_ctx_protocol):
  Enable SSL_OP_NO_RENEGOTATION.
  (ssl_init_ctx_callbacks): Only enable the "info" callback if
  debug-level logging *or* OpenSSL doesn't support SSL_OP_NO_RENEGOTATION.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access_classic): Use
  modssl_set_reneg_state to set the reneg protection mode.
  (ssl_hook_Access_modern): Drop manipulation of the reneg mode which
  does nothing for TLSv1.3 already.
  (ssl_callback_Info): Only enable reneg protection if
  SSL_OP_NO_RENEGOTATION is *not* defined.

* modules/ssl/ssl_util_ssl.c (modssl_set_reneg_state): New function.

mod_ssl: follow up to r1877397: fix SSL_OP_NO_RENEGOT*I*ATION typo.

Should work better now :)

Submitted by: jorton, ylavic
Reviewed by: jorton, ylavic, icing
Github: closes #426

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

vote

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

vote

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

Vote x 1.

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

Re-propose PR 449.

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

Vote x1, propose x1.

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

Update proposal (yet again).

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

Update proposal (again).

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

Note/credit mime.types changes.

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

Update proposal.

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

Merge r1915514, r1918129 from trunk: [CTR for docs]

Add MPEG-TS file extensions

Submitted by: Mohamed Akram <mohd.akram outlook.com>
Github: closes #372

Add avif mime type

Submitted by: Adam Silverstein <adamsilverstein earthboundhosting.com>
Github: closes #451

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

Update mergeinfo for docs/conf/mime.types.

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

Sync CHANGES.

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

Vote x 1, propose x 1, WIP x 1.

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

Merge r1918407 from trunk:

emphasize no default value

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

Merged x2.

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

Merge r1916863 from trunk:

* Ensure that we set the default DH parameters for the key

Replace else with an if as the if branch no longer ensures that
custome DH parameters have been loaded.
This fixes a regression that causes the default DH parameters for a key
no longer set and thus effectively disabling DH ciphers when no explicit
DH parameters are set.

PR: 68863
Submitted by: rpluem
Reviewed by: rpluem, jorton, ylavic

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