]> granicus.if.org Git - apache/log
apache
7 years agoRebuild.
Lucien Gentis [Sat, 23 Jul 2016 15:23:49 +0000 (15:23 +0000)]
Rebuild.

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

7 years agoXML updates.
Lucien Gentis [Sat, 23 Jul 2016 15:22:59 +0000 (15:22 +0000)]
XML updates.

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

7 years agoMerge r1753872 from trunk:
Eric Covener [Sat, 23 Jul 2016 14:11:48 +0000 (14:11 +0000)]
Merge r1753872 from trunk:

Since this is beginner doc, split the -S invocation into two
versions more likely to work verbatim.

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

7 years agocommitted
Eric Covener [Fri, 22 Jul 2016 12:47:57 +0000 (12:47 +0000)]
committed

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

7 years agoMerge r1752415 from trunk:
Eric Covener [Fri, 22 Jul 2016 12:47:42 +0000 (12:47 +0000)]
Merge r1752415 from trunk:

PR59844: stack-allocated ap_expr_info_t returned from mod_include

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

7 years agovote
Eric Covener [Fri, 22 Jul 2016 12:45:44 +0000 (12:45 +0000)]
vote

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

7 years agoPropose
William A. Rowe Jr [Fri, 22 Jul 2016 12:42:36 +0000 (12:42 +0000)]
Propose

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

7 years agoVote.
Jacob Champion [Thu, 21 Jul 2016 22:26:12 +0000 (22:26 +0000)]
Vote.

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

7 years agoMerge r1753712 from trunk:
Eric Covener [Thu, 21 Jul 2016 16:43:41 +0000 (16:43 +0000)]
Merge r1753712 from trunk:

add basic h2: and h2c: backend proxy examples

Submitted by: Hank Ibell <hwibell gmail.com>
Committed by: covener

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

7 years agoMerge of 1752087,1752096,1752145,1753498,1753541 from trunk:
Stefan Eissing [Wed, 20 Jul 2016 16:09:06 +0000 (16:09 +0000)]
Merge of 1752087,1752096,1752145,1753498,1753541 from trunk:

mod_http2: removed timeouts on master connection while reuqest are being processsed
mod_http2: new H2CopyFiles directive

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

8 years agoBackport proposal for r1753167
Luca Toscano [Tue, 19 Jul 2016 06:38:50 +0000 (06:38 +0000)]
Backport proposal for r1753167

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

8 years agoVote (minor autoconf cleanup)
Jacob Champion [Mon, 18 Jul 2016 20:47:01 +0000 (20:47 +0000)]
Vote (minor autoconf cleanup)

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

8 years agoPropose fix to fdpass --enable defaults
William A. Rowe Jr [Mon, 18 Jul 2016 13:49:24 +0000 (13:49 +0000)]
Propose fix to fdpass --enable defaults

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

8 years agoDoc rebuild
Luca Toscano [Sun, 17 Jul 2016 13:29:09 +0000 (13:29 +0000)]
Doc rebuild

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

8 years agoAdded a reference to how ListenCoresBucketsRatio influences the Min|MaxSpareThreads...
Luca Toscano [Sun, 17 Jul 2016 13:28:39 +0000 (13:28 +0000)]
Added a reference to how ListenCoresBucketsRatio influences the Min|MaxSpareThreads lower bounds calculation in the docs.

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

8 years agoRebuild.
Lucien Gentis [Sat, 16 Jul 2016 16:03:42 +0000 (16:03 +0000)]
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Sat, 16 Jul 2016 16:02:24 +0000 (16:02 +0000)]
XML update.

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

8 years agoAdded missing trunk patches and final view to proposal
Luca Toscano [Fri, 15 Jul 2016 08:12:52 +0000 (08:12 +0000)]
Added missing trunk patches and final view to proposal

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

8 years agoxforms
Christophe Jaillet [Thu, 14 Jul 2016 21:06:56 +0000 (21:06 +0000)]
xforms

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

8 years agoFix PR 59856.
Christophe Jaillet [Thu, 14 Jul 2016 21:05:46 +0000 (21:05 +0000)]
Fix PR 59856.
Fix directive name. (ProxyRequest vs ProxyRequests)
Improve highlight.

(r1752747 in trunk)

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

8 years agoVote/promote.
Jacob Champion [Wed, 13 Jul 2016 19:57:58 +0000 (19:57 +0000)]
Vote/promote.

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

8 years ago* Vote
Ruediger Pluem [Wed, 13 Jul 2016 18:57:45 +0000 (18:57 +0000)]
* Vote

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

