]> granicus.if.org Git - apache/log
apache
11 years agomod_auth_digest: avoid crash if shm init fails.
Graham Leggett [Sat, 27 Apr 2013 21:32:55 +0000 (21:32 +0000)]
mod_auth_digest: avoid crash if shm init fails.

trunk patch: https://svn.apache.org/r1463047
Submitted by: sf
Reviewed by: humbedooh, covener

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

11 years agohtpasswd/htdbm: Fix hash generation bug. PR 54735
Graham Leggett [Sat, 27 Apr 2013 21:27:43 +0000 (21:27 +0000)]
htpasswd/htdbm: Fix hash generation bug. PR 54735

trunk patch: https://svn.apache.org/r1465115

Submitted by: MadMaverick9 <asfbugzilla meinkino.ch>
Reviewed by: sf, covener, minfrin

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

11 years agovote
Gregg Lewis Smith [Sat, 27 Apr 2013 21:22:43 +0000 (21:22 +0000)]
vote

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

11 years agoVote, promote.
Graham Leggett [Sat, 27 Apr 2013 21:18:45 +0000 (21:18 +0000)]
Vote, promote.

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

11 years agoPropose mod_cache_socache for backport.
Graham Leggett [Sat, 27 Apr 2013 21:06:14 +0000 (21:06 +0000)]
Propose mod_cache_socache for backport.

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

11 years agoPropose.
Graham Leggett [Sat, 27 Apr 2013 18:58:54 +0000 (18:58 +0000)]
Propose.

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

11 years agoBackport r1476652:
Graham Leggett [Sat, 27 Apr 2013 18:28:39 +0000 (18:28 +0000)]
Backport r1476652:
Note that the buffer size is set to a maximum of 65536 when AJP is used as
per http://www.mail-archive.com/dev@httpd.apache.org/msg41843.html.

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

11 years agoUpdate.
Lucien Gentis [Fri, 26 Apr 2013 15:04:18 +0000 (15:04 +0000)]
Update.

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

11 years ago* Whitespace fixes
Ruediger Pluem [Fri, 26 Apr 2013 11:38:14 +0000 (11:38 +0000)]
* Whitespace fixes

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

11 years agoMerge r1470183 from trunk:
Ruediger Pluem [Fri, 26 Apr 2013 11:36:24 +0000 (11:36 +0000)]
Merge r1470183 from trunk:

Add workaround for gcc bug on sparc/64bit

PR: 52900

Submitted by: sf
Reviewed by: sf, covener, rpluem

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

11 years agoMerge r1471449 from trunk:
Ruediger Pluem [Fri, 26 Apr 2013 11:31:59 +0000 (11:31 +0000)]
Merge r1471449 from trunk:

* Fix null pointer dereference in case SetEnvif and SetEnvIfExpr are used
  together.

PR: 54881

Submitted by: rpluem
Reviewed by: rpluem, covener, humbedooh

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

11 years agovote + promote
Daniel Gruno [Fri, 26 Apr 2013 11:18:40 +0000 (11:18 +0000)]
vote + promote

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

11 years agovote
Eric Covener [Fri, 26 Apr 2013 11:01:17 +0000 (11:01 +0000)]
vote

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

11 years ago* Vote and promote
Ruediger Pluem [Fri, 26 Apr 2013 08:48:19 +0000 (08:48 +0000)]
* Vote and promote

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

11 years ago* Propose
Ruediger Pluem [Fri, 26 Apr 2013 08:35:58 +0000 (08:35 +0000)]
* Propose

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

11 years agohtdigest: Fix buffer overflow when reading digest
Rainer Jung [Fri, 26 Apr 2013 07:42:01 +0000 (07:42 +0000)]
htdigest: Fix buffer overflow when reading digest
password file with very long lines.

PR 54893.

Backport of r1475878 from trunk.

Proposed/Backported by: rjung
Reviewed by: humbedooh, covener

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

11 years agoRebuild
Rich Bowen [Fri, 26 Apr 2013 01:45:32 +0000 (01:45 +0000)]
Rebuild

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

11 years agoRebuild urlmapping doc.
Rich Bowen [Fri, 26 Apr 2013 01:40:38 +0000 (01:40 +0000)]
Rebuild urlmapping doc.

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

