]> granicus.if.org Git - apache/log
apache
12 years agoAdd mergeinfo for committs backported in revisions:
Rainer Jung [Sun, 22 Jul 2012 16:07:16 +0000 (16:07 +0000)]
Add mergeinfo for committs backported in revisions:
r1309579, r1331413, r1203645, r1201445,
r1200983, r1200982.

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

12 years agoxforms
Daniel Gruno [Sun, 22 Jul 2012 16:03:54 +0000 (16:03 +0000)]
xforms

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

12 years agotypo fixes
Daniel Gruno [Sun, 22 Jul 2012 16:01:21 +0000 (16:01 +0000)]
typo fixes

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

12 years agotypo fix
Daniel Gruno [Sun, 22 Jul 2012 15:50:17 +0000 (15:50 +0000)]
typo fix

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

12 years agoPropose.
Rainer Jung [Sun, 22 Jul 2012 15:36:05 +0000 (15:36 +0000)]
Propose.

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

12 years agoPropose.
Rainer Jung [Sun, 22 Jul 2012 15:32:22 +0000 (15:32 +0000)]
Propose.

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

12 years agoPropose.
Rainer Jung [Sun, 22 Jul 2012 15:24:59 +0000 (15:24 +0000)]
Propose.

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

12 years agoPropose.
Rainer Jung [Sun, 22 Jul 2012 15:11:34 +0000 (15:11 +0000)]
Propose.

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

12 years agoxforms
Daniel Gruno [Sun, 22 Jul 2012 14:54:30 +0000 (14:54 +0000)]
xforms

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

12 years agoxforms
Eric Covener [Sun, 22 Jul 2012 14:47:19 +0000 (14:47 +0000)]
xforms

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

12 years agoMerge r1364309 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
Eric Covener [Sun, 22 Jul 2012 14:40:02 +0000 (14:40 +0000)]
Merge r1364309 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

copy the context restrictions from sections.html for symlink
related options

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

12 years agoVote
Daniel Gruno [Sun, 22 Jul 2012 14:39:02 +0000 (14:39 +0000)]
Vote

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

12 years agoPropose.
Rainer Jung [Sun, 22 Jul 2012 14:31:16 +0000 (14:31 +0000)]
Propose.

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

12 years agotypo fixes
Daniel Gruno [Sun, 22 Jul 2012 14:17:01 +0000 (14:17 +0000)]
typo fixes

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

12 years agoAdd mergeinfo for backport done in r1242097.
Rainer Jung [Sun, 22 Jul 2012 14:08:59 +0000 (14:08 +0000)]
Add mergeinfo for backport done in r1242097.

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

12 years agoAdd mergeinfo for backports done in revisions:
Rainer Jung [Sun, 22 Jul 2012 14:05:00 +0000 (14:05 +0000)]
Add mergeinfo for backports done in revisions:
r1203495, r1211353, r1213395, r1213400, r1222931,
r1308862, r1294602

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

12 years agoFix typo in mergeinfo.
Rainer Jung [Sun, 22 Jul 2012 13:51:15 +0000 (13:51 +0000)]
Fix typo in mergeinfo.

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

12 years agoAdd mergeinfo for backports done by jim in r1200981.
Rainer Jung [Sun, 22 Jul 2012 13:48:30 +0000 (13:48 +0000)]
Add mergeinfo for backports done by jim in r1200981.

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

12 years agoAdd long list of backport proposals.
Rainer Jung [Sun, 22 Jul 2012 13:00:52 +0000 (13:00 +0000)]
Add long list of backport proposals.
Those are all very easy to review.

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

12 years agoRemove backported item from STATUS.
Rainer Jung [Sun, 22 Jul 2012 12:01:17 +0000 (12:01 +0000)]
Remove backported item from STATUS.

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

12 years agoLog the value of Status header lines in script responses rather than
Rainer Jung [Sun, 22 Jul 2012 12:00:22 +0000 (12:00 +0000)]
Log the value of Status header lines in script responses rather than
than just the fixed header name of "Status".

Backport of r1362538 from trunk.

Submitted by: chrisd
Reviewed by: rpluem, rjung
Backported by: rjung

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

12 years agomodules/ssl/ssl_util_ocsp.c (get_line): Don't set line[-1] to 0
Rainer Jung [Sun, 22 Jul 2012 11:57:25 +0000 (11:57 +0000)]
modules/ssl/ssl_util_ocsp.c (get_line): Don't set line[-1] to 0
when len == 0.

Backport of r1358061 from trunk.

