]>
granicus.if.org Git - apache/log
Lucien Gentis [Sun, 19 May 2013 15:15:38 +0000 (15:15 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1484292 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 17 May 2013 18:20:07 +0000 (18:20 +0000)]
NetWare build: dont make the svn revision file a dependency.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1483943 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 May 2013 04:32:40 +0000 (04:32 +0000)]
this is needed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1483192 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 May 2013 04:05:47 +0000 (04:05 +0000)]
add the fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1483189 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 15 May 2013 19:31:06 +0000 (19:31 +0000)]
core: Use the proper macro for HTTP/1.1.
trunk patch: http://svn.apache.org/r1482996
Submitted by: minfrin
Reviewed by: covener, jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1483029 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 15 May 2013 19:28:30 +0000 (19:28 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1483028 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 15 May 2013 19:25:54 +0000 (19:25 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1483026 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 15 May 2013 19:20:09 +0000 (19:20 +0000)]
vote + promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1483021 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 15 May 2013 18:47:19 +0000 (18:47 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1483001 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 15 May 2013 18:43:03 +0000 (18:43 +0000)]
Propose an easy one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1482998 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 15 May 2013 14:14:11 +0000 (14:14 +0000)]
Update comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1482860 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 15 May 2013 12:55:18 +0000 (12:55 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1482798 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 15 May 2013 03:57:28 +0000 (03:57 +0000)]
Fixed eol-style.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1482666 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 14 May 2013 20:52:28 +0000 (20:52 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1482584 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 14 May 2013 02:24:37 +0000 (02:24 +0000)]
propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1482173 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 14 May 2013 01:24:07 +0000 (01:24 +0000)]
NetWare build: make use of SVN revision optional.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1482168 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 14 May 2013 00:51:01 +0000 (00:51 +0000)]
Use SVN revision for NetWare dev builds version info.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1482160 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 13 May 2013 19:57:54 +0000 (19:57 +0000)]
no seqfault
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1482052 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 12 May 2013 11:09:23 +0000 (11:09 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481523 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 12 May 2013 10:44:15 +0000 (10:44 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481516 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 12 May 2013 10:38:46 +0000 (10:38 +0000)]
event MPM: Provide error handling for ThreadStackSize. PR 54311
trunk patch: http://svn.apache.org/r1433682
Submitted by: Tianyin Xu <tixu cs.ucsd.edu>
Reviewed by: minfrin, jailletc36, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481515 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 12 May 2013 10:26:22 +0000 (10:26 +0000)]
mod_dav: Do not segfault on PROPFIND with a zero length DBM. PR 52559
trunk patch: http://svn.apache.org/r1476645
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, covener, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481513 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 12 May 2013 10:21:18 +0000 (10:21 +0000)]
core: Improve error message where client's request-line exceeds LimitRequestLine
PR 54384
trunk patch: http://svn.apache.org/r1433613
Submitted by: jailletc36
Reviewed by: minfrin, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481512 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 11 May 2013 21:31:52 +0000 (21:31 +0000)]
Update proposal as per sf, reset the vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481421 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 11 May 2013 19:59:05 +0000 (19:59 +0000)]
retract vote, comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481399 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 11 May 2013 19:31:49 +0000 (19:31 +0000)]
vote & promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481395 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 11 May 2013 16:15:47 +0000 (16:15 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481369 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 11 May 2013 16:14:28 +0000 (16:14 +0000)]
Merge docs tweaks from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481368 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 11 May 2013 12:18:57 +0000 (12:18 +0000)]
get some easier votes out of the way
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481310 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 11 May 2013 12:06:40 +0000 (12:06 +0000)]
propose vhost backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481307 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 11 May 2013 11:51:28 +0000 (11:51 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481305 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 10 May 2013 21:55:27 +0000 (21:55 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481213 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 10 May 2013 15:40:25 +0000 (15:40 +0000)]
Fixed NetWare default versions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481060 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 10 May 2013 15:29:31 +0000 (15:29 +0000)]
Kill some NetWare build warnings (backport r1481040).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1481054 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 10 May 2013 08:17:50 +0000 (08:17 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1480924 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 10 May 2013 08:10:26 +0000 (08:10 +0000)]
some more typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1480916 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 10 May 2013 07:52:39 +0000 (07:52 +0000)]
typo and grammar fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1480903 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 10 May 2013 07:48:06 +0000 (07:48 +0000)]
s/uppser/upper/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1480902 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 8 May 2013 14:17:54 +0000 (14:17 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1480285 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 8 May 2013 10:00:14 +0000 (10:00 +0000)]
s/2.5/2.4.5/ since it's been backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1480213 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 7 May 2013 19:38:51 +0000 (19:38 +0000)]
Backport
1480046 .
Fix spelling mistake, no code change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1480048 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Tue, 7 May 2013 18:36:56 +0000 (18:36 +0000)]
Adding .fr translation for windows platform doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1480008 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 7 May 2013 16:20:30 +0000 (16:20 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479967 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 7 May 2013 13:47:55 +0000 (13:47 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479907 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 7 May 2013 13:28:29 +0000 (13:28 +0000)]
update french translation to reflect the current auth syntax
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479903 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 7 May 2013 12:12:54 +0000 (12:12 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479875 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 7 May 2013 12:08:08 +0000 (12:08 +0000)]
Catch up with the actual modern way of allowing/denying access
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479873 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 7 May 2013 11:54:12 +0000 (11:54 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479869 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 7 May 2013 11:47:59 +0000 (11:47 +0000)]
mod_macro is no longer a third party module (even if people need 2.4.5-dev to get it, it has been backported)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479866 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 6 May 2013 17:52:46 +0000 (17:52 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479655 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 6 May 2013 17:50:03 +0000 (17:50 +0000)]
mention mod_macro in CHANGES and add compatibility note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479653 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 6 May 2013 11:44:28 +0000 (11:44 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479529 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 5 May 2013 22:30:51 +0000 (22:30 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479413 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 5 May 2013 09:50:56 +0000 (09:50 +0000)]
comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479273 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 5 May 2013 09:39:33 +0000 (09:39 +0000)]
- Wording improvemennt (I hope so)
- Add forgotten MD5 in apr_expr change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479269 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 5 May 2013 08:41:59 +0000 (08:41 +0000)]
typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479263 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 5 May 2013 08:37:03 +0000 (08:37 +0000)]
s/deliminator/delimiter/, let's stick to non-Perl jargon here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479262 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 5 May 2013 08:30:25 +0000 (08:30 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479259 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 5 May 2013 08:22:00 +0000 (08:22 +0000)]
typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479256 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 5 May 2013 01:21:04 +0000 (01:21 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479223 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 4 May 2013 23:06:01 +0000 (23:06 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479217 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 4 May 2013 15:01:14 +0000 (15:01 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479121 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 4 May 2013 13:00:41 +0000 (13:00 +0000)]
Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479094 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 4 May 2013 12:52:00 +0000 (12:52 +0000)]
Change GIF icons to use a different palette, for more smoothness.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1479092 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 3 May 2013 15:19:50 +0000 (15:19 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1478833 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 3 May 2013 12:26:04 +0000 (12:26 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1478752 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 2 May 2013 16:56:58 +0000 (16:56 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1478442 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 2 May 2013 14:31:05 +0000 (14:31 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1478386 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 1 May 2013 20:48:32 +0000 (20:48 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1478182 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 1 May 2013 11:29:03 +0000 (11:29 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477951 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 20:34:37 +0000 (20:34 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477816 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 20:34:15 +0000 (20:34 +0000)]
rpm spec file: Add mod_macro and mod_cache_socache to the RPM build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477815 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 16:10:02 +0000 (16:10 +0000)]
mod_cache_socache: New cache implementation backed by mod_socache
that replaces mod_mem_cache removed from httpd v2.2.
Add backported files, missed by the backport process in r1477652.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477708 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 15:01:12 +0000 (15:01 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477679 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 14:47:53 +0000 (14:47 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477672 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Apr 2013 14:23:33 +0000 (14:23 +0000)]
Merge r1305167, r1330964, r1388660, r1388899, r1391396, r1391398, r1392214, r1406760, r1418648 from trunk:
Update transformations.
syntax for mod_b*.xml and mod_c*.xml
mod_cache_socache: New cache implementation backed by mod_socache
that replaces mod_mem_cache removed from httpd v2.2.
Windows build for mod_cache_socache added in r1388660
Fix the return values on mod_cache_socache's store_headers() implementation
to return APR errors codes and not DECLINED. We are committed to using this
implementation by this point, and any error should force us to stand down.
Submitted by: trawick
Reviewed by: minfrin
Apply proper APLOGNO codes for mod_cache_socache.
Added mod_cache_socache to NetWare build.
* Ensure that nkey is initialized.
mod_cache_socache: Don't clean up too soon. If we do, revalidated requests
lose their bodies.
Submitted by: minfrin, humbedooh, minfrin, gsmith, minfrin, minfrin, fuankg, rpluem, minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477652 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Apr 2013 14:19:43 +0000 (14:19 +0000)]
Merge r1465116 from trunk:
htpasswd: Add -v option to verify a password
htpasswd and htdbm could use some more refactoring...
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477651 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Apr 2013 14:18:46 +0000 (14:18 +0000)]
Merge r1476680 from trunk:
mod_proxy: Clarify the usage suggestion for BalancerInherit and ProxyPassInherit.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477650 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Apr 2013 14:18:13 +0000 (14:18 +0000)]
Merge r1387603, r1388029, r1420124, r1421288, r1421912, r1422943, r1422980, r1430575, r1439404 from trunk:
wtf are we doing merging in these from the parent??
These are server specific!
OK, enable/allow previous broken, bad behavior iff the user
really, really wants it. And warn that b-m isn't recommended
in those cases.
rjung's suggestions...
inherit inherit
Use inherit_set to let the global server set
the default for all vhosts.
Otherwise inherit would need to be disabled
redundantly in each vhost.
restrict inherit control to those fields that "require" it...
Redfine - we are just worried about balancers and workers, so have the directive clear about that.
Naming
ProxyPassInherit directive
Submitted by: jim, rjung, jim, jim, jim, jim
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477649 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Apr 2013 14:12:52 +0000 (14:12 +0000)]
ipromote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477642 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 Apr 2013 14:11:45 +0000 (14:11 +0000)]
ivote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477641 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 12:37:14 +0000 (12:37 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477594 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 30 Apr 2013 10:32:39 +0000 (10:32 +0000)]
Update the proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477536 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 29 Apr 2013 14:52:16 +0000 (14:52 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477114 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 29 Apr 2013 12:32:55 +0000 (12:32 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477002 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 29 Apr 2013 12:31:42 +0000 (12:31 +0000)]
Note that parseargs and parsebody actually returns two tables, not one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1477001 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 29 Apr 2013 12:25:39 +0000 (12:25 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476993 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 29 Apr 2013 12:22:38 +0000 (12:22 +0000)]
Expand on how to set context specific directives. Also fix some typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476991 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Apr 2013 13:31:05 +0000 (13:31 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476764 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 28 Apr 2013 08:56:54 +0000 (08:56 +0000)]
Fix version number in mmn comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476737 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 23:14:11 +0000 (23:14 +0000)]
mod_authnz_ldap: Allow using exec: callouts like SSLPassphraseDialog
for AuthLDAPBindPassword.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1433478
http://svn.apache.org/viewvc?view=revision&revision=
1467523
http://svn.apache.org/viewvc?view=revision&revision=
1467792
2.4.x patch: http://people.apache.org/~druggeri/patches/AuthLDAPBindPasswordExec-2.4.patch
(
20130119 - updated to include minor mmn bump)
(
20130412 - updated to not use static var - thx, wrowe)
Submitted by: druggeri
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476694 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 23:12:15 +0000 (23:12 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476693 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 23:04:02 +0000 (23:04 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476691 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 22:32:42 +0000 (22:32 +0000)]
mod_proxy_balancer: Add failontimeout parameter. Timeout will put worker
in error state if an IO timeout is detected.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1465839
2.4.x patch: http://people.apache.org/~druggeri/patches/httpd-2.4.x-failontimeout.patch
Submitted by: druggeri
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476689 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 22:30:54 +0000 (22:30 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476688 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 22:18:02 +0000 (22:18 +0000)]
mod_ssl: Catch missing, mismatched or encrypted client cert/key pairs
with SSLProxyMachineCertificateFile/Path directives. PR 52212, PR 54698.
(check at startup, to prevent segfaults at proxy request time)
trunk patches: https://svn.apache.org/r1374214
https://svn.apache.org/r1374216
https://svn.apache.org/r1375445
https://svn.apache.org/r1467593
2.4.x patch: https://people.apache.org/~kbrand/PR52212_54698_2.4.x.patch
Submitted by: kbrand
Reviewed by: jorton, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476685 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 22:15:16 +0000 (22:15 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476684 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 22:07:08 +0000 (22:07 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476683 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 21:50:49 +0000 (21:50 +0000)]
Comment and vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476682 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 21:40:59 +0000 (21:40 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1476679 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log