11 years agoDirectoryIndex and mod_autoindex
Rich Bowen [Fri, 26 Apr 2013 01:35:28 +0000 (01:35 +0000)]
DirectoryIndex and mod_autoindex

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

11 years agovote/promote
Eric Covener [Fri, 26 Apr 2013 01:12:51 +0000 (01:12 +0000)]
vote/promote

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

11 years agoSome easy votes
Daniel Gruno [Thu, 25 Apr 2013 18:18:26 +0000 (18:18 +0000)]
Some easy votes

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

11 years agoPropose.
Rainer Jung [Thu, 25 Apr 2013 18:10:20 +0000 (18:10 +0000)]
Propose.

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

11 years agoUpdates.
Lucien Gentis [Thu, 25 Apr 2013 14:11:14 +0000 (14:11 +0000)]
Updates.

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

11 years agoxforms, bloody xforms
Daniel Gruno [Thu, 25 Apr 2013 11:29:07 +0000 (11:29 +0000)]
xforms, bloody xforms

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

11 years agoNote that ProxyPass[Match] doesn't work within a <Directory> context.
Daniel Gruno [Thu, 25 Apr 2013 11:25:26 +0000 (11:25 +0000)]
Note that ProxyPass[Match] doesn't work within a <Directory> context.

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

11 years agoRebuild
Rich Bowen [Mon, 22 Apr 2013 14:14:09 +0000 (14:14 +0000)]
Rebuild

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

11 years agoMerge r1458020, r1463044, r1463045 from trunk:
Jim Jagielski [Mon, 22 Apr 2013 14:10:10 +0000 (14:10 +0000)]
Merge r1458020, r1463044, r1463045 from trunk:

more simplification with ap_bin2hex()

use apr_array for an array

Submitted by: Christophe JAILLET (with small tweaks by myself)
PR: 52881

ap_log_error already logs the error string, no need to log it twice

Submitted by: sf
Reviewed/backported by: jim

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

11 years agoMerge r1463056 from trunk:
Jim Jagielski [Mon, 22 Apr 2013 14:09:12 +0000 (14:09 +0000)]
Merge r1463056 from trunk:

Use %pm available since apr 1.3 instead of an extra call to apr_strerror

Submitted by: sf
Reviewed/backported by: jim

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

11 years agoMerge r1458004 from trunk:
Jim Jagielski [Mon, 22 Apr 2013 14:08:42 +0000 (14:08 +0000)]
Merge r1458004 from trunk:

add md5 function, too

Submitted by: sf
Reviewed/backported by: jim

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

11 years agoMerge r1463052 from trunk:
Jim Jagielski [Mon, 22 Apr 2013 14:07:56 +0000 (14:07 +0000)]
Merge r1463052 from trunk:

use ap_log_error's facility to print the apr error string instead of
calling apr_strerror() explicitly

Submitted by: sf
Reviewed/backported by: jim

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

11 years agoivote
Jim Jagielski [Mon, 22 Apr 2013 14:07:14 +0000 (14:07 +0000)]
ivote

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

11 years agoQuoted args
Rich Bowen [Mon, 22 Apr 2013 13:53:45 +0000 (13:53 +0000)]
Quoted args

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

11 years agopropose
Stefan Fritsch [Sun, 21 Apr 2013 06:24:56 +0000 (06:24 +0000)]
propose

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

11 years agoa few easy votes
Stefan Fritsch [Sun, 21 Apr 2013 06:06:59 +0000 (06:06 +0000)]
a few easy votes

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

11 years agoUpdates.
Lucien Gentis [Sat, 20 Apr 2013 15:39:29 +0000 (15:39 +0000)]
Updates.

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

11 years agoRebuild stuff.
Rich Bowen [Fri, 19 Apr 2013 18:36:42 +0000 (18:36 +0000)]
Rebuild stuff.

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

11 years agoAdds anchor for LA-U
Rich Bowen [Fri, 19 Apr 2013 17:21:02 +0000 (17:21 +0000)]
Adds anchor for LA-U

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

11 years agoxforms
Daniel Gruno [Thu, 18 Apr 2013 16:17:19 +0000 (16:17 +0000)]
xforms

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

11 years agoAdd mod_macro syntax to the highlighter
Daniel Gruno [Thu, 18 Apr 2013 16:13:26 +0000 (16:13 +0000)]
Add mod_macro syntax to the highlighter

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

