]> granicus.if.org Git - apache/log
apache
7 years agoFix typo
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

7 years agoPer brotli-master include will move in 1.0.0
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

7 years agoOn the 2.4.x branch:
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

7 years agopromote
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

7 years agovote
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

7 years agoOn the 2.4.x branch: Propose the mod_brotli Makefile fixes (r1761824,
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

7 years agoAdd mod_brotli to Windows legacy build
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

7 years agoRehabilitate.
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

7 years agoVote.
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

7 years agoAPR has moved freetds connector to unsupported.
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

7 years agoMerge r1792336 from trunk
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

7 years agoStill can find only one problem case alluded to by André.
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

7 years agoOn the 2.4.x branch:
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

7 years agopromoted
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

7 years agoOn the 2.4.x branch:
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

7 years agoLGTM
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

7 years agoadditional info on patch
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

7 years agoadd custom build step in abs to place an copy of
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

7 years agofix makefile.win breakage
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

7 years agoNote.
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

7 years agoquick placeholder
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

7 years agoNote and propose.
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

7 years agolost accidently in r1790999
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

7 years agoBump this up as a proposed backport again... mod_journald is
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

7 years agoapu-1.6-ify makefile.win. preserve building with apu<1.6
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

7 years agoKISS: RemoveType is a simpler fix for .tr; explain .da files; order our
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

7 years agoRebuild.
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

7 years agoXML update.
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

7 years agovote by steffen
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

7 years agoOn the 2.4.x branch:
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

7 years agorevert r1791192, doesn't work
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

7 years agoXforms
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

7 years agovalidate xml
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

7 years agoman-doc for mod_brotli
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

7 years agoMerge r1790852, r1790853, r1790860 from trunk:
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

7 years agopromote brotli
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

7 years agoadding wrowe's mpm_winnt change to the backport proposal
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

7 years agoAdd another include since applink.c has been moved in
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

7 years agorevert portion of r1790999 concerning ab.c
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

7 years agoRetro win32 command-line build
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

7 years agoPackage Brotli-0.6.0.tag.gz is wrong, v0.6.0 of git is right.
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

7 years agoOn the 2.4.x branch:
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

7 years agoOn the 2.4.x branch:
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

7 years agoOn the trunk:
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

7 years agoOn the 2.4.x branch:
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

7 years agoVeto veto of veto
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

7 years agoConcerns are all addressed r.e. PROXY, nY, negative feedback retracted
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

7 years agoUpdate proposal to include fix by jailletc36 - update convenience patch, too
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

7 years agoUpdate w/ latest doc changes for brotli
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

7 years agoalmost a docco change... look for brotli 0.60 or above at config
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

7 years agoOn the 2.4.x branch:
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

7 years agoWith v0.60 of https://github.com/google/brotli released,
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

7 years agoRebuild.
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

7 years agoXML updates.
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

7 years agoSmall comment
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

7 years agoUpdate proposal with the latest trunk commit
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

7 years agoVote
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

7 years agoshowstopper
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

7 years agoMerge r1781575, r1781577, r1781580, r1781687, r1783305 from trunk:
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

7 years agoMerge r1787525, r1787553, r1788451 from trunk:
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

7 years agoMerge r1779574, r1779623 from trunk:
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

7 years agopromote
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

7 years agoforgot to add the html file
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

7 years agoadding public Html doc file
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

7 years agoadding index file
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

7 years agogit-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789829 13f79...
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

7 years agoupdating all the documents from trunk to 2.4 branch to be up to date version 2.4
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

7 years agoadded all the missing documentation from trunk, and added the style correctly
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

7 years agoUpdated to add the logo that rick has added
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

7 years agoRebuild.
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

7 years agoXML updates.
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

7 years agoEasy votes while I'm in the neighborhood
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

7 years agoUpdate PROXY handling proposal and reset votes to NULL +druggeri
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

7 years agoh2_worker.c/h removed in r1789739
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

7 years agoOn the 2.4.x branch:
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

7 years agoMerge r1777556, r1777557, r1777593, r1777594, r1783056 from trunk:
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

7 years agoMerge r1781328, r1785907 from trunk:
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

7 years agooops... not enuff votes for this one
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

7 years agoprmote
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

7 years agovotes
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

7 years agosuggestion
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

7 years agoIn progress...
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

7 years agoupdate transformations.
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

7 years agoupdate for sync with English docs.
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

7 years agoSupport Apache badge: fix up hover and margin
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

7 years agodocs: update
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

7 years agoMerge r1776459, r1788508 from trunk:
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

7 years agoVote, move.
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

7 years agoPropose.
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

7 years agoRevert r1789213 and r1789214: wrong branch...
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

7 years agoFollow up to r1789213: more accurate CHANGES entry.
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

7 years agocore: Disallow multiple Listen on the same IP:port when listener buckets
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

7 years agoAdd logo, link to "Support Apache" page, as per
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

7 years agoWithdraw proposal for now, I can't reproduce the leak w/o the patch.
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

7 years agoPropose.
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

7 years agoPropose easy votes
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

7 years agoRebuild.
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

7 years agoXML updates.
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

7 years agoRebuild.
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

7 years agoRebuild.
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