]>
granicus.if.org Git - apache/log
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Christophe Jaillet [Wed, 22 Jun 2016 20:55:47 +0000 (20:55 +0000)]
Add missing mod_proxy_http2.xml.meta file.
Generate mod_proxy_http2 HTML files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749784 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 22 Jun 2016 20:03:45 +0000 (20:03 +0000)]
Note change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749775 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 22 Jun 2016 20:00:39 +0000 (20:00 +0000)]
Merge r1749659, r1749678 from trunk:
Simplify, and correct the dependency handling of mod_proxy_hcheck
Cause missing mod_watchdog to 'unset' the --enable-proxy default, rather than
disable the module. This forces the module logic to emit a warning of the
missing dependency; changes the output from
checking whether to enable mod_proxy_hcheck... no
to
configure: WARNING: "mod_watchdog is disabled but required for mod_proxy_hcheck"
checking whether to enable mod_proxy_hcheck... no (disabled)
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749774 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 22 Jun 2016 19:57:52 +0000 (19:57 +0000)]
Merge r1749658 from trunk:
Support multiple module dependencies for the final prereq argument to the
APACHE_MODULE macro, as a comma separated list, e.g.
APACHE_MODULE(proxy_http2, [...], [proxy,http2])
will evaluate the availability of mod_proxy, followed by mod_http2
Submitted by: wrowe
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749773 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Jun 2016 19:35:17 +0000 (19:35 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749764 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 22 Jun 2016 19:28:22 +0000 (19:28 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749759 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 22 Jun 2016 17:16:13 +0000 (17:16 +0000)]
note combined patch from email
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749746 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 22 Jun 2016 14:31:19 +0000 (14:31 +0000)]
vote...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749713 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 22 Jun 2016 13:30:24 +0000 (13:30 +0000)]
Merge of r1749695 from trunk:
mod_http2: fixing APLOG_NO overdose and some log levels
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749698 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Jun 2016 13:18:13 +0000 (13:18 +0000)]
Merge r1749693 from trunk:
assign IDs to new AH*'s
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749694 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Jun 2016 13:16:40 +0000 (13:16 +0000)]
Merge r1749688 from trunk:
spatch some AH* IDs to pick up the new INFO level messages,
also hit old DEBUG messages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749692 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 22 Jun 2016 13:11:03 +0000 (13:11 +0000)]
Merge of r1749505, r1749676 from trunk:
mod_proxy_http2: fixed retry behaviour when proxy engine needs to retry its base request on a new connection
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749684 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 22 Jun 2016 13:02:10 +0000 (13:02 +0000)]
Refresh proposal with more specific diagnostics for the user of ./configure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749679 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 22 Jun 2016 12:33:57 +0000 (12:33 +0000)]
Propose for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749660 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 22 Jun 2016 10:43:51 +0000 (10:43 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749651 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 22 Jun 2016 10:43:34 +0000 (10:43 +0000)]
Add mod-proxy DNS caching information to the documentation (follow up from users@)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749650 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 21 Jun 2016 12:29:00 +0000 (12:29 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749502 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 21 Jun 2016 12:28:32 +0000 (12:28 +0000)]
Merge of r1748888 from trunk:
If enable_proxy_hcheck is unset handle it like other proxy modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749501 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 21 Jun 2016 12:25:47 +0000 (12:25 +0000)]
vote and accept
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749499 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 21 Jun 2016 12:05:07 +0000 (12:05 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749497 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 21 Jun 2016 11:51:48 +0000 (11:51 +0000)]
configure patch for hcheck
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749495 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Jun 2016 13:15:17 +0000 (13:15 +0000)]
and we are 2.4.23-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749336 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Jun 2016 13:12:33 +0000 (13:12 +0000)]
Prep for tagging 2.4.22
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749334 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Jun 2016 13:11:20 +0000 (13:11 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749332 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Jun 2016 13:10:06 +0000 (13:10 +0000)]
Backport
Merge r1749151 from trunk:
mod_http2: fix for request abort when connections drops, introduced in 1.5.8
Submitted by: icing
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749331 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Jun 2016 12:23:54 +0000 (12:23 +0000)]
Backport and note non-release
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749320 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Jun 2016 14:04:19 +0000 (14:04 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749040 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Jun 2016 14:03:17 +0000 (14:03 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1749038 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 18 Jun 2016 10:23:16 +0000 (10:23 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748952 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 18 Jun 2016 10:23:01 +0000 (10:23 +0000)]
Added some information to ListenCoresBucketsRatio documentation page already in trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748951 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 16:56:47 +0000 (16:56 +0000)]
And we are 2.4.22-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748762 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 16:55:17 +0000 (16:55 +0000)]
Get ready to tag 2.4.21
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748760 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 16:24:20 +0000 (16:24 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748758 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 12:35:58 +0000 (12:35 +0000)]
Merge r1748653 from trunk:
Fix a potential buffer overflow.
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748706 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 12:35:30 +0000 (12:35 +0000)]
prmote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748705 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 16 Jun 2016 12:35:13 +0000 (12:35 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748704 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 16 Jun 2016 09:07:37 +0000 (09:07 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748672 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 16 Jun 2016 06:18:55 +0000 (06:18 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748654 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 16 Jun 2016 01:17:29 +0000 (01:17 +0000)]
duplicate entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748647 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 15 Jun 2016 15:36:11 +0000 (15:36 +0000)]
Voting for r1748379 backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748598 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 15 Jun 2016 14:13:06 +0000 (14:13 +0000)]
Propose backport of r1748379 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748585 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 15 Jun 2016 10:06:21 +0000 (10:06 +0000)]
Merge of r1748531 from trunk:
mod_http2: more rigid error handling in DATA frame assembly
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748536 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 15 Jun 2016 08:23:49 +0000 (08:23 +0000)]
Add comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748518 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 15 Jun 2016 08:21:48 +0000 (08:21 +0000)]
It should.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748517 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 15 Jun 2016 06:22:32 +0000 (06:22 +0000)]
Question
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748500 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 14 Jun 2016 21:34:35 +0000 (21:34 +0000)]
Correct imbalanced #endif I introduced in r1748449
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748469 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 14 Jun 2016 18:44:54 +0000 (18:44 +0000)]
* Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748450 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 14 Jun 2016 18:41:55 +0000 (18:41 +0000)]
abs: Include OPENSSL_Applink when compiling on Windows, to resolve
failures under Visual Studio 2015 and other mismatched MSVCRT flavors.
PR: 59630
Submitted by: Jan Ehrhardt <phpdev ehrhardt.nl>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748449 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 14 Jun 2016 16:34:14 +0000 (16:34 +0000)]
mod_ssl: Don't enable CRL checks/flags by default.
(follow up/fix to r1748338 committed in 2.4.21)
Submitted by: ylavic
Reviewed by: icing, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748442 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 14 Jun 2016 16:32:41 +0000 (16:32 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748438 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 14 Jun 2016 16:28:33 +0000 (16:28 +0000)]
Propose (when apr-util v1.6 is released).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748437 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 14 Jun 2016 15:25:55 +0000 (15:25 +0000)]
change mod_proxy_http2.dep to use h2_proxy_util.c indtead of h2_util.c
follow-up to r1748429
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748430 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 14 Jun 2016 15:15:52 +0000 (15:15 +0000)]
add mod_proxy_http2 to traditional windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748429 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 14 Jun 2016 10:09:30 +0000 (10:09 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748377 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 14 Jun 2016 09:42:15 +0000 (09:42 +0000)]
Propose fix for 2.4.21 (before release).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748371 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 14 Jun 2016 08:51:31 +0000 (08:51 +0000)]
Merge of r1747550 from trunk:
mod_proxy_http2 no longer shares objects with mod_http2
h2_casecmpstr eliminated, uses backported ap_cstr_casecmp*
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748359 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 14 Jun 2016 00:00:55 +0000 (00:00 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748340 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:48:39 +0000 (23:48 +0000)]
mod_ssl: Add "no_crl_for_cert_ok" flag to SSLCARevocationCheck directive
to opt-in previous behaviour (2.2) with CRLs verification when checking
certificate(s) with no corresponding CRL.
Submitted by: ylavic
Reviewed by: icing, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748338 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:47:34 +0000 (23:47 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748337 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:40:00 +0000 (23:40 +0000)]
mpm_event, mpm_worker: Fix computation of MinSpareThreads' lower bound
according the number of listeners buckets.
Submitted by: ylavic
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748336 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:38:00 +0000 (23:38 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748335 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:31:21 +0000 (23:31 +0000)]
Add ap_cstr_casecmp[n]() - placeholder of apr_cstr_casecmp[n] functions
for case-insensitive C/POSIX-locale token comparison.
Submitted by: wrowe
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748334 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 13 Jun 2016 23:29:11 +0000 (23:29 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1748333 13f79535 -47bb-0310-9956-
ffa450edef68