8 years agoPR59844 fix
Eric Covener [Wed, 13 Jul 2016 12:49:24 +0000 (12:49 +0000)]
PR59844 fix

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

8 years agoFix typo in proposal
Luca Toscano [Wed, 13 Jul 2016 11:35:15 +0000 (11:35 +0000)]
Fix typo in proposal

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

8 years agoAdded backport proposal for http://svn.apache.org/r1752347
Luca Toscano [Wed, 13 Jul 2016 11:02:31 +0000 (11:02 +0000)]
Added backport proposal for http://svn.apache.org/r1752347

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

8 years agoPropose PR 59685 patches.
Jacob Champion [Tue, 12 Jul 2016 19:24:41 +0000 (19:24 +0000)]
Propose PR 59685 patches.

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

8 years agoMerge of r1752087 from trunk:
Stefan Eissing [Sun, 10 Jul 2016 14:49:22 +0000 (14:49 +0000)]
Merge of r1752087 from trunk:

mod_http2: fixes flush handling for SETTINGS when no streams are open

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

8 years agoRebuild.
Lucien Gentis [Sat, 9 Jul 2016 16:38:17 +0000 (16:38 +0000)]
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Sat, 9 Jul 2016 16:37:46 +0000 (16:37 +0000)]
XML update.

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

8 years agopropose PR59815 fix
Eric Covener [Fri, 8 Jul 2016 21:51:31 +0000 (21:51 +0000)]
propose PR59815 fix

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

8 years agoxform
Eric Covener [Fri, 8 Jul 2016 16:01:54 +0000 (16:01 +0000)]
xform

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

8 years agoMerge r1751930 from trunk:
Eric Covener [Fri, 8 Jul 2016 16:00:31 +0000 (16:00 +0000)]
Merge r1751930 from trunk:

mention mod_cgid too

http://httpd.apache.org/docs/2.4/howto/cgi.html#comment_5623

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

8 years agoreleased
Jim Jagielski [Thu, 7 Jul 2016 11:24:04 +0000 (11:24 +0000)]
released

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

8 years agoUpdated description of the change to reflect the last patch
Luca Toscano [Sun, 3 Jul 2016 12:11:34 +0000 (12:11 +0000)]
Updated description of the change to reflect the last patch

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

8 years agoUpdated backport proposal
Luca Toscano [Sun, 3 Jul 2016 09:54:39 +0000 (09:54 +0000)]
Updated backport proposal

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

8 years agoRebuild.
Lucien Gentis [Sat, 2 Jul 2016 14:38:27 +0000 (14:38 +0000)]
Rebuild.

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

8 years agoXML updates.
Lucien Gentis [Sat, 2 Jul 2016 14:37:30 +0000 (14:37 +0000)]
XML updates.

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

8 years agoRebuild.
Lucien Gentis [Sat, 2 Jul 2016 14:24:41 +0000 (14:24 +0000)]
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Sat, 2 Jul 2016 14:23:06 +0000 (14:23 +0000)]
XML update.

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

8 years agoXML updates.
Lucien Gentis [Sat, 2 Jul 2016 14:21:26 +0000 (14:21 +0000)]
XML updates.

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

8 years agoPropose ab SNI extension.
Yann Ylavic [Fri, 1 Jul 2016 15:17:48 +0000 (15:17 +0000)]
Propose ab SNI extension.

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

8 years agoUpdated backport proposal, wrong RFC mentioned
Luca Toscano [Fri, 1 Jul 2016 15:02:50 +0000 (15:02 +0000)]
Updated backport proposal, wrong RFC mentioned

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

8 years agoUpdated backport proposal (r1748379, r1750747, r1750749)
Luca Toscano [Fri, 1 Jul 2016 06:14:08 +0000 (06:14 +0000)]
Updated backport proposal (r1748379, r1750747, r1750749)

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

8 years agoAnd we are 2.4.24-dev
Jim Jagielski [Thu, 30 Jun 2016 17:15:54 +0000 (17:15 +0000)]
And we are 2.4.24-dev

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

8 years agoGet ready to tag 2.4.23
Jim Jagielski [Thu, 30 Jun 2016 17:14:40 +0000 (17:14 +0000)]
Get ready to tag 2.4.23

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

8 years agoupdate properties
André Malo [Thu, 30 Jun 2016 14:53:23 +0000 (14:53 +0000)]
update properties

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

8 years agoMerge r1750779 from trunk:
Jim Jagielski [Thu, 30 Jun 2016 14:42:39 +0000 (14:42 +0000)]
Merge r1750779 from trunk:

