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

Merge r1918150 from trunk: [CTR for CI changes]

CI: Set the path to php-fpm so it's found by proxy_fcgi.t (after r1918149).

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

Merge r1862968, r1863191, r1867878, r1867882, r1867968, r1867971, r1869421, r1874491, r1874511, r1879119, r1879136, r1879860, r1881459, r1881559, r1867970 from trunk:

Add experimental support for fd passing in mod_cgid.  Attaches CGI
script stderr to the error log specific to the vhost, by passing the
appropriate fd over the AF_UNIX socket from the request handling
thread to the cgid server process.

* modules/generators/config5.m4: Add --enable-cgid-fdpassing.

* modules/generators/mod_cgid.c (sock_readhdr): New function, also
  returns auxiliary control data (the stderr fd) if available.
  (sock_write): Take optional aux fd argument, send it as control
  data.  (send_req, get_req): Adjust accordingly to pass/receive the
  stderr fd.
  (cgid_server): Use passed fd if available, limit the lifetime.

PR: 60692

mod_cgid: Continuation of r1862968, experimental fd passing support.

Split out CGI bucket implementation from mod_cgi and use in both
mod_cgi and mod_cgid, bringing stderr handling in mod_cgid up to par
with mod_cgi.  (There is a lot of code which has been copied between
mod_cgi{,d} so there's scope for further reduction of source
duplication between the modules using this header)

* modules/generators/cgi_common.h: Copied from mod_cgi.c, removed
  everything but the CGI bucket implementation with only one change:
  (struct cgi_bucket_data, cgi_bucket_create, cgi_bucket_read): Take a
  timeout on bucket creation, store and use on reads.

* modules/generators/mod_cgi.c [APR_FILES_AS_SOCKETS]: Include
  cgi_common.h.
  (cgi_handler): Pass configured timeout to CGI bucket.

* modules/generators/mod_cgid.c: Include cgi_common.h.
  (log_script_err): Copy from mod_cgi.c.
  (log_script): Use log_script_err.
  (send_req): Take fd for stderr.
  (cgid_child_errfn): Handle fd-passing case by writing error
  to stderr for client to pass through ap_log_rerror.
  (cgid_handler): Create pipe for stderr, pass write-end to
  server via send_req, use read-end to create CGI bucket.  Handle
  stderr output in failure paths.

PR: 54221

* modules/generators/mod_cgid.c (sock_readhdr): Only set up control
  message block when required; add some additional error handling.

* modules/generators/cgi_common.h (cgi_bucket_create):
  Disable APR timeout handling here for all callers.

* modules/generators/mod_cgi.c (cgi_handler): ... drop it here.

PR: 63797

Move common (and near-identical) code for CGI response output handling
to cgi_common.h; the diff between the modules for this code was as
follows:

https://people.apache.org/~jorton/mod_cgi-to-cgid-handler.diff

Change from previous: mod_cgi will now explicitly discard output when
returning HTTP_MOVED_TEMPORARILY for relative redirects (should not be
functionally different), TRACE1 logging of ap_pass_brigade failures
for mod_cgid is dropped.

* modules/generators/cgi_common.h (cgi_handle_response): New function,
  factored out from mod_cgid.
  (discard_script_output): Copied function from mod_cgi/d unchanged.

* modules/generator/mod_cgid.c (cgid_handler),
  modules/generator/mod_cgi.c (cgi_handler): Use cgi_handle_response.

Fix build broken w/o --enable-cgid-fdpassing by r1867968:

* modules/generators/cgi_common.h: Only define CGI bucket type
  if WANT_CGI_BUCKET is defined.

* modules/generators/mod_cgi.c: Always include cgi_common.h, defining
  WANT_CGI_BUCKET iff APR_FILES_AS_SOCKETS is defined

* modules/generators/mod_cgid.c: Always include cgi_common.h, defining
  WANT_CGI_BUCKET iff HAVE_CGID_FDPASSING (--enable-cgid-fdpassing).

Add comment, no functional change.

* modules/generators/cgi_common.h (cgi_handle_request): Factor out
  near-identical common code from mod_cgid, mod_cgi.

* modules/generators/mod_cgid.c (cgid_handler),
  modules/generators/mod_cgi.c (cgi_handler):
  Adjust to use cgi_handle_request.

* modules/generators/cgi_common.h (cgi_handle_request): Catch
  (unlikely) apr_bucket_read() failure when reading request.

* modules/generators/mod_cgid.c (cgid_handler): Bail immediately with
  a 503 response on errors when talking to the daemon.  Check the pid
  returned is not zero.

* modules/generators/mod_cgid.c (get_req): Add basic sanity
  checking for the structure received in the CGI daemon.

