Merge r1231255, r1231257 from trunk:

  *) mod_authnz_ldap: Don't try a potentially expensive nested groups
     search before exhausting all AuthLDAPGroupAttribute checks on the
     current group. PR52464

whitespace only: shift a block refactored in r1231255 over 8 spaces.

Submitted by: covener
Reviewed/backported by: jim

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

Anotehr patch

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

http://people.apache.org/~rjung/patches/x-www-form-urlencoded-content-type-checking.patch

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

Merge r1351020, r1370466 from trunk:

Add new directive LuaAuthzProvider to allow implementing an
authorization provider in lua

There is only one global provider name space, therefore allow
LuaAuthzProvider only in global scope.

Remove unnecessary server config field.

Submitted by: sf
Reviewed/backported by: jim

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

promote

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

votes

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

Make sure that we clean up the ldap module folder.
(backport r1374199)

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

Propose.

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

Vote.

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

Propose.

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

Vote, propose.

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

Update.

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

propose mod_authnz_ldap nested groups optimization -- thanks Rainer
for pointing out the non-backported fix.

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

Sometimes httpd-2.4.x-deps.tar.gz files are provided under additional downloads

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

add CHANGES entry for r1371878/r1373085

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

Propose.

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

fix stray file merge artifact

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

Fix bus error in mod_socache_shmcb due to a misalignment
in some 32 bit builds, especially on Solaris Sparc.

PR 53040.

Backport of r1373270 from trunk.

Submitted by: rjung
Reviewed by: rpluem, trawick

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

vote/promote/demote

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

* Vote

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

Vote, propose, revoke, adjust.

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

xforms

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

clarify :)

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

Revert r1373105, the merging of incompatible DefaultRuntimeDir
changes.

The trunk patches for these all have some configuration breakage
as 2.4.x interprets the individual directive or API parameter as
relative to ServerRoot whereas trunk interprets everything
relative to DefaultRuntimeDir.

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

fix minor formatting mistake I made when originally committing a fix to trunk

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

update xforms

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

Editors choice on CHANGES

Merge r1361153 from trunk:

* Set content type in case we return stale content.
Submitted by: rpluem
Reviewed/backported by: jim

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

Merge r1367819 from trunk:

initialize the protocol field when manufacturing an apr socket
lest accidential autodata contents leak into the apr_socket_t