modssl: reset client-verify state when renegotiation is aborted
Submitted by: icing
Reviewed/backported by: jim

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

8 years agoVote, promote.
Yann Ylavic [Thu, 30 Jun 2016 14:33:26 +0000 (14:33 +0000)]
Vote, promote.

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

8 years agovote
Jim Jagielski [Thu, 30 Jun 2016 12:37:19 +0000 (12:37 +0000)]
vote

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

8 years agopropose
Stefan Eissing [Thu, 30 Jun 2016 12:15:29 +0000 (12:15 +0000)]
propose

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

8 years agoxforms
Jim Jagielski [Thu, 30 Jun 2016 11:14:31 +0000 (11:14 +0000)]
xforms

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

8 years agoirestore
Jim Jagielski [Thu, 30 Jun 2016 11:03:43 +0000 (11:03 +0000)]
irestore

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

8 years agoUpdate transformations.
Joe Orton [Thu, 30 Jun 2016 07:24:15 +0000 (07:24 +0000)]
Update transformations.

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

8 years agoMerge 1750750 from trunk:
Joe Orton [Thu, 30 Jun 2016 07:23:28 +0000 (07:23 +0000)]
Merge 1750750 from trunk:

Update language on impact of disabling TRACE, remove reference to compliance.

Reviewed by: wrowe, covener, rpluem

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

8 years agoMerge r1750507, r1750553 from trunk:
Jim Jagielski [Wed, 29 Jun 2016 17:30:07 +0000 (17:30 +0000)]
Merge r1750507, r1750553 from trunk:

Fix proxy balancer lbmethod --enable defaults to follow proxy_balancer

Small change to r952007, ensure we don't wipe out the $enable_foomod value
when that value is 'shared'. The 'yes', 'shared', 'static' and 'no' values
are all valid.

Submitted by: wrowe
Reviewed/backported by: jim

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

8 years agoMerge r1749925 from trunk:
Jim Jagielski [Wed, 29 Jun 2016 17:29:43 +0000 (17:29 +0000)]
Merge r1749925 from trunk:

Promote any static module to yes|shared if a required dependency is not static
Submitted by: wrowe
Reviewed/backported by: jim

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

8 years agopromote
Jim Jagielski [Wed, 29 Jun 2016 17:29:11 +0000 (17:29 +0000)]
promote

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

8 years agovote.
Jim Jagielski [Wed, 29 Jun 2016 17:28:53 +0000 (17:28 +0000)]
vote.
Required since w/o this patch, previous build fail (no lbmethods)

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

8 years ago* Vote
Ruediger Pluem [Wed, 29 Jun 2016 13:19:45 +0000 (13:19 +0000)]
* Vote

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

8 years agoupdate transformation
André Malo [Tue, 28 Jun 2016 19:59:52 +0000 (19:59 +0000)]
update transformation

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

8 years agosvn:eol-style native
André Malo [Tue, 28 Jun 2016 19:57:30 +0000 (19:57 +0000)]
svn:eol-style native

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

8 years ago--enable-mods-[shared|static]=none has *never* done anything special.
William A. Rowe Jr [Tue, 28 Jun 2016 19:56:57 +0000 (19:56 +0000)]
--enable-mods-[shared|static]=none has *never* done anything special.

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

8 years agoupdate transformation
André Malo [Tue, 28 Jun 2016 19:37:54 +0000 (19:37 +0000)]
update transformation

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

8 years agofix properties
André Malo [Tue, 28 Jun 2016 19:30:32 +0000 (19:30 +0000)]
fix properties

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

8 years agoComplete the lbmethods patch in the case of --enable-proxy-balancer=shared
William A. Rowe Jr [Tue, 28 Jun 2016 18:38:31 +0000 (18:38 +0000)]
Complete the lbmethods patch in the case of --enable-proxy-balancer=shared
(that value was forgotten once the module was enabled), and note a nice-to-have
backport that isn't critical for 2.4.23.

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

8 years agoAsked and answered, we have a fallback behavior
William A. Rowe Jr [Tue, 28 Jun 2016 15:17:26 +0000 (15:17 +0000)]
Asked and answered, we have a fallback behavior

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

8 years agoRaise the question in status
William A. Rowe Jr [Tue, 28 Jun 2016 14:20:40 +0000 (14:20 +0000)]
Raise the question in status

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

8 years agoAccount for lost toggle in lbmethod(s)
William A. Rowe Jr [Tue, 28 Jun 2016 14:19:47 +0000 (14:19 +0000)]
Account for lost  toggle in lbmethod(s)

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