* modules/generators/mod_cgid.c (get_cgi_pid): Fix test for pid=0.
  (cgid_handler): Remove duplicated test for pid=0 here added in
  r1879119.

* modules/generators/cgi_common.h (cgi_handle_response): Avoid trying
  to read the output brigade twice in the case of a timeout.

PR: 64709

Further re-unification of code duplicated across mod_cgi/mod_cgid into
cgi_common.h.  Functional changes:

- brings the PR 61980 fix to mod_cgid as well, and
- some mod_cgid-specific APLOGNOs are dropped in favour of the
  code used in the equivalent error path in mod_cgi

... otherwise no user-visible changes (intended).

* modules/generators/cgi_common.h (log_scripterror, log_script_err): Move
  here from mod_cgi.
  (cgi_handle_exec): Move here, renamed from mod_cgi's handle_exec.
  (cgi_optfns_retrieve): New function, split out from mod_cgi's cgi_post_config.

* modules/generators/mod_cgid.c: Adjust accordingly, update to pass
  logno separately.
  (register_hooks): Register cgi_optfns_retrieve.

* modules/generators/mod_cgi.c: Adjust accordingly.
  (register_hooks): Register cgi_optfns_retrieve.

* modules/generators/cgi_common.h (discard_script_output): Simplify
  slightly and ensure constant rather than unlimited memory
  consumption when discarding CGI script output (for e.g. a redirect
  response).

Github: closes #209
Reviewed by: jorton, ylavic, covener

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

vote/promote/stall

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

Propose x1.

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

Merge of /httpd/httpd/trunk:r1913837,1916861,1916907

 * mod_md:
   - Using OCSP stapling information to trigger certificate renewals. Proposed
     by @frasertweedale.
   - Added directive `MDCheckInterval` to control how often the server checks
     for detected revocations. Added proposals for configurations in the
     README.md chapter "Revocations".
   - OCSP stapling: accept OCSP responses without a `nextUpdate` entry which is
     allowed in RFC 6960. Treat those as having an update interval of 12 hours.
     Added by @frasertweedale.
   - Adapt OpenSSL usage to changes in their API. By Yann Ylavic.

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

Merge of /httpd/httpd/trunk:r1917270

 * mod_tls: update version of rustls-ffi to v0.13.0.
   [Daniel McCarney (@cpu}]

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

Merge r1910790, r1918059 from trunk: [CTR for CI changes]

Use 'git clone' rather than 'svn export' in CI scripts.
Drop unused run_svn_export.
Run git clone with -q throughout.

CI: For LDAP tests, switch to using OpenLDAP slapd running on
CentOS Stream 9.

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

propose 1918003 for backport

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

add warning about behavior change

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

3 votes + 1 promotion

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

Propose x1.

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

Vote x1, propose x1. [skip ci]

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

fr doc rebuild.

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

xform

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

Merge r1917053 from trunk:

doc recent addition ap_trust_cgilike_cl

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

* Add proposal

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

Propose x1.

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

fr doc rebuild.

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

Fix occasional pytest failures
in modules/http2/test_800_websockets.py
(test_h2_800_03_not_found and
test_h2_800_05_non_ws_delay_resource) due to
additional RST messages.

Backport of r1916830 from trunk.

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

Update mergeinfo for merged changes.

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

Fix occasional pytest failures
in modules/http2/test_800_websockets.py
(test_h2_800_04_non_ws_resource and
test_h2_800_09b_unsupported) due to
additional RST messages.

Backport of r1916808 from trunk.

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

Fix failing pytest modules/http2/test_712_buffering.py:48.

Do not count lines like "00:12:26.578220 <= Recv data, 0 bytes (0x0)"
(which happen before the final close) as receiving a real chunk.

Backport of r1918606 from trunk.

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

Fix pytest failure when using older nghttp2

Backport of r1916804 from trunk.

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

publishing release httpd-2.4.59

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

add recent mergeinfo

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

Merge r1916771 from trunk:

bail after too many failed reads

Submitted By: icing

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

header validation after content-* are eval'ed

backport r1916770 from trunk
Submitted By: ylavic

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

let httpd handle CL/TE for non-http handlers

backport r1916769 from trunk:
Submitted By: ylavic, covener

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

make update-changes

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

Regenerate docs.

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

Merge r1916129 from trunk (htpasswd docs):

Document SHA-2 support.

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

PR 64339 has been backported and closed.

So remove it from the PATCHES/ISSUES THAT ARE BEING WORKED section.

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

r1881790 has also added the 3rd argument to "ProxyRemoteMatch".

(r1916708 in trunk)

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

Fix a release version in <compatibility> tag.

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

Add <compatibility> note for CGIScriptTimeout.

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

Fix some release versions in <compatibility> tag.

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

Fix some release versions in <compatibility> tag.

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

Add mergeinfo

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

Update copyright year

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