Merge r1734006 from trunk:

mod_ssl: Don't lose track of the SSL context if the ssl_run_pre_handshake()
hook returns an error.

Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic
Backported by: ylavic

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

Merge r1733523, r1733691 from trunk:

Use ap_array_str_contains to simplify code

Use ap_array_str_contains to simplify code
Remove a useless test (groups is always NULL)
Improve some style

Submitted by: jailletc36
Reviewed by: jailletc36, jim, ylavic
Backported by: ylavic

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

Backported in r1734391.

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

Merge r1601624 from trunk:

Strip useless apr_brigade_cleanup() calls.

Submitted/backported by: ylavic
Reviewed by: jailletc36, jim, ylavic

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

Vote, promote.

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

xforms

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

Revert part of last change  because the corresponding display looks strange.

Only keep changes related to sycnh with trunk

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

xforms

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

Be more consistent in the way examples are formatted

Spotted by David Eisner  in online doc

+ synch with trunk

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

update transformation

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

property fixup

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

* Votes

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

backport rewrite ? handling bug fix

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

Merge r1734125 from trunk:

mod_rewrite: Add QSL|qslast flag to allow rewrites to files with
literal question marks in their names.

PR 58777.

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

mod_rewrite: PR58854: Revert r1726016 (rewrite looping issue) which was
reverted in trunk in r1732896. The fix is bad and breaks old loop
avoidance.

Reviewed By: covener, ylavic, jim

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

Propose.

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

Comment, ask...

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

Vote, promote.

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

votes!

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

add PR58777

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

move to proper section

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

Documentation rebuild

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

Backporting documentation commits from trunk (new mod_ssl note about ECC): r1734058,r1734060,r1734067,r1734069

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

Propose.

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

Merge r1733952, r1733953 from trunk:

Note that Timeout on a new connection can be "hidden" by an
AcceptFilter.

Timeout scenarios are more of an unordered list.

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

Proposal

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

Merge r1733747 from trunk:

mixmatched sections reported in comments

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

Rebuild.

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

XML update.

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

Rebuild.

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

XML updates.

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

Proposals

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

Relax comment :)

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

Merge r1684171 from trunk:

mod_ssl: when SSLVerify is disabled (NONE), don't force a renegotiation if
the SSLVerifyDepth applied with the default/handshaken vhost differs from
the one applicable with the finally selected vhost.

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1711479, r1733064, r1733068 from trunk:

Fix crash in ap_mpm_pod_check call caused by NULL dereference of its parameter
when starting httpd as single process (httpd -X).

Revert changes on mpm_event and mpm_worker from r1711479.
The POD is not used in one process mode for those MPMs.

Follow up to r1711479 and r1733064: CHANGES entry.
Submitted by: jkaluza, ylavic, ylavic
Reviewed/backported by: jim

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

Merge r1729826, r1729847, r1732986, r1733056 from trunk:

mod_proxy: Play/restore the TLS-SNI on new backend connections which
had to be issued because the remote closed the previous/reusable one
during idle (keep-alive) time.

mod_proxy: follow up to r1729826: really copy conn->ssl_hostname.

mod_proxy: follow up to r1729826 + r1729847.
Adjust stacked ssl_hostname maximum size.

mod_proxy: follow up to r1729826 + r1729847 + r1732986.
Don't use magic constants.
Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1727603 from trunk:

event: slave connection init, vhost early config
Submitted by: icing
Reviewed/backported by: jim

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

promote

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

tested and voted

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

Fix version in compatibility note

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

rebuild

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

rewritemap doc improvements from trunk

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

time to yank, still working on the issue with the cpanel guys,
but the first fix is bad.

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

  *) core: Add missing APLOGNO() from r1729495 (somehow r1725395 was
             backported in r1729495 but without this "server/core.c" change)

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

Merge r1732954 from trunk:

mod_proxy: add missing APLOGNO()s.
Submitted by: ylavic
Reviewed/backported by: jim

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

ez promote

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

ez

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

Note new patch which addresses the coupla empty LOGNO

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