8 years agomod_proxy_http2: detect TLS close notify on backend connection, patch by Yann Ylavic
Stefan Eissing [Tue, 28 Jun 2016 13:36:22 +0000 (13:36 +0000)]
mod_proxy_http2: detect TLS close notify on backend connection, patch by Yann Ylavic

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

8 years agoMerge r1750218 from trunk:
Jim Jagielski [Tue, 28 Jun 2016 11:46:34 +0000 (11:46 +0000)]
Merge r1750218 from trunk:

Follow up to r1737447: fix max_spare_threads lower bound.
Suggested by: Rick Houser <rick.houser jackson.com>

Submitted by: ylavic
Reviewed/backported by: jim

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

8 years agopromote
Jim Jagielski [Tue, 28 Jun 2016 11:46:10 +0000 (11:46 +0000)]
promote

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

8 years agovote
Jim Jagielski [Tue, 28 Jun 2016 11:45:53 +0000 (11:45 +0000)]
vote

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

8 years agoMerge r1750335, r1750407, r1750420 from trunk:
Jim Jagielski [Tue, 28 Jun 2016 11:45:33 +0000 (11:45 +0000)]
Merge r1750335, r1750407, r1750420 from trunk:

Ensure not-selected means 'no', once an APACHE_MODULE enable_foo is processed

Account for explicit enable- cases of 'shared', 'few', 'all', 'reallyall'

This is not C code... no semi, a colon is a noop
Submitted by: wrowe
Reviewed/backported by: jim

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

8 years agoMerge r1750043 from trunk:
Jim Jagielski [Tue, 28 Jun 2016 11:44:54 +0000 (11:44 +0000)]
Merge r1750043 from trunk:

Replace the proxy_mods_enable logic, with its hazardous 'yes' value that
aborts the build on missing dependencies, with a local override of the
module_selection as 'most', and module_default of the same shared|static
model that was requested through --enable-proxy.

[For trunk, we need to reevaluate the 'most' condition of some of the more
esoteric modules, and simply drop the module_default override; where a user
wants to enable -only- mod_proxy, plus one proxy mechanism, the legacy 2.4.x
behavior retained by this patch is nuts. For one example,
  --enable-modules=few --enable-proxy-yes --enable-proxy_http
is a completely specific and legitimate syntax --- adding 10 other proxy
providers in response to this syntax is absurd.]

Submitted by: wrowe
Reviewed/backported by: jim

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

8 years agoMerge r1749401, r1749404 from trunk:
Jim Jagielski [Tue, 28 Jun 2016 11:44:15 +0000 (11:44 +0000)]
Merge r1749401, r1749404 from trunk:

Fix 'x' command processing in mod_sed.

This has been tested using a slighly modified example taken from:
    https://blogs.oracle.com/basant/entry/using_mod_sed_to_filter
(OutputSed "s/.\*//"             has been changed in                OutputSed "s/.*//")

OutputSed "/Sunday/ {"
OutputSed "h"
OutputSed "s/.*//"
OutputSed "N"
OutputSed "s/\^.//"
OutputSed     "/Monday/ {"
OutputSed         "x"
OutputSed         "s/Sunday/Monday/"
OutputSed         "x"
OutputSed         "s/Monday/Tuesday/"
OutputSed         "H"
OutputSed         "g"
OutputSed     "}"
OutputSed "}"

Add CHANGES entry for r1749401
Submitted by: jailletc36
Reviewed/backported by: jim

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

8 years agoVote, promote.
Yann Ylavic [Tue, 28 Jun 2016 07:55:17 +0000 (07:55 +0000)]
Vote, promote.

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

8 years ago* Vote
Ruediger Pluem [Tue, 28 Jun 2016 07:32:13 +0000 (07:32 +0000)]
* Vote

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

8 years agoxforms
Christophe Jaillet [Tue, 28 Jun 2016 04:48:28 +0000 (04:48 +0000)]
xforms

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

8 years agoFix typo as spotted by Wolfgang in online doc (r1750439 in trunk)
Christophe Jaillet [Tue, 28 Jun 2016 04:43:43 +0000 (04:43 +0000)]
Fix typo as spotted by Wolfgang in online doc (r1750439 in trunk)

Be more consistent in <highlight> block layout in XML.
No visual change (r1750441 in trunk)

Synch with trunk (mainly <highlight> block layout)
Do not use " around parameters in syntax

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

8 years agoOne (hopefully final) backport to cover known --enable-foo=* toggles
William A. Rowe Jr [Tue, 28 Jun 2016 00:44:37 +0000 (00:44 +0000)]
One (hopefully final) backport to cover known --enable-foo=* toggles

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

