]>
granicus.if.org Git - apache/log
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
Jim Jagielski [Wed, 29 Mar 2017 17:11:19 +0000 (17:11 +0000)]
prmote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789390 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 29 Mar 2017 17:10:56 +0000 (17:10 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789389 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 29 Mar 2017 17:10:24 +0000 (17:10 +0000)]
suggestion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789388 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 29 Mar 2017 12:10:11 +0000 (12:10 +0000)]
In progress...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789346 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 29 Mar 2017 02:28:37 +0000 (02:28 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789265 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 29 Mar 2017 02:26:36 +0000 (02:26 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789263 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 28 Mar 2017 21:54:20 +0000 (21:54 +0000)]
Support Apache badge: fix up hover and margin
Also add an alt-tag so validate-xhtml doesn't complain.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789248 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 28 Mar 2017 21:53:26 +0000 (21:53 +0000)]
docs: update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789247 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Mar 2017 21:30:09 +0000 (21:30 +0000)]
Merge r1776459, r1788508 from trunk:
PR59938: add %{REMOTE_PORT} to the expression parser
Submitted By: Hank Ibell <hwibell gmail.com>
compat note for REMOTE_PORT
Submitted by: covener
Reviewed by: covener, ylavic, jchampion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789244 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Mar 2017 21:24:21 +0000 (21:24 +0000)]
Vote, move.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789241 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Mar 2017 21:19:10 +0000 (21:19 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789238 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Mar 2017 20:58:42 +0000 (20:58 +0000)]
Revert r1789213 and r1789214: wrong branch...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789215 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Mar 2017 20:55:54 +0000 (20:55 +0000)]
Follow up to r1789213: more accurate CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789214 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Mar 2017 20:53:07 +0000 (20:53 +0000)]
core: Disallow multiple Listen on the same IP:port when listener buckets
are configured (ListenCoresBucketsRatio > 0), consistently with the single
bucket case (default), thus fixing the leak of the corresponding socket
descriptors on graceful restart.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789213 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 28 Mar 2017 13:28:17 +0000 (13:28 +0000)]
Add logo, link to "Support Apache" page, as per
request from Marketing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789132 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Mar 2017 09:00:14 +0000 (09:00 +0000)]
Withdraw proposal for now, I can't reproduce the leak w/o the patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789068 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Mar 2017 07:45:51 +0000 (07:45 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1789063 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 27 Mar 2017 06:20:51 +0000 (06:20 +0000)]
Propose easy votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788831 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 26 Mar 2017 13:18:31 +0000 (13:18 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788730 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 26 Mar 2017 13:16:38 +0000 (13:16 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788729 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 26 Mar 2017 12:36:35 +0000 (12:36 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788726 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 26 Mar 2017 12:35:06 +0000 (12:35 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788725 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 26 Mar 2017 12:33:31 +0000 (12:33 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788724 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 26 Mar 2017 11:52:41 +0000 (11:52 +0000)]
Fix typo spotted by angeloxx (r1788719 in trunk)
+ synch with trunk to improve syntax highlight
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788723 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 26 Mar 2017 11:51:47 +0000 (11:51 +0000)]
Fix typo spotted by angeloxx (r1788719 in trunk)
+ synch with trunk to improve syntax highlight
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788722 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 25 Mar 2017 17:39:45 +0000 (17:39 +0000)]
Update backport for PROXY protocol
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788675 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Fri, 24 Mar 2017 18:43:39 +0000 (18:43 +0000)]
Vote/note.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788528 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Fri, 24 Mar 2017 18:00:40 +0000 (18:00 +0000)]
Merge r1783842 from trunk:
mod_cache: Fix a regression in 2.4.25 for the forward proxy case by
computing and using the same entity key according to when the cache
checks, loads and saves the request. PR 60577.
Submitted by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788511 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Fri, 24 Mar 2017 17:58:16 +0000 (17:58 +0000)]
Merge r1779573 from trunk:
mod_proxy_hcheck: thread-safety.
Use the thread pool everywhere for the needs/lifetime of the request to
the backend.
Submitted by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788510 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 24 Mar 2017 17:34:15 +0000 (17:34 +0000)]
add compat revisions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788509 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 24 Mar 2017 17:30:04 +0000 (17:30 +0000)]
vote/promote some of the bigger backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788507 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 24 Mar 2017 14:10:46 +0000 (14:10 +0000)]
address comment re: strncasecmp, thanks Bill.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788452 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Mar 2017 13:44:50 +0000 (13:44 +0000)]
Merge r1780095 from trunk:
Fix %{DOCUMENT_URI} in SSI w/ default parser
*) core: %{DOCUMENT_URI} used in nested SSI expressions should point to the
URI originally requsted by the user, not the nested documents URI. This
restores the behavior of this variable to match the "legacy" SSI parser.
PR60624.
Submitted By [Hank Ibell <hwibell gmail.com>]
Submitted by: covener
Reviewed by: covener, wrowe, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788448 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Mar 2017 13:43:57 +0000 (13:43 +0000)]
Merge r1777354 from trunk:
old IBM EBCDIC fix that never got shared.
Submitted by: covener
Reviewed by: covener, wrowe, ylavic (by inspection)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788447 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Mar 2017 13:43:12 +0000 (13:43 +0000)]
Merge r1780328, r1780329, r1781329, r1782164, r1782166, r1782193, r1778350, r1781329, r1782194, r1782323, r1782418, r1782419, r1782482, r1782532, r1788040 from trunk:
Adjust as needed
debugging
add ProxyFCGISetEnvIf
Logging update
Follow up to r1782164: fix typo (closing double-quote).
Remove trailing whitespace : no functional change
PR60576: php-fpm broken w/ per-dir rewrites
Attempt to dig out of well-meaning fixes for generic fcgi backends
that negatively affected some FPM configs.
Adds ProxyFCGIBackendType
add ProxyFCGISetEnvIf
trailing whitespace
Allow final admin-level fine-tuning
mod_proxy_fcgi: fix spelling in APLOG_INFO message
mod_proxy_fcgi: allow setting empty variables in ProxyFCGISetEnvIf
support unsetting vars
ProxyFCGISetEnvIf: reject invalid invocations, streamline unsets
Neither of the following makes sense:
- ProxyFCGISetEnvIf cond !VARIABLE value
- ProxyFCGISetEnvIf cond !
Error out in these cases. Also, don't execute the (unused) replacement
expression when unsetting.
drop the longhand version
Submitted by: jim, covener, jim, ylavic, jim, covener, covener, jim, jim, jchampion, jchampion, covener, jchampion, covener
Reviewed by: jim, covener, jchampion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788445 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Mar 2017 13:35:40 +0000 (13:35 +0000)]
addressed and promoted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788444 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 24 Mar 2017 13:31:03 +0000 (13:31 +0000)]
Merge r1781187, r1781190, r1781312 from trunk:
mod_ssl: work around leaks on (graceful) restart.
Tested with valgrind and --with-ssl shared/static.
mod_ssl: follow up to r1781187.
The ssl_util_thread_*() functions are not necessary with openssl-1.1+
mod_ssl: follow up to r1781187.
Address SSL_CTX leak in (merged) proxy_ctx.
Reviewed by: ylavic, jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788442 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 24 Mar 2017 13:09:03 +0000 (13:09 +0000)]
Vote, promote, note.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788435 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Mar 2017 14:50:56 +0000 (14:50 +0000)]
I'm wrong. Reviewing SecurityPolicy (2.0.13 + 1.2.4) at
https://www.openssl.org/docs/fips/ - using FIPS_mode_set(1) for revalidation
was actually expressly called out in section 3. While mod_ssl is 'unloaded'
(unconfigured) the process is not operating in a fips validated manner, but
once the configuration resets FIPS_mode_set(1) it resumes validated behavior.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788258 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 23 Mar 2017 14:39:13 +0000 (14:39 +0000)]
Multiple comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788257 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 22 Mar 2017 06:57:28 +0000 (06:57 +0000)]
Fix some typo and add a few comments about missing compatibility information
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788060 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Mar 2017 00:01:22 +0000 (00:01 +0000)]
add rev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788041 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 21 Mar 2017 23:54:43 +0000 (23:54 +0000)]
propose a few small patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788039 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Tue, 21 Mar 2017 17:42:30 +0000 (17:42 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1788015 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 21 Mar 2017 11:49:58 +0000 (11:49 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787942 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 21 Mar 2017 11:49:03 +0000 (11:49 +0000)]
note this
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787941 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 21 Mar 2017 11:33:11 +0000 (11:33 +0000)]
Merge r1787053 from trunk:
donating lua server-status script, enjoy!
Submitted by: humbedooh
Reviewed by: humbedooh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787940 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 20 Mar 2017 12:16:52 +0000 (12:16 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787737 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 20 Mar 2017 12:15:38 +0000 (12:15 +0000)]
Merge r1787510 from trunk:
Add a warning in the docs about nested <If> blocks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787736 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 20 Mar 2017 12:01:16 +0000 (12:01 +0000)]
Merge ^/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat:
Support OpenSSL 1.1.0
Proposed by: rjung
Reviewed by: wrowe, jorton, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787728 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Mar 2017 15:06:03 +0000 (15:06 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787567 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Mar 2017 15:05:27 +0000 (15:05 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787566 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 18 Mar 2017 03:25:37 +0000 (03:25 +0000)]
vote for openssl 1.1.0 patch
nowhere to go but forward. Passes regression on 1.1.0 and on earlier openssl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787527 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 17 Mar 2017 08:37:00 +0000 (08:37 +0000)]
Formatting fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787303 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 17 Mar 2017 08:33:50 +0000 (08:33 +0000)]
Backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787302 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 17 Mar 2017 08:30:16 +0000 (08:30 +0000)]
Merge r1777923 from trunk:
avoid SO_REUSEPORT w/o ListenCoresBucketsRatio
Can lead to unintended/confusing sharing between
multiple servers started by the same ID.
Submitted by: covener
Reviewed by: jorton, covener, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1787301 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log