]> granicus.if.org Git - apache/log
apache
11 years agovarious xforms
Daniel Gruno [Wed, 19 Sep 2012 16:16:14 +0000 (16:16 +0000)]
various xforms

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

11 years agobackport some version-"wrongnesses"/confusions from trunk.
Daniel Gruno [Wed, 19 Sep 2012 16:12:31 +0000 (16:12 +0000)]
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

11 years agoshould have voted here, too
Kaspar Brand [Wed, 19 Sep 2012 14:35:57 +0000 (14:35 +0000)]
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

11 years agoThis is 2.4, not 2.3, and we do not support Windows 9x/ME.
Daniel Gruno [Wed, 19 Sep 2012 14:34:03 +0000 (14:34 +0000)]
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

11 years agopropose, vote
Kaspar Brand [Wed, 19 Sep 2012 14:31:27 +0000 (14:31 +0000)]
propose, vote

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

11 years ago* APR-UTIL trunk is dead. Point to the latest stable branch.
Ruediger Pluem [Wed, 19 Sep 2012 07:45:14 +0000 (07:45 +0000)]
* 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

11 years agoVote
Gregg Lewis Smith [Wed, 19 Sep 2012 03:41:29 +0000 (03:41 +0000)]
Vote

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

11 years agopropose DefaultRuntimeDir for mod_slotmem_plain... the discussion
Jim Jagielski [Tue, 18 Sep 2012 19:24:18 +0000 (19:24 +0000)]
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

11 years agoWindows: Fix output of -M, -L, and similar command-line options
Guenter Knauf [Tue, 18 Sep 2012 01:54:54 +0000 (01:54 +0000)]
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

11 years agoapplied.
Guenter Knauf [Tue, 18 Sep 2012 01:40:28 +0000 (01:40 +0000)]
applied.

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

11 years agoproxy_connect_handler: fix use of APLOGNO() (backport r1375407).
Guenter Knauf [Tue, 18 Sep 2012 01:39:57 +0000 (01:39 +0000)]
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

11 years agovote, promote.
Guenter Knauf [Tue, 18 Sep 2012 01:26:04 +0000 (01:26 +0000)]
vote, promote.

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

11 years agoPPR fix proposed
Jim Jagielski [Mon, 17 Sep 2012 12:25:39 +0000 (12:25 +0000)]
PPR fix proposed

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

11 years agoUpdates.
Lucien Gentis [Sat, 15 Sep 2012 16:03:52 +0000 (16:03 +0000)]
Updates.

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

11 years agoxforms
Daniel Gruno [Fri, 14 Sep 2012 17:34:14 +0000 (17:34 +0000)]
xforms

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

11 years agos/Location/LocationMatch/
Daniel Gruno [Fri, 14 Sep 2012 17:29:36 +0000 (17:29 +0000)]
s/Location/LocationMatch/

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

11 years agoxforms
Jim Jagielski [Thu, 13 Sep 2012 17:16:48 +0000 (17:16 +0000)]
xforms

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

11 years agoMerge r1384408 from trunk:
Jim Jagielski [Thu, 13 Sep 2012 17:15:35 +0000 (17:15 +0000)]
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

11 years agoUpdates.
Lucien Gentis [Thu, 13 Sep 2012 15:52:59 +0000 (15:52 +0000)]
Updates.

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

11 years agoupdate transformation
André Malo [Tue, 11 Sep 2012 20:07:34 +0000 (20:07 +0000)]
update transformation

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

11 years agoupdate properties.
André Malo [Tue, 11 Sep 2012 20:03:10 +0000 (20:03 +0000)]
update properties.

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

11 years agobalancer manager nonce optimization
Jim Jagielski [Tue, 11 Sep 2012 19:47:05 +0000 (19:47 +0000)]
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

11 years agocomment
Stefan Fritsch [Mon, 10 Sep 2012 18:52:13 +0000 (18:52 +0000)]
comment

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

11 years agovote+promote
Stefan Fritsch [Mon, 10 Sep 2012 17:58:19 +0000 (17:58 +0000)]
vote+promote

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

11 years agopropose; vote.
Guenter Knauf [Mon, 10 Sep 2012 16:24:42 +0000 (16:24 +0000)]
propose; vote.

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