11 years agofix typo
Daniel Gruno [Thu, 18 Apr 2013 16:11:58 +0000 (16:11 +0000)]
fix typo

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

11 years agoupdate transformations.
Nilgun Belma Buguner [Wed, 17 Apr 2013 16:14:51 +0000 (16:14 +0000)]
update transformations.

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

11 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Wed, 17 Apr 2013 16:07:10 +0000 (16:07 +0000)]
update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

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

11 years agoupdate transformations.
Nilgun Belma Buguner [Wed, 17 Apr 2013 14:29:41 +0000 (14:29 +0000)]
update transformations.

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

11 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Wed, 17 Apr 2013 14:27:40 +0000 (14:27 +0000)]
update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

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

11 years agoadd in skiplist
Jim Jagielski [Wed, 17 Apr 2013 13:25:25 +0000 (13:25 +0000)]
add in skiplist

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

11 years agoRemove vote for now in order to take rjung's comment on dev list into consideration.
Christophe Jaillet [Wed, 17 Apr 2013 05:58:00 +0000 (05:58 +0000)]
Remove vote for now in order to take rjung's comment on dev list into consideration.

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

11 years agoVotes.
Graham Leggett [Tue, 16 Apr 2013 20:33:12 +0000 (20:33 +0000)]
Votes.

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

11 years agoUpdate the proposal, provide a rollup patch.
Graham Leggett [Tue, 16 Apr 2013 20:15:18 +0000 (20:15 +0000)]
Update the proposal, provide a rollup patch.

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

11 years agoupdate transformations.
Nilgun Belma Buguner [Tue, 16 Apr 2013 15:48:13 +0000 (15:48 +0000)]
update transformations.

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

11 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Tue, 16 Apr 2013 15:46:04 +0000 (15:46 +0000)]
update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

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

11 years agoEasy votes to keep 2.4 close to trunk
Christophe Jaillet [Tue, 16 Apr 2013 07:07:31 +0000 (07:07 +0000)]
Easy votes to keep 2.4 close to trunk

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

11 years agoupdate transformations.
Nilgun Belma Buguner [Mon, 15 Apr 2013 16:08:45 +0000 (16:08 +0000)]
update transformations.

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

11 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Mon, 15 Apr 2013 16:05:16 +0000 (16:05 +0000)]
update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

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

11 years agofixed validation error
Nilgun Belma Buguner [Mon, 15 Apr 2013 16:01:48 +0000 (16:01 +0000)]
fixed validation error

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

11 years agoupdate comment, and move proposal to stalled section for 2.2.x, too
Kaspar Brand [Mon, 15 Apr 2013 15:59:05 +0000 (15:59 +0000)]
update comment, and move proposal to stalled section for 2.2.x, too

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

11 years agoUpdate proposal
Christophe Jaillet [Mon, 15 Apr 2013 14:20:09 +0000 (14:20 +0000)]
Update proposal

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

11 years agoVote.
Graham Leggett [Mon, 15 Apr 2013 13:51:47 +0000 (13:51 +0000)]
Vote.

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

11 years agoAdd some CHANGES entries for today's backports.
Rainer Jung [Mon, 15 Apr 2013 13:49:27 +0000 (13:49 +0000)]
Add some CHANGES entries for today's backports.

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

11 years agoFix revision number in proposal.
Rainer Jung [Mon, 15 Apr 2013 13:42:31 +0000 (13:42 +0000)]
Fix revision number in proposal.

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

11 years agoAdd a comment.
Graham Leggett [Mon, 15 Apr 2013 12:45:47 +0000 (12:45 +0000)]
Add a comment.

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

11 years agoMerge r1467765 from trunk:
Jim Jagielski [Mon, 15 Apr 2013 12:42:29 +0000 (12:42 +0000)]
Merge r1467765 from trunk:

Fix crash in mod_log_config when logging
request end time for a failed request
(LogFormat contains %{end}t).

The request_config for mod_log_config might
not be initialized.

PR 54828.

Submitted by: rjung
Reviewed/backported by: jim

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

11 years agoMerge r1452128 from trunk:
Jim Jagielski [Mon, 15 Apr 2013 12:42:00 +0000 (12:42 +0000)]
Merge r1452128 from trunk:

Remove useless tests.

