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

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

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

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

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

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

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

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

http2 renaming.


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

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

Followup to r1707039.


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

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

Merge r1684900, r1687539, r1687680, r1688331, r1688339, r1688340, r1688341, r1688343, r1697013, r1697015 from trunk:

mod_substitute: Fix configuraton merge order.
PR 57641 [Marc.Stern]


mod_substitute: follow up r1684900.
Introduce the SubstituteInheritBefore directive to configure the merge order.
This allows to preserve 2.4 and earlier behaviour.


mod_substitute: follow up to r1687539.
Use tristate single inherit_before variable instead of two, according to
wrowe's advices.


mod_substitute: follow up to r1687680.
Fix dir config merger 'over'-write, thanks Bill (again).

Very difficult to read, and therefore was wrong.

Assert that the SubstituteInheritBefore option was explicitly toggled,
and do not default in 2.x to this legacy behavior.



Optimize in all cases that the members are all explicitly initialized.

Useful for 2.2 and 2.4, but trunk will require the subsequent patch.




Increase legibility of the max_line_length behavior, and adjust for
the requirement that all members are initialized explicitly due to
the previous patch.



Net -8 LoC, my usual specialty.

This didn't need to be reinvented; please use established helpers.



mod_substitute: follow up r1688339.
SubstituteInheritBefore is the default in 2.5.x but wasn't for ealier versions.


mod_substitute: follow up r1697013.
Update the doc.
Submitted by: niq, ylavic, ylavic, ylavic, wrowe, wrowe, wrowe, wrowe, ylavic, ylavic
Reviewed/backported by: jim


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

m4: please any autoconf by quoting AC_DEFUN's names. PR 58126.

Submitted by: olli hauer <ohauer gmx.de>

Submitted by: ylavic
Reviewed/backported by: jim


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

Fix some style issues on files that can easily be synch'ed with 2.4.x
Submitted by: jailletc36
Reviewed/backported by: jim


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

Adjust since we are now in shared mem area

Thx Werror: error: address of array 'balancer->s->sticky' will always evaluate to 'true'

Reviewed/backported by: jim


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

core: follow up to r1629909: ap_daemons_to_start can't be lower than 1 (not 0) for prefork either.
Submitted by: ylavic
Reviewed/backported by: jim


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

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

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

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

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

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

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

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

fix parameter name in ap_log_rdata C99 macro def.  
Via  PR57045


Submitted by: covener
Reviewed/backported by: jim


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

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

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

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

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

Fix logic to limit exported symbols in DSO form of mod_http2.


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

Support mod_http2 in cmake-based build for Windows.
Leave LoadModule of mod_http2 commented-out by default.

Merge r1706635 from trunk:

mod_http2 larger with 64-bit VS 2012 RelWithDebInfo build


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

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

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

Backport r1706533 to 2.4: Turn 5.1/5.2 order upside down, simplify. This should also (AFAIK) work with Ubuntu/Debian, which has previously been known to fail to compile mod_lua.so

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

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

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

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr> 




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

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

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

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