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

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