Turn
   if (*x && apr_isspace(*x))
into
   if (apr_isspace(*x))
Submitted by: jailletc36
Reviewed/backported by: jim

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

11 years agoMerge r1457450, r1457610, r1457995, r1458003 from trunk:
Jim Jagielski [Mon, 15 Apr 2013 12:41:23 +0000 (12:41 +0000)]
Merge r1457450, r1457610, r1457995, r1458003 from trunk:

Expression parser: Add the ability to apply a SHA1 hash to strings within
the parser.

Expression parser: use hex encoding for the sha1 hash.

sha1 now does hex encoding

simplify code by using ap_bin2hex()

Submitted by: minfrin, sf, sf
Reviewed/backported by: jim

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

11 years agoMerge r1463750, r1463754, r1464675 from trunk:
Jim Jagielski [Mon, 15 Apr 2013 12:39:55 +0000 (12:39 +0000)]
Merge r1463750, r1463754, r1464675 from trunk:

Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror

Use apr_psprintf(... "%pm"...) instead of explicit call to apr_strerror

Use apr_file_printf(... "%pm"...) instead of explicit call to apr_strerror
+ add some spaces to improve formatting
Submitted by: jailletc36
Reviewed/backported by: jim

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

11 years agoMerge r1452281 from trunk:
Jim Jagielski [Mon, 15 Apr 2013 12:38:36 +0000 (12:38 +0000)]
Merge r1452281 from trunk:

cache_storage: remove useless test + update function name in debug log + skip as soon as we know headers do not match
Submitted by: jailletc36
Reviewed/backported by: jim

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

11 years agoMerge r1458456 from trunk:
Jim Jagielski [Mon, 15 Apr 2013 12:37:59 +0000 (12:37 +0000)]
Merge r1458456 from trunk:

Useful extensions...
Reviewed/backported by: jim

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

11 years agoMerge r1457437, r1457520 from trunk:
Jim Jagielski [Mon, 15 Apr 2013 12:36:23 +0000 (12:36 +0000)]
Merge r1457437, r1457520 from trunk:

Expression parser: Add the ability to base64 encode and base64 decode
strings within the parser.

Remove the comment, this is done.

Submitted by: minfrin
Reviewed/backported by: jim

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

11 years agoipromote
Jim Jagielski [Mon, 15 Apr 2013 12:35:15 +0000 (12:35 +0000)]
ipromote

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

11 years agoivote
Jim Jagielski [Mon, 15 Apr 2013 12:34:22 +0000 (12:34 +0000)]
ivote

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

11 years agoVote, pick a nit.
Joe Orton [Mon, 15 Apr 2013 07:42:37 +0000 (07:42 +0000)]
Vote, pick a nit.

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

11 years agovote/promote/cleanup addressed comments
Eric Covener [Sun, 14 Apr 2013 16:49:59 +0000 (16:49 +0000)]
vote/promote/cleanup addressed comments

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

11 years agoInclude all trunk patches
Daniel Ruggeri [Sun, 14 Apr 2013 15:59:14 +0000 (15:59 +0000)]
Include all trunk patches

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

11 years agoUpdate the proposal.
Graham Leggett [Sun, 14 Apr 2013 14:41:54 +0000 (14:41 +0000)]
Update the proposal.

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

11 years agoAdd r1458003 to the proposal.
Graham Leggett [Sun, 14 Apr 2013 14:38:56 +0000 (14:38 +0000)]
Add r1458003 to the proposal.

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

11 years agoEasy votes, promote, comment, propose.
Rainer Jung [Sun, 14 Apr 2013 12:11:45 +0000 (12:11 +0000)]
Easy votes, promote, comment, propose.

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

11 years agoUpdates.
Lucien Gentis [Sat, 13 Apr 2013 14:22:21 +0000 (14:22 +0000)]
Updates.

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

11 years agopropose, vote
Kaspar Brand [Sat, 13 Apr 2013 11:25:02 +0000 (11:25 +0000)]
propose, vote

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

11 years agoUpdated patch - thanks, Bill
Daniel Ruggeri [Sat, 13 Apr 2013 00:15:49 +0000 (00:15 +0000)]
Updated patch - thanks, Bill

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

11 years agoPut this backport for now on hold to get some more
Guenter Knauf [Wed, 10 Apr 2013 21:01:51 +0000 (21:01 +0000)]
Put this backport for now on hold to get some more
time for testing ...

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

