CTR backport of r1501423 from trunk:

fix whitespace in AH00766 warning:
s/all of theinput/all of the input/

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

doccos

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

Merge r1406068, r1425777, r1427546, r1462643, r1487530, r1493330 from trunk:

Replace duplicate log tags

Check that AsyncRequestWorkerFactor is not negative

PR :54254
Submitted by: Jackie Zhang <jackie qq zhang gmail com>

remove unneeded include statements

Name pool + concat string at compile time when possible

* modules/filters/mod_ratelimit.c (rate_limit_filter): Log the error
  code.

Correct typo in error message
Submitted by: sf, jailletc36, jorton, jailletc36
Reviewed/backported by: jim

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

Merge r1481891, r1482075, r1482170, r1482555 from trunk:

mod_proxy: Ensure we don't attempt to amend a table we are iterating
through, ensuring that all headers listed by Connection are removed.

mod_proxy, mod_proxy_http: Connection headers must be stripped on the way
in and out, support an optional function to handle this.

hunk 1: C89 please;
hunk 2: optional functions are usually declared static.

mod_proxy: Make sure we skip empty tokens when parsing the Connection
header.

Submitted by: minfrin, fuankg, minfrin
Reviewed/backported by: jim

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

Merge r1457471, r1457504, r1462266, r1468581 from trunk:

mod_auth_basic: Add a generic mechanism to fake basic authentication
using the ap_expr parser. This allows the administrator to construct
their own username and password for basic authentication based on their
needs. Alternative fix for PR52616.

Remove the Authorization header should either the username or the password
resolve to an empty string.

* Inherit providers during merging

mod_auth_basic: Allow AuthBasicFake to be switched off for an URL space.

Submitted by: minfrin, rpluem, minfrin
Reviewed/backported by: jim

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

Merge r1483027 from trunk:

mod_proxy_http: Make the proxy-interim-response environment variable
effective by formally overriding origin server behaviour.

Submitted by: minfrin
Reviewed/backported by: jim

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

Merge r1501399 from trunk:

We are no longer pre-grabbing.

Reviewed/backported by: jim

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

Some votes, promote

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

drop a stray 8-bit char at end of line in comment (was r1498199 in trunk)

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

gratuitous 8-bit char in a comment (was r1498200 in trunk)

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

  The subject heading above reads "Release history:"

  Removing non-historical commentary from this section

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

Votes

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

Question re: casts

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

Note security implication

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

Bug fix: PREGRAB is no longer used by the balancer

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

Merge r1501369 from trunk:

Ensure balancer runs after proxy for mutex creation

Reviewed/backported by: jim

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

API

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

Merge r1480627, r1482859, r1483190, r1484343, r1500437 from trunk:

Mod_proxy used the global pool w/o mutex. fix.

mod_proxy: Use a global mutex for handling workers.

add in child_init which is needed

Add in logno's

conf->mutex is not used... Also, ensure that pool
use is protected

Submitted by: jim, minfrin, jim, jim, jim
Reviewed/backported by: jim

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

Oops... that should have been + not -

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

vote, promote

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

remove merge-info accidentally introduced with r1500327

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

Added another patch to proposal.

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

Added another patch to proposal.

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

Add sf note to recent CHANGES entry.

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

comment and vote

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

Propose.

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

Merge r1484832, r1484914 from trunk:

mod_deflate: Remove assumptions as to when an EOS bucket might arrive.
Gracefully step aside if the body size is zero.

mod_deflate: Make sure we process any EOS bucket in our brigade and
save going the long way round.

Submitted by: minfrin
Reviewed/backported by: jim

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

Merge r1488158, r1488164 from trunk:

mod_session_dbd: Make sure that dirty flag is respected when saving
sessions, and ensure the session ID is changed each time the session
changes.

mod_session_dbd: Update the sql query for sessions updates.

Submitted by: minfrin
Reviewed/backported by: jim

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

Typo

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

xforms

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

Merge r1500323:
add note when default algorithm has been changed

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