11 years agoUpdates.
Lucien Gentis [Sun, 9 Sep 2012 13:47:33 +0000 (13:47 +0000)]
Updates.

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

11 years agoUpdates.
Lucien Gentis [Sat, 8 Sep 2012 16:13:41 +0000 (16:13 +0000)]
Updates.

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

11 years agotypo/grammar fixes
Daniel Gruno [Tue, 4 Sep 2012 18:03:59 +0000 (18:03 +0000)]
typo/grammar fixes

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

11 years agoxforms
Daniel Gruno [Mon, 3 Sep 2012 14:26:03 +0000 (14:26 +0000)]
xforms

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

11 years agoForgot one more 2.2-style rule that needed fixing
Daniel Gruno [Mon, 3 Sep 2012 14:22:19 +0000 (14:22 +0000)]
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

11 years agoReplacing 2.2-style IP check with 2.4-style.
Daniel Gruno [Mon, 3 Sep 2012 14:18:02 +0000 (14:18 +0000)]
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

11 years agoTypo fixes
Daniel Gruno [Mon, 3 Sep 2012 08:02:59 +0000 (08:02 +0000)]
Typo fixes

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

12 years agoUpdates.
Lucien Gentis [Sun, 2 Sep 2012 13:33:49 +0000 (13:33 +0000)]
Updates.

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

12 years agoxforms
Daniel Gruno [Sun, 2 Sep 2012 08:47:35 +0000 (08:47 +0000)]
xforms

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

12 years agotypo fixes
Daniel Gruno [Sun, 2 Sep 2012 08:42:34 +0000 (08:42 +0000)]
typo fixes

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

12 years agoUpdates.
Lucien Gentis [Sat, 1 Sep 2012 15:52:41 +0000 (15:52 +0000)]
Updates.

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

12 years agoxforms
Daniel Gruno [Sat, 1 Sep 2012 07:08:17 +0000 (07:08 +0000)]
xforms

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

12 years agobackport r1379311: Add a notion that, for a skip flag to be used, the rewrite rule...
Daniel Gruno [Sat, 1 Sep 2012 07:04:07 +0000 (07:04 +0000)]
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

12 years agobackport r1379321: Note that using rewrites with a file-path substitution in a .htacc...
Daniel Gruno [Sat, 1 Sep 2012 07:01:04 +0000 (07:01 +0000)]
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

12 years agobackport r1379031: Note that AuthDBDUserRealmQuery is for Digest auth requests, not...
Daniel Gruno [Sat, 1 Sep 2012 06:56:08 +0000 (06:56 +0000)]
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

12 years agobackport r1379335: Add Redirect* to the list of directives that are controlled by...
Daniel Gruno [Sat, 1 Sep 2012 06:50:30 +0000 (06:50 +0000)]
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

12 years agovote
Gregg Lewis Smith [Fri, 31 Aug 2012 21:32:04 +0000 (21:32 +0000)]
vote

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

12 years agobunch o' xforms
Daniel Gruno [Wed, 29 Aug 2012 11:42:07 +0000 (11:42 +0000)]
bunch o' xforms

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

12 years agobackport r1378498: Fixing a copypasto as per comment #225 on the site.
Daniel Gruno [Wed, 29 Aug 2012 11:36:45 +0000 (11:36 +0000)]
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

12 years agoUpdate.
Lucien Gentis [Sun, 26 Aug 2012 13:59:34 +0000 (13:59 +0000)]
Update.

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

12 years agopropose backport of r1376695 to limit logged Status lines
Chris Darroch [Fri, 24 Aug 2012 16:30:36 +0000 (16:30 +0000)]
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

12 years agoMerge r1375996 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
Eric Covener [Wed, 22 Aug 2012 11:27:38 +0000 (11:27 +0000)]
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

12 years agoComment out LuaMapHandler, as it's not implemented in 2.4.x yet.
Daniel Gruno [Wed, 22 Aug 2012 07:57:03 +0000 (07:57 +0000)]
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

12 years agoxforms
Daniel Gruno [Wed, 22 Aug 2012 07:48:46 +0000 (07:48 +0000)]
xforms

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