note

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

Merge r1729930, r1729931 from trunk:

hostname: Test and log useragent_host per-request across various modules,
including the scoreboard, expression and rewrite engines, setenvif,
authz_host, access_compat, custom logging, ssl and REMOTE_HOST variables.
PR55348  [William Rowe]

This is the complete change set which applies cleanly to 2.4.x as well,
the server/scoreboard.c will follow, which does not apply due to drift.

A rather ugly patch since the code was refactored recently to exclude
the simple patch for 2.4.x, illustrated below.

Completes the changeset r1729930 and resolves all 2.4.19-dev corrections,
but other 2.5.0-dev specific changes may still be needed on trunk.

--- server/scoreboard.c (revision 1729907)
+++ server/scoreboard.c (working copy)
@@ -491,9 +491,8 @@
             ws->conn_bytes = 0;
         }
         if (r) {
-            const char *client = ap_get_remote_host(c, r->per_dir_config,
-                                 REMOTE_NOLOOKUP, NULL);
-            if (!client || !strcmp(client, c->client_ip)) {
+            const char *client;
+            if (!(client = ap_get_useragent_host(r, REMOTE_NOLOOKUP, NULL))) {
                 apr_cpystrn(ws->client, r->useragent_ip, sizeof(ws->client));
             }
             else {

Submitted by: wrowe
Reviewed/backported by: jim

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

Merge r1729929 from trunk:

Introduce an ap_get_useragent_host() accessor to replace the old
ap_get_remote_host() in most applications, but preserve the original
behavior for all ap_get_remote_host() consumers (mostly, because we
don't have the request_rec in the first place, and also to avoid any
unintended consequences).

This accessor continues to store the remote_host of connection based
uesr agents within the conn_rec for optimization.  Only where some
other module modifies the useragent_addr will we perform a per-request
query of the remote_host.

(Fixed compilation issues noted by Ranier, applies to 2.4.x trunk,
modulo CHANGES and ap_mmn.h)

Submitted by: wrowe
Reviewed/backported by: jim

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

backport

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

backport of PR 59019 fix

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

mod_http2: fixing max conneciton workers when H2MaxWorkers is not configured

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

vote

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

votes

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

backport of mod_http2 v1.3.2 minus event conn-status fixup

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

Vote.

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

people.a.o has just died, welcome home :)

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

Propose.

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

Votes.

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

Propose.

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

Vote.

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

Update proposal.

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

Revive stalled work with comments addressed, resetting votes.

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

Committed revision 1733066.

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

Merge r1726881, r1727111 from trunk:

* Introduce SSLOCSPProxyURL in order to do OCSP requests via a HTTP proxy.
  Documentation to follow.

* Change entry and documentation for SSLOCSPProxyURL
Submitted by: rpluem
Reviewed/backported by: jim

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

Improve proposal per Jim feedbacks.

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

update transformation

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

property fixup

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

Fix typo

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

Proposal

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

Follow up to r1727393: add missing (voted) change from trunk's r1723284.

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

Propose.

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

Vote, promote, comment.

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

Use original trunk commit which works.

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

Propose missing APLOGNO()s backports.

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

comment mod_systemd

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

Rebuild.

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

XML updates.

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

Propose

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

Rebuild.

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

XML updates.

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

update after backport

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

addded proposal

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

uodate after backport

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

merging pre_close_connection hook, prep_lingering_close and ap_update_child() additions from trunk

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

assuming I understood the 2 votes reset correctly, accepting the pre_close_connection hook

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

update after merge

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

mod_proxy_wstunnel, mod_proxy_connect: Use the correct pool and allocator
     lifetime when sending brigades and buckets down the filter chain

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

vote

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

votes

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

Add images

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

Howto update

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

Documentation rebuild

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

Added more references to mod_proxy_* doc about websockets and load balancing.

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

xforms

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

Add V.34 option for ModemStandard directive
("i-was-rich-and-got-a-leased-line" is still undocumented, but do we really to document it?)

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

xforms

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

Add compatibility notes.
Synch with trunk

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