Updates.

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

Propose.

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

propose proxy persist

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

propose sync-up of mod_slotmem* from trunk

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

Merge r1383490 from trunk:

Avoid the overhead of creating and grabbing a uuid for
the balancer nonce if we're never going to use it.
Reviewed/backported by: jim

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

Merged in 1388547

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

Merge r1375584 from trunk:

* modules/ssl/ssl_engine_io.c (ssl_io_filter_handshake): Add a
  wildcard common name match.

PR: 53006

Submitted by: jorton
Reviewed/backported by: jim

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

Promote proposed patches

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

Exercising my voting muscles

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

whitespace fixes

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

More complete (and backwards compatible) patch

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

Vote, propose.

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

vote

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

propose revert of r1371878, default conf changes for DNT on IE10

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

close this bug and Do The Right Thing

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

votes

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

various xforms

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

backport some version-"wrongnesses"/confusions from trunk.

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

should have voted here, too

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

This is 2.4, not 2.3, and we do not support Windows 9x/ME.

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

propose, vote

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

* APR-UTIL trunk is dead. Point to the latest stable branch.

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

Vote

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

propose DefaultRuntimeDir for mod_slotmem_plain... the discussion
item doesn't apply.

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

Windows: Fix output of -M, -L, and similar command-line options
which display information about the server configuration (backport r1374428).
Submitted by: trawick
Reviewed/backported by: gsmith, fuankg

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

applied.

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

proxy_connect_handler: fix use of APLOGNO() (backport r1375407).
Submitted by: jorton
Reviewed/backported by: sf, fuankg

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

vote, promote.

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

PPR fix proposed

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

Updates.

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

xforms

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

s/Location/LocationMatch/

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

xforms

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

Merge r1384408 from trunk:

Best practice

Reviewed/backported by: jim

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

Updates.

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

update transformation

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

update properties.

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

balancer manager nonce optimization

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

comment

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

vote+promote

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

propose; vote.

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

Updates.

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

Updates.

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

typo/grammar fixes

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

xforms

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

Forgot one more 2.2-style rule that needed fixing

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

Replacing 2.2-style IP check with 2.4-style.

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

Typo fixes

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

Updates.

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

xforms

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

typo fixes

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

Updates.

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

xforms

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

backport r1379311: Add a notion that, for a skip flag to be used, the rewrite rule has to first match (as per comment #211 on site)

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

backport r1379321: Note that using rewrites with a file-path substitution in a .htaccess file will look for files relative to your document root, not relative to your file system root.

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

backport r1379031: Note that AuthDBDUserRealmQuery is for Digest auth requests, not Basic auth.

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

backport r1379335: Add Redirect* to the list of directives that are controlled by AllowOverride FileInfo

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

vote

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

bunch o' xforms

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

backport r1378498: Fixing a copypasto as per comment #225 on the site.

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

Update.

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

propose backport of r1376695 to limit logged Status lines

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

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

Authz*Authoritative removed between 2.2 and 2.4

http://httpd.apache.org/docs/2.4/upgrading.html#comment_222

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

Comment out LuaMapHandler, as it's not implemented in 2.4.x yet.

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

xforms

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

Updates:
- Authz provider is available in 2.4.3 and later
- Fix whitespace issues

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

xforms

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

Add back the parsebody references that were commented out, and elaborate on how r:parsebody() works

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

Propose*2.

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

fix an grammatical error

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

Add default value of PrivilegesMode to docs.

Backport of r1375011 from trunk.

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

Clarify code comment.
CTR.

Backport of r1375009 from trunk.

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

Removed tabs and traling spaces.
Backport of r1375034 - no functional change.

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

merge r1375006 from trunk:

describe some interesting differences from Unix MPMs

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

Update proposal info, now that the authz provider has been backported

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

Updates.

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

xforms

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

merge r1374569 from trunk:

add links to AcceptFilter and Windows platform documentation

add some notes on key configuration issues

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

Perhaps the users of httpd on Windows are the real ultra geeks.

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

and we are at 2.4.4-dev

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

Get ready to tag 2.4.3

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

Add backport of r1374199 in r1374202
to mergeinfo.d

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

Un"fix" the bug reference.

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

mod_proxy_balancer: Remove wrong error code
parameter from log message.

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

Fix closing the back end connection in case of error.
The field "closed" was changed from an int to a bit
field of size one in 2.4.x.
For historical reasons a close instruction was coded
as an increment on the field, which in 2.4.x flips
the field each time. There were mutliple could paths
that would flip it several times for a single error,
so effectively the connection was no longer closed
in these cases.

Especially in the case of an aborted client connection
this lead to a non consumed back end buffer and thus to
response mixup between users.

PR 53727

CVE-2012-3052

Backport of r1373955 from trunk.

Submitted by: rjung
Reviewed by: jim, trawick

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

Updates.

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

vote/promote

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

Reference the 2.4.x bug for the proxy/balancer/reverse issue.

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

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