]> granicus.if.org Git - apache/log
apache
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

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

12 years agoPromote and a question
Jim Jagielski [Tue, 14 Aug 2012 21:10:05 +0000 (21:10 +0000)]
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

12 years agoVotes!
Jim Jagielski [Tue, 14 Aug 2012 21:09:20 +0000 (21:09 +0000)]
Votes!

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

12 years agoMerge r1364695, r1369477, r1369808, r1370288, r1370225, r1370763, r1371684 from trunk:
Jim Jagielski [Tue, 14 Aug 2012 21:08:35 +0000 (21:08 +0000)]
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

12 years agoPromote
Jim Jagielski [Tue, 14 Aug 2012 21:08:00 +0000 (21:08 +0000)]
Promote

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

12 years agoMerge r1361801 from trunk:
Jim Jagielski [Tue, 14 Aug 2012 20:57:43 +0000 (20:57 +0000)]
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

12 years agosockets are simple, right?
Jeff Trawick [Tue, 14 Aug 2012 20:54:19 +0000 (20:54 +0000)]
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

12 years agoMerge r1364229 from trunk:
Jim Jagielski [Tue, 14 Aug 2012 20:54:00 +0000 (20:54 +0000)]
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

12 years agoMerge r1371878 from trunk:
Jim Jagielski [Tue, 14 Aug 2012 20:53:31 +0000 (20:53 +0000)]
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

12 years agoMerge r1364133, r1371791 from trunk:
Jim Jagielski [Tue, 14 Aug 2012 20:52:53 +0000 (20:52 +0000)]
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

12 years agoMerge r1371387 from trunk:
Jim Jagielski [Tue, 14 Aug 2012 20:50:44 +0000 (20:50 +0000)]
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

12 years agoPromote
Jim Jagielski [Tue, 14 Aug 2012 20:42:45 +0000 (20:42 +0000)]
Promote

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

12 years agoVote on patches
Jim Jagielski [Tue, 14 Aug 2012 20:41:03 +0000 (20:41 +0000)]
Vote on patches

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

12 years agonormal vote/promote stuff
Jeff Trawick [Tue, 14 Aug 2012 11:25:41 +0000 (11:25 +0000)]
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

12 years agoAdd a missing paren
Daniel Gruno [Tue, 14 Aug 2012 09:31:26 +0000 (09:31 +0000)]
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

12 years agoxforms
Daniel Gruno [Mon, 13 Aug 2012 14:32:59 +0000 (14:32 +0000)]
xforms

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

12 years agogrammar fix
Daniel Gruno [Mon, 13 Aug 2012 14:27:37 +0000 (14:27 +0000)]
grammar fix

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

12 years agoUpdate proposal *blames niq*
Daniel Gruno [Mon, 13 Aug 2012 13:41:56 +0000 (13:41 +0000)]
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

12 years agohtpasswd: Use correct file mode for checking if file is writable.
Rainer Jung [Mon, 13 Aug 2012 11:35:18 +0000 (11:35 +0000)]
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

12 years agompm_winnt: Tweak a message added in r750567 so that the accept thread
Rainer Jung [Mon, 13 Aug 2012 11:29:13 +0000 (11:29 +0000)]
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

12 years agoAxe unnecessary trailing comma from server-status user output.
Rainer Jung [Mon, 13 Aug 2012 11:26:45 +0000 (11:26 +0000)]
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

12 years agoUpdate proposal. I haven't had coffee yet - that must be why.
Daniel Gruno [Mon, 13 Aug 2012 10:04:17 +0000 (10:04 +0000)]
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

12 years agoPromote
Daniel Gruno [Mon, 13 Aug 2012 08:34:25 +0000 (08:34 +0000)]
Promote

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

12 years agoVote
Daniel Gruno [Mon, 13 Aug 2012 08:32:31 +0000 (08:32 +0000)]
Vote

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

12 years agoPropose
Daniel Gruno [Mon, 13 Aug 2012 08:22:56 +0000 (08:22 +0000)]
Propose

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

12 years agoawesome beach day
Roy T. Fielding [Sun, 12 Aug 2012 04:22:32 +0000 (04:22 +0000)]
awesome beach day

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

12 years agovote
Gregg Lewis Smith [Sat, 11 Aug 2012 20:44:15 +0000 (20:44 +0000)]
vote

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

12 years agovotes
Jeff Trawick [Sat, 11 Aug 2012 13:29:55 +0000 (13:29 +0000)]
votes

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

12 years agoAdd a round of very easy to review backport proposals.
Rainer Jung [Sat, 11 Aug 2012 13:17:04 +0000 (13:17 +0000)]
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

12 years agoComment spelling fix.
Rainer Jung [Sat, 11 Aug 2012 12:42:25 +0000 (12:42 +0000)]
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

12 years agoComment
Daniel Gruno [Sat, 11 Aug 2012 12:37:15 +0000 (12:37 +0000)]
Comment

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

12 years agobad header doxygen: ap_rflush does not return the number
Rainer Jung [Sat, 11 Aug 2012 12:34:09 +0000 (12:34 +0000)]
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