]>
granicus.if.org Git - apache/log
Jim Jagielski [Tue, 30 May 2017 12:16:31 +0000 (12:16 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796847 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 30 May 2017 06:25:31 +0000 (06:25 +0000)]
Synch with trunk.
Backport r1575391 in order to describe =~ and !~
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796727 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 29 May 2017 10:41:22 +0000 (10:41 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796614 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 28 May 2017 21:15:41 +0000 (21:15 +0000)]
Merge r1796493 from trunk:
ab: enable option processing for setting a custom
HTTP method also for non-SSL builds.
Submitted by: rjung
Reviewed by: rjung, covener, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796539 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 28 May 2017 20:16:44 +0000 (20:16 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796532 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 28 May 2017 19:38:48 +0000 (19:38 +0000)]
copypasta error on r1796522, still needs a vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796524 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 28 May 2017 19:15:48 +0000 (19:15 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796522 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sun, 28 May 2017 15:27:39 +0000 (15:27 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796506 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 28 May 2017 15:00:47 +0000 (15:00 +0000)]
Fix dead link and synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796503 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 28 May 2017 14:42:39 +0000 (14:42 +0000)]
Quick vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796502 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 28 May 2017 14:21:46 +0000 (14:21 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796500 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 28 May 2017 14:15:32 +0000 (14:15 +0000)]
Improve proposal text.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796495 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 28 May 2017 14:13:44 +0000 (14:13 +0000)]
Propose trivial ab patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796494 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 28 May 2017 05:06:52 +0000 (05:06 +0000)]
Add a missing ':'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796474 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 21:13:55 +0000 (21:13 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796454 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 21:12:39 +0000 (21:12 +0000)]
revert r1796447, this should be RTC.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796453 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 20:21:00 +0000 (20:21 +0000)]
add CHANGES meant for r1788447
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796450 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 20:18:02 +0000 (20:18 +0000)]
bad conflict edit in r1796447
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796449 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 27 May 2017 20:16:14 +0000 (20:16 +0000)]
Merge r1796446 from trunk:
PR61124: ap_parse_form_data() EBCDIC fix
URL-decoding doesn't work on EBCDIC.
Submitted By: Hank Ibell <hwibell gmail.com>
(CTR for EBCDIC fix)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796447 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 May 2017 13:04:12 +0000 (13:04 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796393 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 May 2017 13:03:34 +0000 (13:03 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796392 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 May 2017 21:41:48 +0000 (21:41 +0000)]
propose test_char fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796351 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 May 2017 21:37:25 +0000 (21:37 +0000)]
propose ap_get_basic_auth_pw for 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796349 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 May 2017 21:14:00 +0000 (21:14 +0000)]
propose + 2 straightforward votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796344 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 26 May 2017 16:35:32 +0000 (16:35 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796300 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 26 May 2017 16:17:17 +0000 (16:17 +0000)]
fix confusing indentation of examples
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796297 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Thu, 25 May 2017 13:36:39 +0000 (13:36 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796152 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Thu, 25 May 2017 13:34:54 +0000 (13:34 +0000)]
Merge r1796135 from trunk:
Remove warning about nested If/ElseIf/Else evaluation
As noted by Christophe Jaillet in the dev@ ml nested
if/elseif/else conditions are now evaluated. The code
change has been already backported to 2.4.x.
Submitted by: elukey
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796151 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 25 May 2017 13:19:37 +0000 (13:19 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796150 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 25 May 2017 06:22:58 +0000 (06:22 +0000)]
Backport r1772559, r1774492, r1774493, r1774505 + reorder section/module in order to synch with trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796131 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 23 May 2017 12:53:35 +0000 (12:53 +0000)]
This was for some reason not folded in during the larger patchset,
which had been approved and committed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795908 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 23 May 2017 12:49:02 +0000 (12:49 +0000)]
Merge r1795830 from trunk:
ab: don't call malloc_init for OpenSSL 1.1.0
Patch by rjung.
The 1.1.0 compatibility macro for OpenSSL_malloc_init() causes problems
when mixed with procedure linkage stubs with some toolchains (e.g. GCC).
OpenSSL's malloc implementation doesn't recognize that the PLT stub
points back to it, which leads to infinite recursion.
Since the 1.1.0 documentation states that calling this function
explicitly is no longer necessary except "in certain shared-library
situations"(?), get rid of it.
Submitted by: jchampion
Reviewed by: jchampion, ylavic, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795907 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 23 May 2017 12:48:27 +0000 (12:48 +0000)]
Merge r1792589 from trunk:
Evaluate nested If/ElseIf/Else config sections
It has been reported multiple times that nested
If/ElseIf/Else sections are not evaluated but
silently ignored.
This patch adds a simple recursion to the ap_if_walk
logic in order to allow arbitrary nested configs.
The overhead seems negligible compared to the actual
version of the ap_if_walk, but more expert feedback
is surely needed since this code gets called for every
HTTP request.
Tests are going to be added to t/apache/if_sections.t
Submitted by: elukey
Reviewed by: elukey, jim, yalvic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795906 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 23 May 2017 05:06:47 +0000 (05:06 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795877 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 22 May 2017 22:00:23 +0000 (22:00 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795865 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 22 May 2017 21:02:24 +0000 (21:02 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795852 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 22 May 2017 20:54:41 +0000 (20:54 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795851 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 22 May 2017 20:50:09 +0000 (20:50 +0000)]
Proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795850 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Mon, 22 May 2017 16:47:38 +0000 (16:47 +0000)]
Propose ab/OpenSSL 1.1.0 fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795831 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 22 May 2017 14:36:20 +0000 (14:36 +0000)]
I added the showstopper, add comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795811 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 May 2017 14:33:11 +0000 (14:33 +0000)]
showstopper question
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795809 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 May 2017 14:32:27 +0000 (14:32 +0000)]
Votes!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795808 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 16 May 2017 19:33:45 +0000 (19:33 +0000)]
Remove 3DES by default for users of older crypto librarys; the cipher
has been reclassified in current OpenSSL releases as WEAK due to 112
or fewer bits of remaining cipher strength, while the Sweet32 disclosure
extended the criticism of RC4 on to 3DES. (IDEA, which potentially has the
same issue, is never enabled by default in OpenSSL, due to patent concerns.)
This commit does not change default httpd behavior, but alters the suggested
behavior of newly provisioned httpd servers. Where adopted, XP with IE8 will
no longer handshake with mod_ssl (previously, XP with IE6 would not handshake.)
The same net effect occurs where OpenSSL is updated to 1.1.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1795359 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 11 May 2017 17:09:35 +0000 (17:09 +0000)]
Merge r1791400 from trunk:
mod_substitute: use local/native LF for splitting
On platforms where the APR_ASCII_LF != '\n', like EBCDIC systems,
strmatch or pcre patterns from the source or config will be in
the native encoding, and this module will really only work on
content in the native encoding.
(mod_substitute runs before mod_charset_lite for a similar reason)
I thought #if APR_CHARSET_EBCDIC or even #ifdef __MVS__ was overkill
here.
(CTR due to ebcdic-only)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1794856 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 6 May 2017 17:17:20 +0000 (17:17 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1794164 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 6 May 2017 17:05:19 +0000 (17:05 +0000)]
property fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1794162 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 5 May 2017 15:09:37 +0000 (15:09 +0000)]
sync xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1794064 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 5 May 2017 13:23:48 +0000 (13:23 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1793533,
1794049
mod_http2: fail requests without ERROR log in case we need to read interim
responses and see only garbage. This can happen if proxied servers send
data where none should be, e.g. a body for a HEAD request.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1794052 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 5 May 2017 10:46:06 +0000 (10:46 +0000)]
Propose a backport for r1792589
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1794007 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 2 May 2017 15:29:13 +0000 (15:29 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1792212,
1793525
mod_proxy_http2: adding support for Reverse Proxy Request headers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793532 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 May 2017 11:01:17 +0000 (11:01 +0000)]
Merge r1788032, r1788033, r1783764, r1707512, r1783770 from trunk:
Save a few bytes in the conf pool.
'push_item' and 'add_alt' already duplicate their parameters, so we can safely use the temp_pool here.
Use 'ap_cstr_casecmp' to simplify code.
Remove useless case. We know that to can not be NULL at this point.
Follow up to r1772812: update APLOGNO().
* modules/ssl/ssl_engine_kernel.c: Constify the ssl_hook_Fixup_vars array itself.
winnt/service: each log message should use its own APLOGNO.
Submitted by: jailletc36, ylavic, jorton, ylavic
Reviewed by: jailletc36, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793466 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 May 2017 11:00:14 +0000 (11:00 +0000)]
Merge r1791975 from trunk:
PR61009: be as helpful as possible during -V operation
A configtest isn't useful if you're just trying to get compile settings.
Move the settings dump up to just after ap_read_config(), which has
already done the minimum necessary to figure out which MPM is in use.
Even if ap_read_config() failed, still print as many compile settings as
we can. The user will see the error log entry on stderr.
Submitted by: jchampion
Reviewed by: jchampion, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793465 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 May 2017 10:59:42 +0000 (10:59 +0000)]
Merge r1761824, r1771789, r1771827, r1779111 from trunk:
mod_brotli: Unbreak building other filter modules without libbrotlienc.
Don't add -lbrotlienc to the MOD_LDFLAGS unconditionally. And, when
adding it, use MOD_BROTLI_LDADD to avoid linking all filter modules
against this library.
mod_brotli: Rewrite the autoconf script in a, hopefully, less convoluted way.
Explicitly handle different cases when we do a pkg-config lookup
(<nothing>, --with-brotli or --with-brotli=yes) or examine the path
provided by the user (--with-brotli=PATH).
This lays the groundwork to simplify the switch to the official Brotli
library (https://github.com/google/brotli), instead of expecting the
install layout of a third-party wrapper (https://github.com/bagder/libbrotli).
mod_brotli: Update makefiles to use the library layout of the official
Brotli repository.
With the recent update (https://github.com/google/brotli/pull/464), the
official repository now produces pkg-config metadata files (brotli.pc),
and has a fixed library layout (libbrotlicommon/libbrotlienc/libbrotlidec)
on both Windows and Linux. Expect this layout in the makefiles, and take
advantage of the pkg-config metadata, if it's available.
mod_brotli: Update makefile to cope with the pkg-config layout change
in https://github.com/google/brotli/commit/
fe9f9a9
There's a typo in the upstream commit [1] (s/brotlicommon/libbrotlicommon)
that currently produces an unusable libbrotlienc.pc file, but hopefully
this is going to be fixed there.
[1] https://github.com/google/brotli/commit/
fe9f9a9 #diff-af3b638bc2a3e6c650974192a53c7291R409
Submitted by: kotkov
Reviewed by: kotkov, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793464 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 May 2017 10:53:55 +0000 (10:53 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793463 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 2 May 2017 10:53:04 +0000 (10:53 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793462 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 1 May 2017 21:30:30 +0000 (21:30 +0000)]
quick votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793416 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 1 May 2017 21:24:47 +0000 (21:24 +0000)]
propose mod_rewrite PR fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793410 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 1 May 2017 17:17:19 +0000 (17:17 +0000)]
Add an easy proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793380 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 1 May 2017 13:45:25 +0000 (13:45 +0000)]
Easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793334 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 1 May 2017 08:11:42 +0000 (08:11 +0000)]
Add missing 'LogIOTrackTTFB' doc.
This is just a cut'n'paste from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793289 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Apr 2017 14:05:57 +0000 (14:05 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793201 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Apr 2017 14:05:18 +0000 (14:05 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1793200 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 28 Apr 2017 04:44:50 +0000 (04:44 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792984 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 27 Apr 2017 15:17:57 +0000 (15:17 +0000)]
Per brotli-master include will move in 1.0.0
Prepare now, remove old location once 1.0.0 is released
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792912 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 27 Apr 2017 14:25:56 +0000 (14:25 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1784203,
1784205 ,
1784227 -
1784228 ,
1784275 ,
1785871 ,
1786009 ,
1789387
mod_proxy_hcheck: Honor checks in Vhosts w/o hanging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792905 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 27 Apr 2017 14:24:56 +0000 (14:24 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792904 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 27 Apr 2017 14:23:54 +0000 (14:23 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792903 13f79535 -47bb-0310-9956-
ffa450edef68
Evgeny Kotkov [Wed, 26 Apr 2017 20:24:54 +0000 (20:24 +0000)]
On the 2.4.x branch: Propose the mod_brotli Makefile fixes (r1761824,
r1771789, r1771827, r1779111) for backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792806 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 26 Apr 2017 14:47:49 +0000 (14:47 +0000)]
Add mod_brotli to Windows legacy build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792753 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 25 Apr 2017 22:55:04 +0000 (22:55 +0000)]
Rehabilitate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792676 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 25 Apr 2017 21:05:21 +0000 (21:05 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792659 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 25 Apr 2017 16:09:28 +0000 (16:09 +0000)]
APR has moved freetds connector to unsupported.
Remove from build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792628 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 23 Apr 2017 03:55:12 +0000 (03:55 +0000)]
Merge r1792336 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792337 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 21 Apr 2017 14:44:58 +0000 (14:44 +0000)]
Still can find only one problem case alluded to by André.
Where Accept-Lanuage is da Q=1 and ru Q=1, leaving these out of the priority
list results in English as the tie-breaker, which is incorrect.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792215 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 21 Apr 2017 14:08:31 +0000 (14:08 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1790973,
1790978
mpm_winnt: always invoke ap_lingering_close() at connection end as in
all other mpm modules, giving everyone a chance to cleanup at prep
lingering close hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792211 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 21 Apr 2017 14:06:50 +0000 (14:06 +0000)]
promoted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792210 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 21 Apr 2017 13:52:05 +0000 (13:52 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1791790,
1792195
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792209 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 21 Apr 2017 13:22:35 +0000 (13:22 +0000)]
LGTM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792201 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 21 Apr 2017 13:21:39 +0000 (13:21 +0000)]
additional info on patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792200 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 20 Apr 2017 21:17:55 +0000 (21:17 +0000)]
add custom build step in abs to place an copy of
ms/applink.c in proper location.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792152 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 20 Apr 2017 20:01:47 +0000 (20:01 +0000)]
fix makefile.win breakage
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792143 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Thu, 20 Apr 2017 18:06:42 +0000 (18:06 +0000)]
Note.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792103 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 20 Apr 2017 14:38:29 +0000 (14:38 +0000)]
quick placeholder
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792069 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Wed, 19 Apr 2017 22:22:41 +0000 (22:22 +0000)]
Note and propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1792000 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 19 Apr 2017 18:40:41 +0000 (18:40 +0000)]
lost accidently in r1790999
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791950 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Apr 2017 08:27:01 +0000 (08:27 +0000)]
Bump this up as a proposed backport again... mod_journald is
self-contained and does not require any mod_systemd integration
at all.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791876 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 19 Apr 2017 00:40:31 +0000 (00:40 +0000)]
apu-1.6-ify makefile.win. preserve building with apu<1.6
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791843 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 18 Apr 2017 16:25:39 +0000 (16:25 +0000)]
KISS: RemoveType is a simpler fix for .tr; explain .da files; order our
LanguagePriority by a first-order comparison and drop negligable translations
from our ordered priority preference list entirely.
A better comparison would be total number of documents in-sync, or some
convoluted weight ordering each document by which are more in sync than
others. Leaving that puzzle to an interested hacker.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791808 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 18 Apr 2017 13:59:55 +0000 (13:59 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791789 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 18 Apr 2017 13:59:17 +0000 (13:59 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791788 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 18 Apr 2017 13:49:37 +0000 (13:49 +0000)]
vote by steffen
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791786 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 18 Apr 2017 13:12:38 +0000 (13:12 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1790850,
1790855 ,
1791377 ,
1791388 ,
1791669 ,
1791773
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791781 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 13 Apr 2017 18:17:24 +0000 (18:17 +0000)]
revert r1791192, doesn't work
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791294 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Apr 2017 12:26:37 +0000 (12:26 +0000)]
Xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791237 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Apr 2017 12:24:34 +0000 (12:24 +0000)]
validate xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791236 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Apr 2017 12:21:21 +0000 (12:21 +0000)]
man-doc for mod_brotli
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791235 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Apr 2017 11:45:31 +0000 (11:45 +0000)]
Merge r1790852, r1790853, r1790860 from trunk:
Merge r1761714, r1762512, r1762515, r1771791, r1779077, r1779091, r1779699, r1790852, r1790853, r1790860 from trunk:
mod_brotli: Add initial implementation.
This new module supports dynamic Brotli (RFC 7932) compression. Existing
mod_deflate installations can benefit from better compression ratio by
sending Brotli-compressed data to the clients that support it:
SetOutputFilter BROTLI_COMPRESS;DEFLATE
The module features zero-copy processing, which is only possible with the
new API from the upcoming 1.0.x series of brotli [1]. The Linux makefile
works against libbrotli [2], as currently the core brotli repository doesn't
offer a way to build a library [3]. Apart from that, only the CMake build
is now supported.
[1] https://github.com/google/brotli
[2] https://github.com/bagder/libbrotli
[3] https://github.com/google/brotli/pull/332
mod_brotli: Allow compression ratio logging with new BrotliFilterNote
directive.
mod_brotli: Handle new 'no-brotli' internal environment variable that
disables Brotli compression for a particular request.
This mimicks how mod_deflate handles the 'no-gzip' env variable, and
should allow seamless migration for configurations that use it.
mod_brotli: Explicitly cast 'const uint8_t *' to 'const char *' when using
the data received from Brotli to create a bucket.
This fixes a /W4 warning in my environment, and should also allow building
mod_brotli on NetWare.
Submitted by: NormW <normw gknw.net>
unused variable error could mistakenly note that brotli isn't available.
1st draft
Be more consitent in the layout, and fix the display of a multi lines <highlight> section
mod_brotli: Update makefile to allow using Brotli library >= 0.6.0.
The 0.6.0 version has just been released [1], and it contains the
necessary API required for mod_brotli.
[1] https://github.com/google/brotli/releases/tag/v0.6.0
mod_brotli: Fix a minor typo in the description of BrotliAlterETag
that has been referring to httpd 2.2.x.
There's no mod_brotli in 2.2.x.
mod_brotli: Comment on the default choice (0) for BROTLI_PARAM_LGBLOCK.
Submitted by: kotkov, jim, jim, jailletc36, kotkov, kotkov, kotkov
Reviewed by: jim, jorton, icing
mod_brotli: Update makefile to allow using Brotli library >= 0.6.0.
The 0.6.0 version has just been released [1], and it contains the
necessary API required for mod_brotli.
[1] https://github.com/google/brotli/releases/tag/v0.6.0
mod_brotli: Fix a minor typo in the description of BrotliAlterETag
that has been referring to httpd 2.2.x.
There's no mod_brotli in 2.2.x.
mod_brotli: Comment on the default choice (0) for BROTLI_PARAM_LGBLOCK.
Submitted by: kotkov
Reviewed by: jim, jorton, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791231 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Apr 2017 11:37:11 +0000 (11:37 +0000)]
promote brotli
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791228 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 13 Apr 2017 10:44:59 +0000 (10:44 +0000)]
adding wrowe's mpm_winnt change to the backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791225 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 12 Apr 2017 22:31:15 +0000 (22:31 +0000)]
Add another include since applink.c has been moved in
the OpenSSL source. More info:
http://marc.info/?t=
149192864300001 &r=1&w=2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791192 13f79535 -47bb-0310-9956-
ffa450edef68