backport typo fixes from trunk

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

xforms

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

Whitespace issue + Spanish typo fix (as per comment #308)

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

   * headers: Move *_DECLARE_* macros to beginning of line in headers.
        trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1374963
             2.4.x patch: http://people.apache.org/~fuankg/diffs/httpd-2.4.x_headers.diff
                  +1: fuankg, humbedooh, jim

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

promote

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

more votes

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

2.4.3 was released Aug 18th

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

Applied

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

Merge r1386913, r1388825 from trunk:

Revert r1371878 --  default configuration changes that drop the DNT
header from IE10.

See:
  Message-ID: <CALK=YjMGPNHBqNiad-ghzcEzxDovQgYOpjpSSyXmN=r74v43qg@mail.gmail.com>
  PR 53845

Keep this in, but commented out: also provide a little
more background/rationale. This, hopefully, satisfies both
ends of the debate: we don't "assume" that everyone who
uses this browser didn't make the specific choice, but
we allow for admins who care about DNT and want to either
  1. Make a statement
  2. Force adherence to the standard
to easily do so.
Submitted by: covener, jim
Reviewed/backported by: jim

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

Merge r1376695, r1376700 from trunk:

Apply the same length limit when logging Status header values
as used when logging invalid header lines.

Application of a limit on logged header data suggested by Jeff Trawick.

Catch up change log with r1376695.

Submitted by: chrisd
Reviewed/backported by: jim

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

vote and promote

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

Promote

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

Vote(s)

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

reset vote on reverting IE10+DNT, add in Jim's revision that adds it back commented.

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

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