one more promo, fix whitespace

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

promote

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

vote, shrink proposal based on jailletc36's comments.

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

Showstopper to patch adoption, along with a more general objection

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

vote

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

only vote

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

reversal of r1747004 bc unwanted changes

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

vote

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

update after backport

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

Merge of r1733537 from trunk:

ab: caseless matching for http heaers

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

vote

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

vote

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

votes

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

xforms

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

trunk has providers for customlog/globallog, 2.4.x doesn't.

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

Proposal

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

Backport r1746754
Synch with trunk, merge r1628690

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

Rebuild.

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

XML updates.

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

Rebuild.

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

XML update.

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

Propose a fix for unexpectedly unexpected behavior

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

Revert 1746645, was sitting in the wrong tree, mea culpa...

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

Correct the behavior and interaction between SSLProxyCheckPeer[CN|Name],
such that disabling either disables both, and that enabling either will
trigger the more comprehensive SSLProxyCheckPeerName behavior.

Only a single configuration remains to enable the legacy behavior, which
is to explicitly disable SSLProxyCheckPeerName and enable SSLProxyCheckPeerCN.

Major refactoring leads us to an alternate implementation for 2.4.21;
https://github.com/wrowe/patches/blob/master/fix_proxy_check_peer-2.4.x.patch

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

Translated to match english revision.
Reviewed. build the html file

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

Fix r1746184
(when you rename a parameter, make sure to update places where it is used...)

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

Fix some obvious doxygen warning

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

Off by one "make dox" warning

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

Documentation rebuild

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

Revert my previous doc commit about upstream DNS resolution caching in mod-proxy, there is still confusion in the users@ mailing list about what is the real behavior.

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

Update my recent vote

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

Vote

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

Update proposal

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

Rebuild.

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

XML updates.

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

rebuild

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

Send them to the auth'ed area on success, as expected.

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

Rebuild

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

auth_form example from trunk

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

didn't think about CHANGES

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

Improve example layout
Synch with trunk

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

xforms

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

Fix broken link

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

Synch with trunk
merge r1745711 from trunk

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

Synch with trunk

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

propose

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

Proposal

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

_setargv will not compile on _MSC_VER > 1700 MS documentation's example simply does not work. Disabe for now, Apachemonitor still works.

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

Documentation rebuild

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

Adding a note to mod_proxy documentation to clarify DNS resolution with origin servers. Follow up from a question on users@. Backported from trunk.

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

xforms

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

2.4.x only: replace() not backported.

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

Merge r1745206 from trunk:

add a -R example, I had to ask for help to figure out the single quotes.

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

merge of r1745175 from trunk:

mod_http2: fix for possible null pointer deref on aborted bucket beam.

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

mod_http2: backport of v1.5.6 plus mod_proxy_http2 dsp support

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

auth_digest doc improvement

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

Move proposal to the right section.

I think that the latest proposal from jorton should also be moved.

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

two quick fixes

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

Proposal

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

rebuild

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

Clarify the file-group syntax.

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

Rebuild.

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

XML updates.

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

xforms

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

update

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

Merge r1722177, r1722195, r1722229, r1722320, r1722328, r1722334, r1722350, r1722351, r1722358, r1722377, r1723953, r1724879, r1724992, r1724993, r1724995, r1725018, r1725031, r1725120, r1725328, r1725387, r1725489, r1725498, r1725499, r1725523, r1725545, r1725567, r1725581, r1725602, r1725822, r1725967, r1726038, r1726049, r1726051, r1726052, r1726055, r1725090, r1728326, r1737020 from trunk:

Commit framework impl of health-check module plus
required changes. The actual health checking is
currently in progress, but wanted to add in at
this stage.

Make aware of new status: Failed Health Check.
Store the number of current passes/fails in shm

finish looping logic... place-holder for actual checking

Better check

move to per server conf, useful for adding HealthCheckCondition

Now implement the condition ruleset definition. The
actual checking will be done in the actual health check
routine.

just check watched servers... use 'hc' prefix for sub directives

Check that we have names for both templates and
conditions

command changes

Don't bother w/ methods that return bodies. We don't
handle them now anyway.

Use enums and structs to keep things better organized

1st cut of 'simple' tcp check... We reuse various proxy
function and so this *could* be more streamlined, but
use this to show how the other would work, since we need
brigades, SSL/TLS support, etc.

Since every check needs this, do this in the main
check loop. Allows some optimizations.

move scope

pull this out... large enough for a func

Move to a set of health check workers, mapping to
each worker itself, instead of a single reused generic
worker.

some ordering optimization

Make balancer manager health-check aware

And we now allow for health checks via OPTIONS *