(this doesn't address any known problem symptom)

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1371801 from trunk:

Windows: Fix SSL failures on windows with AcceptFilter https none.

The now-stray apr_socket_opt_set(APR_SO_NONBLOCK=On) call was
originally added with r327872.  The call was harmless on Unix
due to APR's use of non-blocking sockets when implementing timeouts
on that platform, but harmful on Windows since it collided with
APR's different implementation of timeouts on that platform.

PR: 52476

Submitted by: trawick
Reviewed/backported by: jim

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

Promote and a question

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

Votes!

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

Merge r1364695, r1369477, r1369808, r1370288, r1370225, r1370763, r1371684 from trunk:

mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/
DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.

core: Respect DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR for the
scoreboard (ScoreBoardFile).

The Pidfile directive and ap_log_pid()/ap_remove_pid()/ap_read_pid()
now respect DefaultRuntimeDir

Mutex directive: finish support of DefaultRuntimeDir

a partial conversion was made in r1299718, but I'm not
sure when that change is effective

mod_socache_shmcb and mod_socache_dbm: finish support of
DefaultRuntimeDir

a partial conversion was made in r1299718, affecting cases
where no filename was specified

mod_slotmem_plain: make the "filename" key relative to
DefaultRuntimeDir if not absolute

mod_slotmem_plain does not externalize or check the full path
in any way, so this change is just for consistency with other
modules which build paths to run-time artifacts.

make LDAPSharedCacheFile relative to DefaultRuntimeDir

Submitted by: trawick
Reviewed/backported by: jim

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

Promote

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

Merge r1361801 from trunk:

Various code clean up

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 52893

Submitted by: sf
Reviewed/backported by: jim

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

sockets are simple, right?

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

Merge r1364229 from trunk:

Correctly log the error returned by apr_dbd_pvselect()

Submitted by: sf
Reviewed/backported by: jim

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

Merge r1371878 from trunk:

Apache does not tolerate deliberate abuse of open standards

Submitted by: fielding
Reviewed/backported by: jim

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

Merge r1364133, r1371791 from trunk:

When -B is specified, search for a host address in the
same family as the specified outbound interface.  If
impossible, fail at name resolution instead of bind().

ab: Fix read failure when targeting SSL server.

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1371387 from trunk:

mod_auth_digest now respects DefaultRuntimeDir
Submitted by: trawick
Reviewed/backported by: jim

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

Promote

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

Vote on patches

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

normal vote/promote stuff

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

Add a missing paren

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

xforms

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

grammar fix

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

Update proposal *blames niq*

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

htpasswd: Use correct file mode for checking if file is writable.
Also switch to the non-deprecated APR_FOPEN_* flags.
PR: 45923

Backport of r1369618 from trunk.

Submitted by: sf
Reviewed by: rjung, trawick, humbedooh
Backported by: rjung

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

mpm_winnt: Tweak a message added in r750567 so that the accept thread
logs the physical address it listens on instead of hostname|*.

Backport of r1364138 from trunk.

Submitted by: trawick
Reviewed by: rjung, humbedooh
Backported by: rjung

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

Axe unnecessary trailing comma from server-status user output.

Backport of r1369904 from trunk.

Submitted by: trawick
Reviewed by: rjung, humbedooh
Backported by: rjung

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

Update proposal. I haven't had coffee yet - that must be why.

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

Promote

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

Vote

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

Propose

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

awesome beach day

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

vote

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

votes

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

Add a round of very easy to review backport proposals.
Also add the revision numbers related to DefaultRuntimeDir.

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

Comment spelling fix.

CTR

Backport of r1368131 from trunk.

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

Comment

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

bad header doxygen: ap_rflush does not return the number
of bytes flushed, it returns 0 on success, -1 on error.

Should be CTR.

Backport of rr1368393 and r1368396 from trunk.

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

Add comment to DNT suggestion.

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

Vote, comment.

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

xforms

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

Fix typo/syntax error in docs.

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

Fix mod_headers documentation:
- add expr= to syntax rule
- add optional replacement argument to Header syntax
- add "edit*" command to Header syntax
- add "edit*" explanation to Header directive

Backport of r1371903 from trunk.

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

Revisions r1370592,1370615-1370616 have been backported
in r1371164.

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

the sun is rising over Mars

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

it is way too hot for 1am

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

(SSL failures on Windows with AcceptFilter https none)?

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

ab fixes

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

remove a non-controversial concept vote, replace with a real example

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

xforms

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

Remove reference to the iPlanet SDK, as it doesn't seem to exist anymore

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

Update links that were either broken of just slightly off

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

Committed revision 1371208

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

Merge r1369995, r1369999, r1370001 from trunk:

Use apr_pcalloc for rewritemap_entry struct, to avoid uninitialized entries.

PR: 53663
Submitted by: Mikhail T. <mi apache aldan algebra com>

remove now unecessary assignment

Add changes entry for r1369995, r1369999

Submitted by: sf
Reviewed/backported by: jim

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

promote patch

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

Votes on prposals

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

NetWare build tweaks.
mwccnlm: search directory of referencing file first for #includes.
(backport r1370592, 1370615)
Make use of CFLAGS from environment.
Added default maxerrors value 1 so that the compiler breaks
after 1st error; can be overwritten with CC_MAX_ERRORS var.
(backport 1370616)

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

Added new symbol introduced with r1366693.

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

xforms

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

typo fixes

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

typo fix

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

conceptual proposals

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

grab r1370907 from trunk:

fix subversion project URL

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

xforms

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

grab 1370764 from trunk:

fix broken module identifiers

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

Vote.

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

xforms

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

fix grammar and remove some scopes within which some directives do not work

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

Update proposal

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

propose, comment

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

Update.

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

Push out

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

Update proposal

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

Fix proposal

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

Comment.

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

xforms

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

clarify that the 2.4 pidfile APIs process paths relative to ServerRoot

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

Propose + vote

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