Updates.

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

Upsdate.

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

xform

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

Merge r1500042 from trunk:

address comment http://httpd.apache.org/docs/2.4/vhosts/examples.html#comment_1441 by
explicitly mentioning that ServerName may be calculated and inherited.

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

xform

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

add compatibility info for SSLProxyCheckPeerName

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

add the directive name to the changes entry for SSLProxyCheckPeerName

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

Applied.

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

Avoid including apr_general.h.
The MSVC Resource Compiler truncates macro names at char 31.
Since apr_general.h includes apr.h which in turn includes
system headers we get warnings or errors with the Resource
Compiler with newer system headers (VC10 and later) which
have macro names defined with more than 31 chars.
(backport from trunk r1499742)
Reviewed by: gsmith, sf

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

vote+promote

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

vote

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

comment

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

propose.

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

vote/comment/promote

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

comment/vote/promote

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

Vote.

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

propose open_htaccess hook

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

OCSP fix done.

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

Merge 1488296 from trunk:

* modules/ssl/ssl_util_ocsp.c (read_response): Ignore empty buckets in
  the brigade, which can be left over from line splitting.  Fixes case
  where the OCSP response was only partially read from the wire.

Reviewed by: jorton, jim, sf

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

vote+promote, remove duplicate mod_proxy proposal

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

please review

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

2 votes

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

Add OCSP fix.

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

Merge r1498310 from trunk.

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

Update.

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

Simplify example (backport r1498176 from trunk).
Fix r.mpm_query() (backport r1498179 from trunk).

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

Remove line added during the trunk sync in
r1491468. The line never was part of trunk.
CTR (mod_lua).

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

- Move mod_lua items from trunk CHANGES to 2.4.
- Group mod_lua items in 2.4.4 CHANGES part.
- Remove redundant parts of the short sync with
  trunk notice.

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

Propose easy votes to keep 2.4 in sync with trunk

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

Slight clarification of CHANGES entry.

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

Fix indentation (plus now needed line-wrap).
No functional change.
Followup to r1486454.
Backport of r1497588.

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

Merge r1496429 from trunk:

core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
on Linux kernel versions 3.x and above.

PR: 55121
Submitted by: Bradley Heilbrun <apache heilbrun.org>
Reviewed by: trawick

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1491564 from trunk:

const goodness with nasty strrchr and strchr functions
(resolve warning in maintainer mode)

Submitted by: trawick
Reviewed/backported by: jim

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

promote

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

vote and comment

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

Vote.

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

Updated doccu.

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

Update doccu.

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

Added new r:touch() function; updated docs.
(Backport r1495270, r1495665, r1495666)

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

whitespace changes only (indentation)

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

note

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

fix stray character

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

fix some new warnings in 2.4.5-dev

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

we lost SINGLE_LISTEN_UNSERIALIZED_ACCEPT on Linux 3.x :(

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

let's roll!

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

Some votes

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

Merge r1492663 from trunk:

mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
correctly.

Submitted by: minfrin
Reviewed/backported by: jim

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

update transformation

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

mention addoutputfilterbytype moving to mod_filter

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

Fix typo (trunk r1491610)

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

Updates.

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

Vote + promote

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

svn:eol-style = native

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

update transformation

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

fix properties.

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

merge r1495501 from trunk:

fix doc for ap_pregsub_ex() return code

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

fix strange wording

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

Merge r1494952 from trunk:

Document apxs -p paramter.

Submitted by: Jan Kaluža <jkaluza@redhat.com>
Reviewed by: covener

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

Add a comment.

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

mod_cache_socache: Fix warning "variable 'rv' may
be used uninitialized in this function"
(which is correct here).

Backport of r1494536 form trunk.

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

Vote, promote.

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

Applied.

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

sync with trunk to silent compiler warnings.
Backport of r1481677, r1494317, r1488496.
Reviewed by: fuankg, gsmith, minfrin

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

Promote.

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

Vote.

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

Vote.

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

Propose.

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

vote

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

propose.

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