12 years agoUpdates:
Daniel Gruno [Wed, 22 Aug 2012 07:47:56 +0000 (07:47 +0000)]
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

12 years agoxforms
Daniel Gruno [Wed, 22 Aug 2012 07:39:14 +0000 (07:39 +0000)]
xforms

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

12 years agoAdd back the parsebody references that were commented out, and elaborate on how r...
Daniel Gruno [Wed, 22 Aug 2012 07:37:01 +0000 (07:37 +0000)]
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

12 years agoPropose*2.
Joe Orton [Tue, 21 Aug 2012 14:51:50 +0000 (14:51 +0000)]
Propose*2.

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

12 years agofix an grammatical error
Jeff Trawick [Tue, 21 Aug 2012 12:48:56 +0000 (12:48 +0000)]
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

12 years agoAdd default value of PrivilegesMode to docs.
Rainer Jung [Mon, 20 Aug 2012 14:50:20 +0000 (14:50 +0000)]
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

12 years agoClarify code comment.
Rainer Jung [Mon, 20 Aug 2012 14:49:17 +0000 (14:49 +0000)]
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

12 years agoRemoved tabs and traling spaces.
Guenter Knauf [Mon, 20 Aug 2012 14:31:48 +0000 (14:31 +0000)]
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

12 years agomerge r1375006 from trunk:
Jeff Trawick [Mon, 20 Aug 2012 13:16:37 +0000 (13:16 +0000)]
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

12 years agoUpdate proposal info, now that the authz provider has been backported
Daniel Gruno [Sun, 19 Aug 2012 08:06:27 +0000 (08:06 +0000)]
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

12 years agoUpdates.
Lucien Gentis [Sat, 18 Aug 2012 15:20:35 +0000 (15:20 +0000)]
Updates.

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

12 years agoxforms
Jeff Trawick [Sat, 18 Aug 2012 13:13:40 +0000 (13:13 +0000)]
xforms

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

12 years agomerge r1374569 from trunk:
Jeff Trawick [Sat, 18 Aug 2012 13:12:10 +0000 (13:12 +0000)]
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

12 years agoPerhaps the users of httpd on Windows are the real ultra geeks.
Jeff Trawick [Fri, 17 Aug 2012 20:42:04 +0000 (20:42 +0000)]
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

12 years agoand we are at 2.4.4-dev
Jim Jagielski [Fri, 17 Aug 2012 17:09:30 +0000 (17:09 +0000)]
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

12 years agoGet ready to tag 2.4.3
Jim Jagielski [Fri, 17 Aug 2012 17:05:53 +0000 (17:05 +0000)]
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

12 years agoAdd backport of r1374199 in r1374202
Rainer Jung [Fri, 17 Aug 2012 15:13:04 +0000 (15:13 +0000)]
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

12 years agoUn"fix" the bug reference.
Joe Orton [Fri, 17 Aug 2012 14:58:52 +0000 (14:58 +0000)]
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

12 years agomod_proxy_balancer: Remove wrong error code
Rainer Jung [Fri, 17 Aug 2012 14:57:07 +0000 (14:57 +0000)]
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

12 years agoFix closing the back end connection in case of error.
Rainer Jung [Fri, 17 Aug 2012 14:54:18 +0000 (14:54 +0000)]
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

12 years agoUpdates.
Lucien Gentis [Fri, 17 Aug 2012 14:28:54 +0000 (14:28 +0000)]
Updates.

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

12 years agovote/promote
Jeff Trawick [Fri, 17 Aug 2012 14:20:29 +0000 (14:20 +0000)]
vote/promote

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

12 years agoReference the 2.4.x bug for the proxy/balancer/reverse issue.
Joe Orton [Fri, 17 Aug 2012 13:56:26 +0000 (13:56 +0000)]
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

12 years agoMerge r1231255, r1231257 from trunk:
Jim Jagielski [Fri, 17 Aug 2012 13:48:26 +0000 (13:48 +0000)]
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

12 years agoAnotehr patch
Jim Jagielski [Fri, 17 Aug 2012 13:46:59 +0000 (13:46 +0000)]
Anotehr patch

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

12 years agohttp://people.apache.org/~rjung/patches/x-www-form-urlencoded-content-type-checking...
Jim Jagielski [Fri, 17 Aug 2012 13:46:24 +0000 (13:46 +0000)]
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

