]>
granicus.if.org Git - apache/log
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
Gregg Lewis Smith [Wed, 12 Apr 2017 02:24:20 +0000 (02:24 +0000)]
revert portion of r1790999 concerning ab.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1791061 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 11 Apr 2017 16:36:25 +0000 (16:36 +0000)]
Retro win32 command-line build
allow building with OpenSSL 1.1.0
ab.c (abs)
----------
applink.c has been moved in this version of OpenSSL
dsw/dsp
-------
use srclib\apr\build\cvtdsp.pl -ossl11
from apr-1.6.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790999 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 11 Apr 2017 13:51:40 +0000 (13:51 +0000)]
Package Brotli-0.6.0.tag.gz is wrong, v0.6.0 of git is right.
Confusion to be addressed; https://github.com/google/brotli/issues/539
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790975 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 11 Apr 2017 13:42:29 +0000 (13:42 +0000)]
On the 2.4.x branch:
propose to backport mpm_winnt fix for ap_lingering_close
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790974 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 11 Apr 2017 13:41:05 +0000 (13:41 +0000)]
On the 2.4.x branch:
revert of r1790971, as done in wrong branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790972 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 11 Apr 2017 13:36:27 +0000 (13:36 +0000)]
On the trunk:
mpm_winnt: always invoking ap_lingering_close() at connection end.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790971 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 11 Apr 2017 13:12:35 +0000 (13:12 +0000)]
On the 2.4.x branch:
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790966 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 11 Apr 2017 04:25:34 +0000 (04:25 +0000)]
Veto veto of veto
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790917 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 11 Apr 2017 03:43:13 +0000 (03:43 +0000)]
Concerns are all addressed r.e. PROXY, nY, negative feedback retracted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790910 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Mon, 10 Apr 2017 23:23:06 +0000 (23:23 +0000)]
Update proposal to include fix by jailletc36 - update convenience patch, too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790900 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Apr 2017 17:06:35 +0000 (17:06 +0000)]
Update w/ latest doc changes for brotli
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790878 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Apr 2017 15:20:03 +0000 (15:20 +0000)]
almost a docco change... look for brotli 0.60 or above at config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790854 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 10 Apr 2017 15:04:55 +0000 (15:04 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1789740,
1790102 ,
1790113 ,
1790284 ,
1790754 ,
1790826 -
1790827 ,
1790842
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790847 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Apr 2017 11:50:26 +0000 (11:50 +0000)]
With v0.60 of https://github.com/google/brotli released,
this is now viable again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790806 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 8 Apr 2017 16:09:39 +0000 (16:09 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790697 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 8 Apr 2017 16:08:28 +0000 (16:08 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790695 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 6 Apr 2017 20:41:02 +0000 (20:41 +0000)]
Small comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790458 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 5 Apr 2017 01:16:26 +0000 (01:16 +0000)]
Update proposal with the latest trunk commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790170 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 4 Apr 2017 14:06:51 +0000 (14:06 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1790122 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 3 Apr 2017 11:39:53 +0000 (11:39 +0000)]
showstopper
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789972 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 3 Apr 2017 11:39:20 +0000 (11:39 +0000)]
Merge r1781575, r1781577, r1781580, r1781687, r1783305 from trunk:
Add Configuration for trusted OCSP responder certificates
Fix for PR 46037
Add back the file I removed in r1781575.
Add missing documentation for r1781575
Fix for PR 46037
Remove unused variable
Fix OpenSSL 1.1.0 breakage in r1781575; BIO_s_file_internal() is gone.
Submitted by: jfclere, druggeri, wrowe
Reviewed by: jfclere, jim, ylavic
Merge r1788430 from trunk:
mod_ssl: follow up to r1781575
Fix SSLOCSPNoVerify merging, and while at it capitalize Verify as suggested
by wrowe.
Submitted by: ylavic
Reviewed by: jfclere, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789970 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 3 Apr 2017 11:30:09 +0000 (11:30 +0000)]
Merge r1787525, r1787553, r1788451 from trunk:
Add IndexOptions UseOldDateFormat
*) mod_autoindex: Add IndexOptions UseOldDateFormat to allow the date
format from 2.2 in the Last Modified column. PR60846.
PR34014 / r903052 changed date format for autoindex
Submitted By: Hank Ibell <hwibell gmail.com>
update comments post-r1787525
no strncasecmp because flag has no value
Submitted by: covener
Reviewed by: covener, jim, druggeri
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789963 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 3 Apr 2017 11:29:02 +0000 (11:29 +0000)]
Merge r1779574, r1779623 from trunk:
mod_proxy_hcheck: Don't validate timed out responses.
mod_proxy_hcheck: follow up to r1779574.
Parse/validate response bodies.
Submitted by: ylavic
Reviewed by: ylavic, jim, druggeri
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789960 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 3 Apr 2017 11:27:35 +0000 (11:27 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789957 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Sun, 2 Apr 2017 21:08:10 +0000 (21:08 +0000)]
forgot to add the html file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789913 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Sat, 1 Apr 2017 17:32:19 +0000 (17:32 +0000)]
adding public Html doc file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789831 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Sat, 1 Apr 2017 17:31:42 +0000 (17:31 +0000)]
adding index file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789830 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Sat, 1 Apr 2017 17:31:15 +0000 (17:31 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789829 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Sat, 1 Apr 2017 17:29:47 +0000 (17:29 +0000)]
updating all the documents from trunk to 2.4 branch to be up to date version 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789828 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Sat, 1 Apr 2017 17:18:50 +0000 (17:18 +0000)]
added all the missing documentation from trunk, and added the style correctly
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789827 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Sat, 1 Apr 2017 17:14:00 +0000 (17:14 +0000)]
Updated to add the logo that rick has added
reviewed some other files too. only needed to change the ER number.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789826 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Apr 2017 16:25:53 +0000 (16:25 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789817 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Apr 2017 16:24:55 +0000 (16:24 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789816 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 1 Apr 2017 14:13:48 +0000 (14:13 +0000)]
Easy votes while I'm in the neighborhood
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789804 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 1 Apr 2017 14:11:16 +0000 (14:11 +0000)]
Update PROXY handling proposal and reset votes to NULL +druggeri
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789803 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 1 Apr 2017 01:22:41 +0000 (01:22 +0000)]
h2_worker.c/h removed in r1789739
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789766 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 31 Mar 2017 19:41:01 +0000 (19:41 +0000)]
On the 2.4.x branch:
Merged /httpd/httpd/trunk:r1786715,
1787051 ,
1787141 ,
1787604 ,
1788672 ,
1788981 ,
1789221 ,
1789224 ,
1789276 ,
1789279 ,
1789395 ,
1789520 ,
1789535 ,
1789692
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789739 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 29 Mar 2017 17:15:29 +0000 (17:15 +0000)]
Merge r1777556, r1777557, r1777593, r1777594, r1783056 from trunk:
Use apr_pstrmemdup instead of apr_pstrndup when applicable
Remove a useless break + tiny style fix (missing space)
'repl' is already allocated in the request pool by 'construct_host_header()' the line just before.
So this is safe to use the 'apr_table_setn' variant in order to save a few bytes of memory.
Fix some tiny style issues (missing space)
Save a few bytes in the request pool.
Submitted by: jailletc36
Reviewed by: jailletc36, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789393 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 29 Mar 2017 17:13:52 +0000 (17:13 +0000)]
Merge r1781328, r1785907 from trunk:
add no-proxy envvar for mod_proxy
replacement for ProxyPass /path ! when ProxyPass is in
location context.
compat inline for no-proxy
Submitted by: covener
Reviewed by: covener, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789392 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 29 Mar 2017 17:11:46 +0000 (17:11 +0000)]
oops... not enuff votes for this one
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789391 13f79535 -47bb-0310-9956-
ffa450edef68