11 years agoEasy proposals
Christophe Jaillet [Wed, 10 Apr 2013 18:51:26 +0000 (18:51 +0000)]
Easy proposals

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

11 years agoComment
Christophe Jaillet [Wed, 10 Apr 2013 05:13:39 +0000 (05:13 +0000)]
Comment

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

11 years agoRock the vote
Daniel Ruggeri [Tue, 9 Apr 2013 21:32:37 +0000 (21:32 +0000)]
Rock the vote

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

11 years agoPropose an easy one
Daniel Ruggeri [Tue, 9 Apr 2013 21:09:02 +0000 (21:09 +0000)]
Propose an easy one

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

11 years agoEasy proposal
Christophe Jaillet [Tue, 9 Apr 2013 20:42:18 +0000 (20:42 +0000)]
Easy proposal

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

11 years agoalign
Christophe Jaillet [Tue, 9 Apr 2013 19:12:44 +0000 (19:12 +0000)]
align

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

11 years agoAlign comments in examples
Christophe Jaillet [Tue, 9 Apr 2013 19:04:59 +0000 (19:04 +0000)]
Align comments in examples

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

11 years agoremove a superceded comment, but add a new one.
Eric Covener [Tue, 9 Apr 2013 14:25:44 +0000 (14:25 +0000)]
remove a superceded comment, but add a new one.

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

11 years agoMerge r1447993 from trunk:
Jim Jagielski [Tue, 9 Apr 2013 12:17:04 +0000 (12:17 +0000)]
Merge r1447993 from trunk:

    mod_ssl: Quiet FIPS mode weak keys disabled and FIPS not selected emits
    in the error log to debug level.  [William Rowe]

Submitted by: wrowe
Reviewed/backported by: jim

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

11 years agoMerge r1453604 from trunk:
Jim Jagielski [Tue, 9 Apr 2013 12:15:44 +0000 (12:15 +0000)]
Merge r1453604 from trunk:

fix merge of min/max file size by setting corresponding _set

Submitted by: covener
Reviewed/backported by: jim

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

11 years ago2 proposals
Jim Jagielski [Tue, 9 Apr 2013 12:12:22 +0000 (12:12 +0000)]
2 proposals

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

11 years agoMerge r1465828 from trunk:
Eric Covener [Mon, 8 Apr 2013 23:48:20 +0000 (23:48 +0000)]
Merge r1465828 from trunk:

PR54813 authz_dbm used to respond to 'Require group ...'

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

11 years agoxforms
Daniel Gruno [Mon, 8 Apr 2013 12:04:41 +0000 (12:04 +0000)]
xforms

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

11 years agoAdd example use case to doc
Daniel Gruno [Mon, 8 Apr 2013 12:02:29 +0000 (12:02 +0000)]
Add example use case to doc

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

11 years agoLoadModule is no longer a "new" directive in 2.4
Vincent Deffontaines [Mon, 1 Apr 2013 16:20:45 +0000 (16:20 +0000)]
LoadModule is no longer a "new" directive in 2.4

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

11 years agoUpdate.
Lucien Gentis [Fri, 29 Mar 2013 12:25:34 +0000 (12:25 +0000)]
Update.

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

11 years agotransform via "make docs", adding mod_macro.html.fr
Jeff Trawick [Fri, 29 Mar 2013 12:14:50 +0000 (12:14 +0000)]
transform via "make docs", adding mod_macro.html.fr

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

11 years ago* Add a comment
Ruediger Pluem [Thu, 28 Mar 2013 19:44:07 +0000 (19:44 +0000)]
* Add a comment

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

11 years agoAdd mod_macro to Windows Build. merge/backport r1436058
Gregg Lewis Smith [Wed, 27 Mar 2013 18:45:47 +0000 (18:45 +0000)]
Add mod_macro to Windows Build. merge/backport r1436058

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

11 years agoadd missing generated mod_macro files
Jeff Trawick [Wed, 27 Mar 2013 17:51:58 +0000 (17:51 +0000)]
add missing generated mod_macro files

Pointed out by: Tom Evans

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

11 years agotypo
Rich Bowen [Mon, 25 Mar 2013 23:28:38 +0000 (23:28 +0000)]
typo

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