12 years agoMerge r1351020, r1370466 from trunk:
Jim Jagielski [Fri, 17 Aug 2012 13:45:22 +0000 (13:45 +0000)]
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

12 years agopromote
Jim Jagielski [Fri, 17 Aug 2012 13:42:08 +0000 (13:42 +0000)]
promote

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

12 years agovotes
Jim Jagielski [Fri, 17 Aug 2012 13:41:29 +0000 (13:41 +0000)]
votes

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

12 years agoMake sure that we clean up the ldap module folder.
Guenter Knauf [Fri, 17 Aug 2012 11:32:53 +0000 (11:32 +0000)]
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

12 years agoPropose.
Rainer Jung [Fri, 17 Aug 2012 06:33:15 +0000 (06:33 +0000)]
Propose.

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

12 years agoVote.
Rainer Jung [Thu, 16 Aug 2012 19:58:46 +0000 (19:58 +0000)]
Vote.

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

12 years agoPropose.
Rainer Jung [Thu, 16 Aug 2012 18:03:05 +0000 (18:03 +0000)]
Propose.

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

12 years agoVote, propose.
Rainer Jung [Thu, 16 Aug 2012 16:15:15 +0000 (16:15 +0000)]
Vote, propose.

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

12 years agoUpdate.
Lucien Gentis [Thu, 16 Aug 2012 16:09:38 +0000 (16:09 +0000)]
Update.

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

12 years agopropose mod_authnz_ldap nested groups optimization -- thanks Rainer
Eric Covener [Thu, 16 Aug 2012 14:48:13 +0000 (14:48 +0000)]
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

12 years agoSometimes httpd-2.4.x-deps.tar.gz files are provided under additional downloads
Jim Jagielski [Thu, 16 Aug 2012 12:42:33 +0000 (12:42 +0000)]
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

12 years agoadd CHANGES entry for r1371878/r1373085
Roy T. Fielding [Wed, 15 Aug 2012 23:04:32 +0000 (23:04 +0000)]
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

12 years agoPropose.
Rainer Jung [Wed, 15 Aug 2012 15:10:31 +0000 (15:10 +0000)]
Propose.

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

12 years agofix stray file merge artifact
Jeff Trawick [Wed, 15 Aug 2012 15:03:20 +0000 (15:03 +0000)]
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

12 years agoFix bus error in mod_socache_shmcb due to a misalignment
Rainer Jung [Wed, 15 Aug 2012 14:51:44 +0000 (14:51 +0000)]
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

12 years agovote/promote/demote
Jeff Trawick [Wed, 15 Aug 2012 14:39:06 +0000 (14:39 +0000)]
vote/promote/demote

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

12 years ago* Vote
Ruediger Pluem [Wed, 15 Aug 2012 10:38:50 +0000 (10:38 +0000)]
* Vote

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

12 years agoVote, propose, revoke, adjust.
Rainer Jung [Wed, 15 Aug 2012 09:43:42 +0000 (09:43 +0000)]
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

12 years agoxforms
Jeff Trawick [Wed, 15 Aug 2012 00:03:20 +0000 (00:03 +0000)]
xforms

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

12 years agoclarify :)
Jeff Trawick [Wed, 15 Aug 2012 00:00:42 +0000 (00:00 +0000)]
clarify :)

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

12 years agoRevert r1373105, the merging of incompatible DefaultRuntimeDir
Jeff Trawick [Tue, 14 Aug 2012 23:59:24 +0000 (23:59 +0000)]
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

12 years agofix minor formatting mistake I made when originally committing a fix to trunk
Jeff Trawick [Tue, 14 Aug 2012 23:46:15 +0000 (23:46 +0000)]
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

12 years agoupdate xforms
Jim Jagielski [Tue, 14 Aug 2012 21:20:40 +0000 (21:20 +0000)]
update xforms

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

12 years agoEditors choice on CHANGES
Jim Jagielski [Tue, 14 Aug 2012 21:14:34 +0000 (21:14 +0000)]
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

12 years agoMerge r1367819 from trunk:
Jim Jagielski [Tue, 14 Aug 2012 21:11:29 +0000 (21:11 +0000)]
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