Submitted by: Jim Meyering <meyering redhat.com>
Reviewed by: jorton, trawick, rjung
Backported by: rjung

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

12 years agoRemove applied item from STSTUS.
Rainer Jung [Sun, 22 Jul 2012 11:52:29 +0000 (11:52 +0000)]
Remove applied item from STSTUS.

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

12 years agoFix MaxConnectionsPerChild
Rainer Jung [Sun, 22 Jul 2012 11:51:58 +0000 (11:51 +0000)]
Fix MaxConnectionsPerChild

This was broken when the handling of lingering close was moved into the
listener thread.

- Make the connection counting thread safe.
- Do the counting in the connection pool cleanup to ensure that it gets
  also executed if the listener thread closes the connection.
- Add a trace log message when a process is recycled.
- Rename requests_this_child to conns_this_child, which is more accurate

Backport of r1343085 and r1343087.

Submitted by: sf
Reviewed by: humbedooh, rjung
Backported by: rjung

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

12 years agoIf an expression in "Require expr" returns denied and
Rainer Jung [Sun, 22 Jul 2012 11:44:23 +0000 (11:44 +0000)]
If an expression in "Require expr" returns denied and
references %{REMOTE_USER}, trigger authentication and retry.
Log error if 'Require expr' fails.

PR: 52892

Backport of r1351071, r1351072 and r1351074 from trunk.

Submitted by: sf
Reviewed by: rjung, trawick
Backported by: rjung

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

12 years agoFix typo in CHANGES.
Rainer Jung [Sun, 22 Jul 2012 11:33:39 +0000 (11:33 +0000)]
Fix typo in CHANGES.

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

12 years agoAlways log if LimitRequestFieldSize triggers.
Rainer Jung [Sun, 22 Jul 2012 11:32:47 +0000 (11:32 +0000)]
Always log if LimitRequestFieldSize triggers.

Backport of r1352911 from trunk.

Submitted by: sf
Reviewed by: rjung, trawick
Backported by: rjung

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

12 years agoFix mod_deflate NetWare build.
Rainer Jung [Sun, 22 Jul 2012 11:12:17 +0000 (11:12 +0000)]
Fix mod_deflate NetWare build.

Backport of r1363589 from trunk.

Submitted by: normw gknw net.
Reviewed by: fuankg
Backported by: rjung

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

12 years agoMake mod_deflate skip compression if compression is enabled at SSL level.
Rainer Jung [Sun, 22 Jul 2012 10:46:21 +0000 (10:46 +0000)]
Make mod_deflate skip compression if compression is enabled at SSL level.

Backport of r1359057 from trunk.

Submitted by: sf
Reviewed by: jorton, rjung
Backported by: rjung

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

12 years agoBackport 1363853:
Graham Leggett [Sat, 21 Jul 2012 13:36:04 +0000 (13:36 +0000)]
Backport 1363853:
RPM packaging: add the fcgistarter man pages to the RPM.

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

12 years agoBackport 1363837:
Graham Leggett [Sat, 21 Jul 2012 13:34:57 +0000 (13:34 +0000)]
Backport 1363837:
RPM packaging: remove the epoch to be consistent with APR and APR-util.

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

12 years agoBackport 1363836:
Graham Leggett [Sat, 21 Jul 2012 13:33:46 +0000 (13:33 +0000)]
Backport 1363836:
RPM packaging: The PID file goes in /var/run in the RPM layout.

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

12 years agoBackport 1363832:
Graham Leggett [Sat, 21 Jul 2012 13:32:33 +0000 (13:32 +0000)]
Backport 1363832:
RPM packaging: Remove the BuildArch from the manual package, this forces
the target to "noarch" for all packages and breaks the build on CentOS5.

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

12 years agoBackport 1363829:
Graham Leggett [Sat, 21 Jul 2012 13:30:56 +0000 (13:30 +0000)]
Backport 1363829:
RPM packaging: The PID file goes in /var/run in the RPM layout.

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

12 years agoMerge r1363186 from trunk: (comment only)
Jeff Trawick [Fri, 20 Jul 2012 19:23:39 +0000 (19:23 +0000)]
Merge r1363186 from trunk:  (comment only)

modernize some commentary on APEXIT_foo values

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

12 years agoVote, promote.
Rainer Jung [Fri, 20 Jul 2012 15:12:21 +0000 (15:12 +0000)]
Vote, promote.

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

12 years agoanother MPM fix from trunk???
Jeff Trawick [Fri, 20 Jul 2012 15:08:29 +0000 (15:08 +0000)]
another MPM fix from trunk???

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