8 years agoWithdrawing incomplete proposal.
Yann Ylavic [Mon, 27 Jun 2016 15:43:37 +0000 (15:43 +0000)]
Withdrawing incomplete proposal.

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

8 years agoPropose mitigation for PR 57832.
Yann Ylavic [Mon, 27 Jun 2016 08:29:59 +0000 (08:29 +0000)]
Propose mitigation for PR 57832.

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

8 years agomod_watchdog: Enable at --enable-modules=most for mod_proxy_hcheck
William A. Rowe Jr [Sun, 26 Jun 2016 15:40:45 +0000 (15:40 +0000)]
mod_watchdog: Enable at --enable-modules=most for mod_proxy_hcheck

Backports: r1749924
Submitted by: wrowe
Reviewed by: rpluem, ylavic

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

8 years agoconfigure: Do not treat dependency exceptions with --enable-modules
William A. Rowe Jr [Sun, 26 Jun 2016 15:39:05 +0000 (15:39 +0000)]
configure: Do not treat dependency exceptions with --enable-modules
of only 'few' or 'none' as fatal, but continue the ./configure

Submitted by: trawick
Backports: r1396440 [only the acinclude.m4, config5.m4 change was N/A]
Reviewed by: wrowe, rpluem, ylavic

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

8 years agoProxy no-force patch to allow ./configure to succeed with enable-proxy=yes
William A. Rowe Jr [Sun, 26 Jun 2016 15:34:12 +0000 (15:34 +0000)]
Proxy no-force patch to allow ./configure to succeed with enable-proxy=yes

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

8 years agoVote, promote.
Yann Ylavic [Sat, 25 Jun 2016 20:40:10 +0000 (20:40 +0000)]
Vote, promote.

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

8 years agoPropose.
Yann Ylavic [Sat, 25 Jun 2016 20:37:49 +0000 (20:37 +0000)]
Propose.

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

8 years agoFix text files
William A. Rowe Jr [Fri, 24 Jun 2016 17:00:20 +0000 (17:00 +0000)]
Fix text files

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

8 years ago* Vote
Ruediger Pluem [Thu, 23 Jun 2016 18:19:41 +0000 (18:19 +0000)]
* Vote

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

8 years agoSome patches to chew on...
William A. Rowe Jr [Thu, 23 Jun 2016 16:12:15 +0000 (16:12 +0000)]
Some patches to chew on...

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

8 years agoPick up a most worthwhile backport
William A. Rowe Jr [Thu, 23 Jun 2016 15:55:54 +0000 (15:55 +0000)]
Pick up a most worthwhile backport

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

8 years agoRevert modules/core/config.m4 from r1749922, 2.4.x branch back to r1749919
William A. Rowe Jr [Thu, 23 Jun 2016 15:33:33 +0000 (15:33 +0000)]
Revert modules/core/config.m4 from r1749922, 2.4.x branch back to r1749919

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

8 years agoRevert r1749920, meant to apply this to trunk/
William A. Rowe Jr [Thu, 23 Jun 2016 15:31:00 +0000 (15:31 +0000)]
Revert r1749920, meant to apply this to trunk/

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

8 years agoPromote any static to a shared module if the required dependency is dynamic
William A. Rowe Jr [Thu, 23 Jun 2016 15:28:28 +0000 (15:28 +0000)]
Promote any static to a shared module if the required dependency is dynamic

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

8 years agoxforms
Christophe Jaillet [Thu, 23 Jun 2016 06:07:40 +0000 (06:07 +0000)]
xforms

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

8 years agoFix typo (r1749828 in trunk)
Christophe Jaillet [Thu, 23 Jun 2016 06:06:04 +0000 (06:06 +0000)]
Fix typo (r1749828 in trunk)

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

8 years agoAck unindicted co-conspirator's contributions
William A. Rowe Jr [Wed, 22 Jun 2016 22:22:16 +0000 (22:22 +0000)]
Ack unindicted co-conspirator's contributions

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

8 years agoxforms
Jim Jagielski [Wed, 22 Jun 2016 21:55:01 +0000 (21:55 +0000)]
xforms

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

8 years agoxforms
Christophe Jaillet [Wed, 22 Jun 2016 21:01:02 +0000 (21:01 +0000)]
xforms

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

8 years agoSynch 2.4 and trunk doc (backport r1742073)
Christophe Jaillet [Wed, 22 Jun 2016 20:59:56 +0000 (20:59 +0000)]
Synch 2.4 and trunk doc (backport r1742073)

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