Merge r1428184, r1429228 from trunk:

Improve pkg-config usage for mod_ssl/ab:

also use pkg-config for determining the -l flags (and fall back
to a hardcoded default of "-lssl -lcrypto")

add --static to pkg-config invocations, so that libraries for
static linking are also taken into account (PR 54252 - note that
the additional flags will only appear in modules/ssl/modules.mk
and ab_LDFLAGS, so potential side effects are limited)

separate --libs-only-L and --libs-only-other into two invocations
(can't be used concurrently, only the first takes effect)

use --silence-errors where applicable

mod_ssl/ab: only use "--static" for pkg-config when explicity requested
(by adding an "--enable-ssl-staticlib-deps" option to configure)

Submitted by: kbrand
Reviewed/backported by: jim

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

answer Jim

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

comment

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

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

ivote and idemote

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

Note that v is a shortcut for reqenv

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

PPI patch from dev@ discussion

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

Merge r1409437 from trunk:

Give the opportunity to the compiler to compute at compile time the strlen of the given
string. Most of the calls to ap_fputs are done with constant strings.
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1384913, r1399687, r1419719, r1419755, r1416278, r1330189 from trunk:

Add a few AP_DEBUG_ASSERT()s for the benefit of clang

style tweak

No need to clear memory that is fully initialized just the line after.

Avoid unnecessary %s substitution

Avoid processing some files twice if APR_INCLUDEDIR and
APU_INCLUDEDIR containin the same path but differing in
doubled slashes.

Fixed position of the NEED_ENHANCED_ESCAPES define.

This define should be outside of the else case so that it
gets also defined if we cross-compile for Win32 or OS2.

Submitted by: sf, trawick, jailletc36, jailletc36, sf, fuankg
Reviewed/backported by: jim

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

Merge r1422549, r1422712 from trunk:

add new ap_bin2hex() utility function

remove unnecessary cast

Submitted by: sf
Reviewed/backported by: jim

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

vote

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

Merge r1417529 from trunk:

Add useful mod_status info... try to determine last time
a specific vhost was accessed/used.
Reviewed/backported by: jim

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

Lacks 3 votes

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

Added missing part of incomplete backport r1439099.

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

Added missing exports for NetWare (backport r1422874).

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

Propose

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

remove obsolete comment

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

Backport r1439114:
rpm: Bump the epoch on mod_proxy_html so that older separately packaged
versions of mod_proxy_html don't take precedence over us.

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

mod_cache does no longer send Content-Type header
for fresh content.

Followup to trunk r1361153+r1373447 resp. 2.4.x
r1373115+r1393191 (PR 53539, wrong Content-Type
for stale content).

Backport of r1439083 from trunk.

No CHANGES needed, because problem was introduced
after 2.4.3.

Submitted by: rjung
Backported by: rjung
Reviewed by: rjung, covener, minfrin

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

Update transformations.

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

Backport r1439106:
Clarify more clearly in the examples which configurations are limited
to CacheQuickHandler off and which support both.

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

xforms

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

Vote and promote.

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

Backport lua dbd bindings to 2.4

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

promotions

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

some relatively easy reviews

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

Vote + promote

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

Vote, promote, propose.

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

[Documentation] Adding a number of french translation for some module documentation

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

Updates.

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

Propose

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

Typo

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

Merge r1438838 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

try to emphasize that ErrorDocument nnn /foo doesn't send a HTTP redirect.

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

Merge r1438833 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

http://httpd.apache.org/docs/2.4/platform/windows.html#comment_760

Get rid of "SystemRoot" used where ServerRoot was meant, by dropping this
whole part of the sentence.

(use drive letters, unless they're network drives and you're running as
a service ...)

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

Propose

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

Rebuild

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

Merge from trunk

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

rebuild

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

merge from trunk

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

Tweak phrasing to more closely match what we say in the include section

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

Adds examples for fsize and clarifies the difference between file and virtual

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

Adds example to echo

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

update xforms

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

Merge r1387110, r1387444, r1387979, r1387607, r1387693, r1407085, r1421953 from trunk:

Persist local balancer-manager changes across restart/graceful.

Use identifying server_rec info when we know we have
unique and useful data :)