12 years agoxforms
Daniel Gruno [Fri, 20 Jul 2012 15:01:17 +0000 (15:01 +0000)]
xforms

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

12 years agoBackport r1341749: Simplyfy Require example.
Daniel Gruno [Fri, 20 Jul 2012 15:00:09 +0000 (15:00 +0000)]
Backport r1341749: Simplyfy Require example.

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

12 years agoAdd missing HTTP status codes taken from
Rainer Jung [Fri, 20 Jul 2012 14:32:08 +0000 (14:32 +0000)]
Add missing HTTP status codes taken from

http://www.iana.org/assignments/http-status-codes/http-status-codes.xml

The new codes are now known and some canned error
strings are provided. The web server does not yet actually
produce them in responses or reacts on getting them
from an origin server when acting as a proxy or gateway.

Backport of r1361784, r1361791 and 1362020 from trunk.

Submitted by: rjung
Reviewed by: jorton, trawick

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

12 years ago2.4.x ab busted on IPv6-enabled Windows, needs existing fix
Jeff Trawick [Fri, 20 Jul 2012 13:17:06 +0000 (13:17 +0000)]
2.4.x ab busted on IPv6-enabled Windows, needs existing fix
(presumably busted for a lot more configurations)

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

12 years agosimple fix for MinGW?
Jeff Trawick [Fri, 20 Jul 2012 12:11:27 +0000 (12:11 +0000)]
simple fix for MinGW?

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

12 years agovote, promote
Jeff Trawick [Fri, 20 Jul 2012 11:41:40 +0000 (11:41 +0000)]
vote, promote

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

12 years agopropose some simple MPM fixes
Jeff Trawick [Thu, 19 Jul 2012 23:41:10 +0000 (23:41 +0000)]
propose some simple MPM fixes

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

12 years agoxforms
Daniel Gruno [Thu, 19 Jul 2012 20:19:50 +0000 (20:19 +0000)]
xforms

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