Leverage the OPTIONS code for HEAD as well...
So we now support: TCP, OPTIONS and HEAD.

Right now, anything other than an error (even a 404)
is consider a PASS.

Fill in APLOGNO.

I hope that doesn't result in merge trouble
for Jim.

Open up hook/scar to allow for passes/fails and
method to be changed via bal-man...

OPTIONS/HEAD proxy function should be diff from simple TCP check

For OPTIONS and HEAD, only 2xx and 3xx are considered "passing"
(until I implement the conditions expr testing)... honor
the pass/fail count and LOG_INFO when the health check enables
or disables a backend worker.

Start impl of expr conditions for runtime checks

Adjust log levels

correct error string

Use worker status character defines taken
from mod_proxy.h instead of explicit characters.

Noted by rpluem.

With the updated ap_expr, we can now check for the
returned response body, stored in kept_body

Assign log message tags

Implement expr lookup in mod_proxy_hcheck for
variables whose names start with "HC_" and for
the new function hc().

Currently only HC_BODY and hc(body) are supported.
Both return the saved body of the health check
response to be used in an expr that decides about
success of a check.

Fix copy&paste error in new function.

Try fixing new proxy_hcheck expr extension.

Interestingly mod_ssl using NULL as well,
but some other module I wrote uses parms->name.

Adjust

clash :)

Enabling a worker via health-check also moves them out of
ERROR more (which may have been set via the static
"health" check done via mod_proxy).

Some flow improvements...

Submitted by: jim, rjung, jim, jim, jim, jim, jim, jim, rjung, jim, jim, rjung, rjung, rjung, jim, jim, olegk, jim, jim
Reviewed/backported by: jim

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

bump CVE to the top

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

Merge r1744580 from trunk:

add availability to rewriteoption too

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

Merge r1744578 from trunk:

using context info for rewritebase was not until 2.4.16

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

Fix example in French doc

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

mod_http2: backport of v1.5.5

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

avoid copy/paste trap

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

update after backport

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

merge of r1743699 fromn trunk:

http_core: Avoid truncating the_request line when there is no request to 'W'rite.

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

vote

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

vote

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

hcheck vote

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

mod_rewrite: proposing backport of h2:// and h2c:// support

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

mod_proxy_http2: removed proposals that have been backported already

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

documentation rebuild

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

Backported mod_authn_dbm documentation update. Corrected broken link and add an example about Berkeley db. PR: 59558

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

propose PR59111 for backport

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

xforms

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

Fix typo in doc as spotted by Pete Edwards  in online doc.
Improve layout.
(mostly r1743790 + r1743798 in trunk)

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

+1 that healthchecking goodness

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

vote

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

removing no longer needed obj from mod_proxy_http2 config

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

Merge of 1742260,1742359,1742444,1742445,1742446,1742447,1742460,1743335,1743517,1743788 from trunk:

mod_http2/mod_proxy_http2 update with latest changes from trunk to 1.5.4.
Update of CMake and Netware makefiles.

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

Propose

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

* Vote

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

Revert premature mis-commit of proposed patch (had only meant to test merging

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

Revert premature mis-commit of proposed patch (had only meant to test merging

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

Replace one backport proposal with another

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

Remove comment which was part of r1735668 (merged in r1743576) but was lost during backport.

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

Merge r1729208, r1735668, r1735668, r1735931, r1735935, r1735942 from trunk:

let proxy handler forward ALPN protocol strings for ssl proxy connections

Remove leftover comment

Remove leftover comment

APLOGNO update for mod_proxy_http2

fix APLOGNO at wrong place, me stupid

h2_proxy_session: fill in missing APLOGNO()s.
Submitted by: icing, jailletc36, jailletc36, icing, icing, ylavic
Reviewed/backported by: jim

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

Merge r1729208, r1735668, r1735931, r1735935, r1735942 from trunk:

let proxy handler forward ALPN protocol strings for ssl proxy connections

Remove leftover comment

APLOGNO update for mod_proxy_http2

fix APLOGNO at wrong place, me stupid

h2_proxy_session: fill in missing APLOGNO()s.
Submitted by: icing, jailletc36, icing, icing, ylavic
Reviewed/backported by: jim

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

Merge r1742135 from trunk:

We need another guard, this may resolve a crash in the rather odd faux-server
implementation in mod_perl test suite which calls access checking too early.

Submitted by: wrowe
Reviewed/backported by: jim

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

prmote

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

vote

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

Don't globber scoreboard request info if read_request_line() fails with
a timeout. In that case there's not yet any new useful request info
available.
Noticed via server-status for prefork showing request "NULL" after
keep-alive connections timed out.

PR: 59333.
Backports: 1742792
Submitted by: rjung
Reviewed by: ylavic, wrowe

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