fix clang warning (dead initialization)

Log whether or not the restore from shm actually
resulted in a match of shm data, or whether it
was stale.

and this one as well... persist isn't inherited

better logging for re-use/use of shm

Allow for searching w/i shm slots for a specific worker and balancer
Reviewed/backported by: jim

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

Merge r1392120, r1392122, r1392150 from trunk:

Fix shell errors when trying to AC_MSG_RESULT() for --with-module.
(The change to IFS hosed any AC_MSG_foo() invocations.)

It is easy enough to reorder the reset of IFS and the AC_MSG_RESULT()
invocation, but there's a big stretch of shell code where AC_MSG_foo()
might be useful someday, so get rid of the commas at the start and
leave IFS alone and AC_MSG_foo() at will.

fix bug in r1392120: replace ALL commas

--with-module: Fix failure to integrate them into some existing
module directories.

modules/config?.m4 needs to run after the modules/*/config?.m4.
Otherwise, modules.mk as created for --with-module gets wiped
out first.

PR: 40097

Submitted by: trawick
Reviewed/backported by: jim

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

Backport done.

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

Merge 1436401 from trunk:

* support/htcacheclean.c (main): Ensure -p was used before attempting
  to process URL arguments.

Reviewed by: jorton, rpluem, rjung

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

Vote for some backports for 2.4.x.  (Not going anywhere near BI.  *grin*)

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

Vote for BalancerInherit

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

(Easy) vote, promote.

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

* Vote

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

Merge r1433988 from trunk:

* A limit of zero means unlimited for LimitRequestBody.

PR: 54435
Submitted by: Pavel Mateja <pavel netsafe.cz>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: rpluem, jim, jorton

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

Add CHANGES for r1436400.

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

Vote, promote, propose.

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

Merge r1435178 from trunk:

mod_proxy_ajp: Support unknown HTTP methods.
BZ 54416

Forward unknown methods as request attributes
using method id SC_M_JK_STORED=0xFF and
request attribute id SC_A_STORED_METHOD=13.

Code ported from mod_jk (which got it from mod_jk2).

Supported by Tomcat at least since TC 4.1.
Doesn't seem to be supported by Jetty though.

Submitted by: rjung
Reviewed/backported by: jim

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

update transformation

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

ipromote

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

preapps and comments/responses

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

property fixes.

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

[Documentation] Adding a number of .fr translation files for 2.4 documentation

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

notes and vote

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

Add note to proposal. Thanks for reminder.

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

Rebuild

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

ErrorLogFormat has different defaults on different MPMs

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

xforms

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

fix "missing" example

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

* Add proposal

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

vote/comment

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

Propose.

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

Updates.

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

Propose

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

xforms

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

fix links

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

Merge r1433861 from trunk (w/updated quickreference.html.en transforms).

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

vote, propose

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

Rebuild/test

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

Same typo here. Gah

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

Adds examples to the <!--#config SSI function

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

The word 'Basic' is not meaningful here. These are all of the available elements.

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

Rebuild

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

s/element/function/g

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

Rebuild

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

s/Apache/Apache httpd/;'

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

Rebuild

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

Apply changes from trunk

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

htcacheclean: Fix list options "-a" and "-A".

Without the fix output is empty because there's no filetype
without APR_FINFO_TYPE.
The options are new in 2.4.

Backport of r1433001 from trunk.

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

and some promotey.

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

easy piecy votey.

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

Vote.

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

Propose.

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

update proposal

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

revert, not a bug after all

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

Update proposal

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

Updates.

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

mod_slotmem_shm: Fix mistaken reset of num_free for restored shm
trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1430869

Submitted by: jim
Reviewed by: humbedooh, minfrin

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

mod_proxy: non-existance of byrequests is not an immediate error
trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1428916

Submitted by: jim
Reviewed by: humbedooh, minfrin

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

Updates.

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

add default

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

...and promote.

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

Votes...

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