12 years agoRemove .* from the equation in the "<Directory ~ ..." example.
Daniel Gruno [Thu, 19 Jul 2012 20:16:11 +0000 (20:16 +0000)]
Remove .* from the equation in the "<Directory ~ ..." example.
Submitted by: Daniel (comment #143 on site)

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

12 years agoxforms
Daniel Gruno [Thu, 19 Jul 2012 10:26:14 +0000 (10:26 +0000)]
xforms

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

12 years agoAdd a link to the RFC explaining what 'realm' denotes.
Daniel Gruno [Thu, 19 Jul 2012 10:25:24 +0000 (10:25 +0000)]
Add a link to the RFC explaining what 'realm' denotes.

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

12 years ago2009 -> 2012
Daniel Gruno [Thu, 19 Jul 2012 06:48:39 +0000 (06:48 +0000)]
2009 -> 2012

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

12 years agoxforms
Daniel Gruno [Thu, 19 Jul 2012 06:30:37 +0000 (06:30 +0000)]
xforms

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

12 years agoold/new -> foo/bar in example, so it matches the description (and the following examples)
Daniel Gruno [Thu, 19 Jul 2012 06:29:29 +0000 (06:29 +0000)]
old/new -> foo/bar in example, so it matches the description (and the following examples)

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

12 years agoxforms
Daniel Gruno [Thu, 19 Jul 2012 06:16:34 +0000 (06:16 +0000)]
xforms

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

12 years agoBackport some long-forgotten changes from trunk
Daniel Gruno [Thu, 19 Jul 2012 06:13:24 +0000 (06:13 +0000)]
Backport some long-forgotten changes from trunk

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

12 years agoxforms
Daniel Gruno [Thu, 19 Jul 2012 05:52:16 +0000 (05:52 +0000)]
xforms

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

12 years agoAdd missing highlighting
Daniel Gruno [Thu, 19 Jul 2012 05:49:50 +0000 (05:49 +0000)]
Add missing highlighting

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

12 years agoMoved a </p> that was misplaced
Vincent Deffontaines [Wed, 18 Jul 2012 13:45:05 +0000 (13:45 +0000)]
Moved a </p> that was misplaced

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

12 years agoBringing up the french translation of this page up to date
Vincent Deffontaines [Wed, 18 Jul 2012 13:41:18 +0000 (13:41 +0000)]
Bringing up the french translation of this page up to date

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

12 years agoFixing the links to ProxyPass* into the note added in r1362933
Vincent Deffontaines [Wed, 18 Jul 2012 13:19:31 +0000 (13:19 +0000)]
Fixing the links to ProxyPass* into the note added in r1362933

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

12 years agoAdding a note about proxy performance being bad when using rewrite's [P].
Vincent Deffontaines [Wed, 18 Jul 2012 13:16:24 +0000 (13:16 +0000)]
Adding a note about proxy performance being bad when using rewrite's [P].
Advise the use of ProxyPass* instead

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

12 years ago* Vote
Ruediger Pluem [Wed, 18 Jul 2012 07:14:02 +0000 (07:14 +0000)]
* Vote

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

12 years agoFix typo in docs, s/mod_ext-filter/mod_ext_filter/.
Rainer Jung [Tue, 17 Jul 2012 22:56:20 +0000 (22:56 +0000)]
Fix typo in docs, s/mod_ext-filter/mod_ext_filter/.

Backport of r1362707 from trunk.

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

12 years agopropose r1362538 for backport
Chris Darroch [Tue, 17 Jul 2012 15:32:02 +0000 (15:32 +0000)]
propose r1362538 for backport

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

12 years agoxforms
Daniel Gruno [Tue, 17 Jul 2012 14:57:46 +0000 (14:57 +0000)]
xforms

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

12 years agoMerge r1362526 from trunk
Daniel Gruno [Tue, 17 Jul 2012 14:53:42 +0000 (14:53 +0000)]
Merge r1362526 from trunk
Use integer operators when comparing to TIME_HOUR
Reported by Florian in comment #124

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

12 years agoMerge r1362506 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
Eric Covener [Tue, 17 Jul 2012 14:29:34 +0000 (14:29 +0000)]
Merge r1362506 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

Use integer operators when comparing to TIME_HOUR

Reported by Florian in comment#124.

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

12 years agoAdd a note about the list of not yet proposed
Rainer Jung [Mon, 16 Jul 2012 18:46:16 +0000 (18:46 +0000)]
Add a note about the list of not yet proposed
backports.

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

12 years agoUpdate mergeinfo.
Rainer Jung [Mon, 16 Jul 2012 18:12:08 +0000 (18:12 +0000)]
Update mergeinfo.

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

12 years agoReduce code drift from trunk.
Rainer Jung [Mon, 16 Jul 2012 17:37:21 +0000 (17:37 +0000)]
Reduce code drift from trunk.

Style nit.

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

12 years agosync style fix from trunk r1359881
Eric Covener [Mon, 16 Jul 2012 17:34:50 +0000 (17:34 +0000)]
sync style fix from trunk r1359881

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

12 years agoReduce code drift from trunk.
Rainer Jung [Mon, 16 Jul 2012 17:30:53 +0000 (17:30 +0000)]
Reduce code drift from trunk.
Only whitespace/style, no functional change.

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

12 years agoTry to clarify what client_ip/client_addr means
Rainer Jung [Mon, 16 Jul 2012 16:51:01 +0000 (16:51 +0000)]
Try to clarify what client_ip/client_addr means
and point to useragent_ip.

Backport of r1331115 from trunk.

CTR because only comments.

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

12 years agoMinor fixes in ab docs.
Rainer Jung [Mon, 16 Jul 2012 16:46:20 +0000 (16:46 +0000)]
Minor fixes in ab docs.

Backport of r1307790,1308327,1308459,1309536,
1331942,1331977 from trunk.

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

12 years agoPropose*2.
Joe Orton [Mon, 16 Jul 2012 14:42:09 +0000 (14:42 +0000)]
Propose*2.

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

12 years agoReview*2
Joe Orton [Mon, 16 Jul 2012 14:33:05 +0000 (14:33 +0000)]
Review*2

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

12 years agor1348036 backported.
Joe Orton [Mon, 16 Jul 2012 14:26:29 +0000 (14:26 +0000)]
r1348036 backported.

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

12 years agoMerge r1348036 from trunk:
Joe Orton [Mon, 16 Jul 2012 14:25:46 +0000 (14:25 +0000)]
Merge r1348036 from trunk:

* include/util_ldap.h: Treat LDAP_UNAVAILABLE as a transient error
  with non-MS LDAP SDKs; seen with OpenLDAP against Novell eDirectory.

Submitted by: Filip Valder <filip.valder vsb.cz> (via RH bugzilla)
Reviewed by: jorton, sf, rjung

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

12 years agoLots of votes, one proposal and one promotion.
Rainer Jung [Mon, 16 Jul 2012 13:56:14 +0000 (13:56 +0000)]
Lots of votes, one proposal and one promotion.

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

12 years agoxforms
Daniel Gruno [Mon, 16 Jul 2012 09:29:28 +0000 (09:29 +0000)]
xforms

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

12 years agoAdd information about the possible values of ProxyExpressDBMType
Daniel Gruno [Mon, 16 Jul 2012 09:27:48 +0000 (09:27 +0000)]
Add information about the possible values of ProxyExpressDBMType

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

12 years agoUpdates.
Lucien Gentis [Sun, 15 Jul 2012 13:42:31 +0000 (13:42 +0000)]
Updates.

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

12 years agoVote
Daniel Gruno [Sun, 15 Jul 2012 10:03:43 +0000 (10:03 +0000)]
Vote

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

12 years agoPropose
Daniel Gruno [Sun, 15 Jul 2012 10:03:10 +0000 (10:03 +0000)]
Propose

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

12 years agofix typo
Stefan Fritsch [Sat, 14 Jul 2012 19:36:00 +0000 (19:36 +0000)]
fix typo

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

12 years agoPropose a load of backports. None of these is a blocker for 2.4.3, though.
Stefan Fritsch [Sat, 14 Jul 2012 19:32:29 +0000 (19:32 +0000)]
Propose a load of backports. None of these is a blocker for 2.4.3, though.

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

12 years agoMerge 1351015:
Stefan Fritsch [Sat, 14 Jul 2012 18:43:31 +0000 (18:43 +0000)]
Merge 1351015:

    Adjust log message: Condition can be caused by configuration error
    not only by bugs

Only text change, therefore CTR.

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

12 years agoMerge r1359881 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
Eric Covener [Fri, 13 Jul 2012 20:16:25 +0000 (20:16 +0000)]
Merge r1359881 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:

r1052419 changed the default value of Options to FollowSymlinks,
but inadvertently made "AllowOverride Options" behave like
"AllowOverride Options=FollowSymLinks".

PR53444

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

12 years agopromote
Eric Covener [Fri, 13 Jul 2012 20:01:35 +0000 (20:01 +0000)]
promote

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

12 years agoVote
Daniel Gruno [Fri, 13 Jul 2012 18:25:33 +0000 (18:25 +0000)]
Vote

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

12 years agoMerge r1309602 from trunk:
Jim Jagielski [Fri, 13 Jul 2012 16:08:17 +0000 (16:08 +0000)]
Merge r1309602 from trunk:

mod_rewrite: Fix RewriteCond integer checks to be parsed correctly.

PR: 53023
Submitted by: Axel Reinhold <apache freakout.de>
Reviewed/Updated by: nd

Submitted by: nd
Reviewed/backported by: jim

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

12 years agopromote proposal
Jim Jagielski [Fri, 13 Jul 2012 16:06:04 +0000 (16:06 +0000)]
promote proposal

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

12 years agovotes and proposal for 2.4.3
Jim Jagielski [Fri, 13 Jul 2012 16:04:55 +0000 (16:04 +0000)]
votes and proposal for 2.4.3

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

12 years agoAdd printf as a known function in Perl.
Daniel Gruno [Fri, 13 Jul 2012 11:18:40 +0000 (11:18 +0000)]
Add printf as a known function in Perl.

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

12 years agoxforms
Daniel Gruno [Fri, 13 Jul 2012 11:17:41 +0000 (11:17 +0000)]
xforms

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

12 years agoAdd missing highlighting
Daniel Gruno [Fri, 13 Jul 2012 11:16:49 +0000 (11:16 +0000)]
Add missing highlighting

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

12 years agoupdate transformation
André Malo [Fri, 13 Jul 2012 08:06:58 +0000 (08:06 +0000)]
update transformation

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

12 years agoset svnmailer:content-charset
André Malo [Fri, 13 Jul 2012 07:56:58 +0000 (07:56 +0000)]
set svnmailer:content-charset

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

12 years agorebuild mod pages.
Daniel Gruno [Thu, 12 Jul 2012 06:49:01 +0000 (06:49 +0000)]
rebuild mod pages.

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

12 years agosynopsis.xsl snuck past me. Rebuild incoming.
Daniel Gruno [Thu, 12 Jul 2012 06:45:30 +0000 (06:45 +0000)]
synopsis.xsl snuck past me. Rebuild incoming.

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

12 years agoThat worked, committing the rest of the lot.
Daniel Gruno [Thu, 12 Jul 2012 06:23:29 +0000 (06:23 +0000)]
That worked, committing the rest of the lot.

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

12 years agoCommitting a small chunk first to make sure everything is working
Daniel Gruno [Thu, 12 Jul 2012 06:12:59 +0000 (06:12 +0000)]
Committing a small chunk first to make sure everything is working

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