]> granicus.if.org Git - apache/log
apache
6 years agoMerge r1835094 from trunk (follow up to 2.4.x's r1834321):
Yann Ylavic [Thu, 5 Jul 2018 19:26:56 +0000 (19:26 +0000)]
Merge r1835094 from trunk (follow up to 2.4.x's r1834321):

global ap_server_conf must be reset when process->pconf is cleared

Submitted by: covener
Reviewed by: covener, rpluem, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835175 13f79535-47bb-0310-9956-ffa450edef68

6 years agoBackported in r1835173.
Yann Ylavic [Thu, 5 Jul 2018 19:24:39 +0000 (19:24 +0000)]
Backported in r1835173.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835174 13f79535-47bb-0310-9956-ffa450edef68

6 years agomod_ssl: follow up to 2.4.x's r1666363.
Yann Ylavic [Thu, 5 Jul 2018 19:24:07 +0000 (19:24 +0000)]
mod_ssl: follow up to 2.4.x's r1666363.

Add missing bits from previous backport of r1666363.

Reviewed by: jailletc36, ylavic, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835173 13f79535-47bb-0310-9956-ffa450edef68

6 years agoBackported in r1835171.
Yann Ylavic [Thu, 5 Jul 2018 19:20:52 +0000 (19:20 +0000)]
Backported in r1835171.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835172 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1832280 from trunk:
Yann Ylavic [Thu, 5 Jul 2018 19:20:20 +0000 (19:20 +0000)]
Merge r1832280 from trunk:

In 'ap_proxy_cookie_reverse_map', iterate over each token of the 'Set-Cookie' header field in order to avoid updating the wrong one.

This could happen if the header field has something like 'fakepath=foo;path=bar". In this case fakepath would be updated instead of path.

We don't need regex anymore in order to parse the field values and 'ap_proxy_strmatch_domain' and 'ap_proxy_strmatch_path' are now useless. (and should be axed IMHO)

PR 61560

Submitted by: jailletc36
Reviewed by: jailletc36, rpluem, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835171 13f79535-47bb-0310-9956-ffa450edef68

6 years agoBackported in r1835168.
Yann Ylavic [Thu, 5 Jul 2018 19:17:39 +0000 (19:17 +0000)]
Backported in r1835168.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835170 13f79535-47bb-0310-9956-ffa450edef68

6 years agoCHANGES: trim trailing spaces.
Yann Ylavic [Thu, 5 Jul 2018 19:16:37 +0000 (19:16 +0000)]
CHANGES: trim trailing spaces.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835169 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1833875 from trunk:
Yann Ylavic [Thu, 5 Jul 2018 19:15:40 +0000 (19:15 +0000)]
Merge r1833875 from trunk:

mod_ratelimit: fix behavior with proxied content

mod_ratelimit works by splitting data in "chunks"
to send to the client, sleeping a predefined amount
of time between them (200ms). So for example,
a rate-limit 40 value would correspond to a chunk size
of 8192 bytes, flushed to the client every 200ms.

The idea works fine when httpd directly serves the
content, since the filter will be called once with
a single bucket brigade. In the context of a proxied
content though the filter is likely to be called multiple
times, with a bucket brigade size that corresponds to
the maximum allowed buffer size. If this value is lower
or higher than the chunk size, the filter will not
properly rate limit the data going to the client.

This patch solves the problem with two fix:
1) do_sleep is now stored in the ctx context struct,
   so if the filter is invoked multiple times it
   will still sleep when needed. For example, say
   that the chunk_size is 8192 and the bucket brigate
   len is 10240: the filter will flush 8192 bytes
   on the first invocation, sleep 200ms, flush the
   remaining bytes and then finish. The next invocation
   will do the same, clearly not leading to the
   correct "sleeping pattern".
2) The example above highlights also another issue:
   mod_ratelimit should  flush only chunk_size bytes
   at the time (I am now excluding the burst calculation
   from the picture), and buffer between invocations
   unless the brigade contains EOS.

The change has been tested with various scenarios and
it looks working as expected, but of course more
feedback/testing is welcome.

The original patch was written by me and then Yann
refactored the code to be more precise and efficient,
basically transforming an axe in a wonderful Japanese
katana sword, so credits to him for this work.

PR: 62362

Submitted by: elukey
Reviewed by: elukey, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835168 13f79535-47bb-0310-9956-ffa450edef68

6 years agoXML updates.
Lucien Gentis [Thu, 5 Jul 2018 15:26:06 +0000 (15:26 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835146 13f79535-47bb-0310-9956-ffa450edef68

6 years agoVote, promote.
Yann Ylavic [Thu, 5 Jul 2018 07:56:06 +0000 (07:56 +0000)]
Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835102 13f79535-47bb-0310-9956-ffa450edef68

6 years ago* Vote
Ruediger Pluem [Thu, 5 Jul 2018 06:34:52 +0000 (06:34 +0000)]
* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835099 13f79535-47bb-0310-9956-ffa450edef68

6 years agovi for dummies
Eric Covener [Thu, 5 Jul 2018 02:37:59 +0000 (02:37 +0000)]
vi for dummies

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835096 13f79535-47bb-0310-9956-ffa450edef68

6 years agounset ap_server_conf
Eric Covener [Thu, 5 Jul 2018 02:36:01 +0000 (02:36 +0000)]
unset ap_server_conf

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835095 13f79535-47bb-0310-9956-ffa450edef68

6 years agoRebuild.
Lucien Gentis [Tue, 3 Jul 2018 09:23:35 +0000 (09:23 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834939 13f79535-47bb-0310-9956-ffa450edef68

6 years agoXML update.
Lucien Gentis [Tue, 3 Jul 2018 09:22:45 +0000 (09:22 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834938 13f79535-47bb-0310-9956-ffa450edef68

6 years ago* Comment
Ruediger Pluem [Tue, 3 Jul 2018 06:58:55 +0000 (06:58 +0000)]
* Comment

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834924 13f79535-47bb-0310-9956-ffa450edef68

6 years ago* Vote and promote
Ruediger Pluem [Tue, 3 Jul 2018 06:53:39 +0000 (06:53 +0000)]
* Vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834923 13f79535-47bb-0310-9956-ffa450edef68

6 years agoVote.
Yann Ylavic [Mon, 2 Jul 2018 21:05:50 +0000 (21:05 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834899 13f79535-47bb-0310-9956-ffa450edef68

6 years agoAdd another vote
Daniel Ruggeri [Mon, 2 Jul 2018 20:51:11 +0000 (20:51 +0000)]
Add another vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834898 13f79535-47bb-0310-9956-ffa450edef68

6 years agobackported
Eric Covener [Mon, 2 Jul 2018 20:49:02 +0000 (20:49 +0000)]
backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834896 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1834318 from trunk:
Eric Covener [Mon, 2 Jul 2018 20:47:00 +0000 (20:47 +0000)]
Merge r1834318 from trunk:

Re-allow '_' (underscore) in hostnames.

'_' was not permitted in hostnames since 2.4.25's "HTTP Strict"
changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834895 13f79535-47bb-0310-9956-ffa450edef68

6 years agoVote, promote.
Yann Ylavic [Mon, 2 Jul 2018 20:38:01 +0000 (20:38 +0000)]
Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834891 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1831868, r1831869, r1831870, r1831871, r1831872, r1831935, r1831938, r1832479...
Daniel Ruggeri [Mon, 2 Jul 2018 20:26:52 +0000 (20:26 +0000)]
Merge r1831868, r1831869, r1831870, r1831871, r1831872, r1831935, r1831938, r1832479 from trunk:

Restore mod_slotmem_shm from 2.4.29.

Will restart from there to really fix PR 62308 (and PR 62044 still).

This effectively reverts:
- r1831394,
- r1830800,
- r1826970,
- r1826845,
- r1823572,
- r1823416,
- r1823415,
- r1823412,
- r1822511,
- r1822509.
(in 2.4.x, this is part of r1824180)

mod_slotmem_shm: use a generation number for SHM filename on all platforms.

Successive generations can't share the same SHMs because restarts may modify
them under the terminating children, while SHMs are not extensible when all
slots are in use.

This effectively restores r1822341 which was reverted by r1822505.

mod_slotmem_shm: follow up to r1831869.

Don't try to attach SHMs on startup, they might be from a previous crash and
prevent the server to start (on failure to reuse it).

On mpm_winnt though, the pre/post_config() phases are re-run in child process,
and the parent process already created the SMs, so they must be attached there.

mod_slotmem_shm: follow up to r1831869 (check persistent files).

Since persistent files are also reused on stop/start, we must ensure that
they match the same descriptor when reused on the next startup, so add it
to integrity metadata.

Also, the descriptor being the first field in the SHM, we don't need to
copy on the stack it in several places, and can handle it as a pointer.

Follow up to r1831869: update CHANGES entry.

mod_slotmem_shm: follow up to r1831869: fix persisted file size's checksum.

mod_proxy_balancer: clear slotmem slots' inuse flags from persisted files.

Otherwise, when BalancerPersist is enabled, we might fail (re)starting with a
saved slotmem if a BalancerMember was renamed (e.g. PR 62308's port change).
This is because the renamed member is considered a new one, while the old name
still reserves a slot, so we end up missing one room. The overall number of
members does not change so the sizes check succeeds thus the persisted slotmem
is not invalidated. Yet the slomem is not really compatible.

By clearing inuse flags, we still allow for slots to be reused if their index
did not change (thanks to ap_proxy_find_balancershm() and slotmem_fgrab() at
the given index), but will also invalidate renamed slots which don't match the
index. We now have the correct behaviour by slot and the server (re)starts in
any case.

mod_slotmem_shm: follow up to r1831869: fix dead else if condition.

Submitted by: jim, ylavic
Reviewed by: ylavic, jim, druggeri

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834887 13f79535-47bb-0310-9956-ffa450edef68

6 years agoVote and move to accepted
Daniel Ruggeri [Mon, 2 Jul 2018 20:25:18 +0000 (20:25 +0000)]
Vote and move to accepted

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834886 13f79535-47bb-0310-9956-ffa450edef68

6 years agoPropose
Christophe Jaillet [Mon, 2 Jul 2018 20:11:03 +0000 (20:11 +0000)]
Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834880 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1795834, r1828912, r1830943, r1830944, r1832991 from trunk:
Jim Jagielski [Mon, 2 Jul 2018 12:49:16 +0000 (12:49 +0000)]
Merge r1795834, r1828912, r1830943, r1830944, r1832991 from trunk:

Remove empty line.

* modules/ssl/ssl_util.c (ssl_util_vhostid): Simplify code,
  no functional change.

Save a few cycles and simlify code.

Use apr_pstrmemdup instead of apr_pstrndup when possible.
Avoid scanning the first 2 bytes when looking for the | delimiter. it is known to be "${".
Avoid comma separated statements, it is not that usual.

Save a few cycles.

Use apr_pstrmemdup instead of apr_pstrndup when possible.

* modules/proxy/mod_proxy_hcheck.c (sctx_t, hc_create_config):
  Remove unused bucket allocator created off pconf.
  Tag the subpool.

Submitted by: jailletc36, jorton, jailletc36, jailletc36, jorton
Reviewed by: jailletc36, covener, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834844 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1834209 from trunk:
Jim Jagielski [Mon, 2 Jul 2018 12:48:17 +0000 (12:48 +0000)]
Merge r1834209 from trunk:

If several parameters are used in a AuthzProviderAlias directive, if these
parameters are not enclosed in quotation mark, only the first one is handled.
The other ones are silently ignored.

Add a message to warn about such a spurious configuration.
PR 62469

Inspired by: Hank Ibell <hwibell gmail.com>
Submitted by: jailletc36
Reviewed by: jailletc36, covener, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834843 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1817175, r1831800 from trunk:
Jim Jagielski [Mon, 2 Jul 2018 12:31:00 +0000 (12:31 +0000)]
Merge r1817175, r1831800 from trunk:

Russian translations of errordocs.
Contributed by Alexander Gaganashvili.

Error page translations submitted for zh-cn and zh-tw, contributed
by CodeingBoy <codeingboy gmail.com>.

Note that zh-tw is not a native translation; each translation aught
be reviewed by a native reader before backporting to 2.4.x branch.

Submitted by: niq, wrowe
Reviewed by: jailletc36, covener, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834840 13f79535-47bb-0310-9956-ffa450edef68

6 years agopromote 3 backports
Jim Jagielski [Mon, 2 Jul 2018 12:29:56 +0000 (12:29 +0000)]
promote 3 backports

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834839 13f79535-47bb-0310-9956-ffa450edef68

6 years agovotes
Jim Jagielski [Mon, 2 Jul 2018 12:29:31 +0000 (12:29 +0000)]
votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834838 13f79535-47bb-0310-9956-ffa450edef68

6 years agoFix mix-up of previous commit (r1834775)
Christophe Jaillet [Sun, 1 Jul 2018 08:35:05 +0000 (08:35 +0000)]
Fix mix-up of previous commit (r1834775)
r1828478 was already partially backported.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834777 13f79535-47bb-0310-9956-ffa450edef68

6 years agoAdd some compatibility note + some small syntax highlight sugar.
Christophe Jaillet [Sun, 1 Jul 2018 08:23:23 +0000 (08:23 +0000)]
Add some compatibility note + some small syntax highlight sugar.
(1828478 in trunk)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834775 13f79535-47bb-0310-9956-ffa450edef68

6 years agodocumentation rebuild
Luca Toscano [Sun, 1 Jul 2018 07:36:34 +0000 (07:36 +0000)]
documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834771 13f79535-47bb-0310-9956-ffa450edef68

6 years agooutput-filters.xml: backport r1834466
Luca Toscano [Sun, 1 Jul 2018 07:22:33 +0000 (07:22 +0000)]
output-filters.xml: backport r1834466

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834770 13f79535-47bb-0310-9956-ffa450edef68

6 years agoPropose
Christophe Jaillet [Sat, 30 Jun 2018 05:44:19 +0000 (05:44 +0000)]
Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834721 13f79535-47bb-0310-9956-ffa450edef68

6 years agodocumentation rebuild
Luca Toscano [Fri, 29 Jun 2018 13:42:51 +0000 (13:42 +0000)]
documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834682 13f79535-47bb-0310-9956-ffa450edef68

6 years agoOn the 2.4.x branch:
Stefan Eissing [Fri, 29 Jun 2018 11:53:50 +0000 (11:53 +0000)]
On the 2.4.x branch:

backport of current mod_md version and documentation.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834671 13f79535-47bb-0310-9956-ffa450edef68

6 years agoVote.
Yann Ylavic [Thu, 28 Jun 2018 20:43:50 +0000 (20:43 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834641 13f79535-47bb-0310-9956-ffa450edef68

6 years agopropose
Christophe Jaillet [Wed, 27 Jun 2018 21:00:38 +0000 (21:00 +0000)]
propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834544 13f79535-47bb-0310-9956-ffa450edef68

6 years agodocumentation rebuild
Luca Toscano [Wed, 27 Jun 2018 17:55:34 +0000 (17:55 +0000)]
documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834525 13f79535-47bb-0310-9956-ffa450edef68

6 years agomod_proxy.xml: add vhost/server contextes for ProxySet
Luca Toscano [Wed, 27 Jun 2018 17:50:40 +0000 (17:50 +0000)]
mod_proxy.xml: add vhost/server contextes for ProxySet

While reading PR 62422 I noticed that ProxySet's available
contextes list only 'directory', that looks odd:

AP_INIT_RAW_ARGS("ProxySet", set_proxy_param, NULL, RSRC_CONF|ACCESS_CONF

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834524 13f79535-47bb-0310-9956-ffa450edef68

6 years agoDone.
Joe Orton [Tue, 26 Jun 2018 12:22:08 +0000 (12:22 +0000)]
Done.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834423 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1834012, r1834013 from trunk:
Joe Orton [Tue, 26 Jun 2018 12:21:47 +0000 (12:21 +0000)]
Merge r1834012, r1834013 from trunk:

Add default schema ports for websockets

Nore userland/PR change

PR: 62480
Submitted by: Lubos Uhliarik <luhliari redhat.com>
Reviewed by: jim, rpluem, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834422 13f79535-47bb-0310-9956-ffa450edef68

6 years agopropose
Luca Toscano [Tue, 26 Jun 2018 07:28:34 +0000 (07:28 +0000)]
propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834398 13f79535-47bb-0310-9956-ffa450edef68

6 years agovote
Eric Covener [Mon, 25 Jun 2018 14:02:08 +0000 (14:02 +0000)]
vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834330 13f79535-47bb-0310-9956-ffa450edef68

6 years agoCHANGES for 1834321
Eric Covener [Mon, 25 Jun 2018 13:26:20 +0000 (13:26 +0000)]
CHANGES for 1834321

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834323 13f79535-47bb-0310-9956-ffa450edef68

6 years agobackported
Eric Covener [Mon, 25 Jun 2018 13:24:37 +0000 (13:24 +0000)]
backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834322 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1833827 from trunk:
Eric Covener [Mon, 25 Jun 2018 13:24:16 +0000 (13:24 +0000)]
Merge r1833827 from trunk:

add server_rec to log.c fatal startup errors

Not strictly necessary for trunk, but in 2.4.x if the main ErrorLog is
using syslog, these messages are lost.  In trunk, the low-level logging
routines reach up and find the syslog provider when no server_rec is provided
but that backport is stalled.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834321 13f79535-47bb-0310-9956-ffa450edef68

6 years agopropose _ fix
Eric Covener [Mon, 25 Jun 2018 13:22:53 +0000 (13:22 +0000)]
propose _ fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834320 13f79535-47bb-0310-9956-ffa450edef68

6 years agopropose
Luca Toscano [Mon, 25 Jun 2018 10:00:49 +0000 (10:00 +0000)]
propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834292 13f79535-47bb-0310-9956-ffa450edef68

6 years agopropose
Christophe Jaillet [Sun, 24 Jun 2018 20:45:15 +0000 (20:45 +0000)]
propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834269 13f79535-47bb-0310-9956-ffa450edef68

6 years agoxforms
Christophe Jaillet [Sun, 24 Jun 2018 19:42:08 +0000 (19:42 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834266 13f79535-47bb-0310-9956-ffa450edef68

6 years agoSynch with trunk
Christophe Jaillet [Sun, 24 Jun 2018 19:40:43 +0000 (19:40 +0000)]
Synch with trunk

(backport r1765974, r1830428, r1830439, r1834258, r1834259, r1834263)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834265 13f79535-47bb-0310-9956-ffa450edef68

6 years agoSynch (a bit) with trunk
Christophe Jaillet [Sun, 24 Jun 2018 18:41:19 +0000 (18:41 +0000)]
Synch (a bit) with trunk

Backport r1643118 + some manual tweaks regarding left-over in previous backports

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834256 13f79535-47bb-0310-9956-ffa450edef68

6 years agoPropose
Christophe Jaillet [Sun, 24 Jun 2018 17:06:27 +0000 (17:06 +0000)]
Propose

I've only google translated some of the proposals, in each language, and they look great.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834255 13f79535-47bb-0310-9956-ffa450edef68

6 years agoSynch with trunk.
Christophe Jaillet [Sun, 24 Jun 2018 15:41:59 +0000 (15:41 +0000)]
Synch with trunk.

Switch #loadModule of mod_macro and mod_md to keep alphabetical order.
(Win32 specific file, so no need for RTC)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834251 13f79535-47bb-0310-9956-ffa450edef68

6 years agodocumentation rebuild
Luca Toscano [Sun, 24 Jun 2018 10:33:06 +0000 (10:33 +0000)]
documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834245 13f79535-47bb-0310-9956-ffa450edef68

6 years agomod_proxy.xml: follow up r1834203
Luca Toscano [Sun, 24 Jun 2018 10:32:15 +0000 (10:32 +0000)]
mod_proxy.xml: follow up r1834203

Add more precise info and warn notes about
variable interpolation.

PR: 62477

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834244 13f79535-47bb-0310-9956-ffa450edef68

6 years agomod_cache: Handle case of an invalid Expires
Rainer Jung [Sun, 24 Jun 2018 10:18:38 +0000 (10:18 +0000)]
mod_cache: Handle case of an invalid Expires
header value RFC compliant like the case of an
Expires time in the past: allow to overwrite the
non-caching decision using CacheStoreExpired and
respect Cache-Control "max-age" and "s-maxage".

Backport of r1833876 from trunk.

Submitted by: rjung
Reviewed by: rjung, ylavic, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834241 13f79535-47bb-0310-9956-ffa450edef68

6 years agodocumentation rebuild
Luca Toscano [Sun, 24 Jun 2018 07:27:31 +0000 (07:27 +0000)]
documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834235 13f79535-47bb-0310-9956-ffa450edef68

6 years agomod_proxy.xml: clarify the usage of variable interpolation
Luca Toscano [Sun, 24 Jun 2018 07:26:03 +0000 (07:26 +0000)]
mod_proxy.xml: clarify the usage of variable interpolation

PR: 62477

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834234 13f79535-47bb-0310-9956-ffa450edef68

6 years agoRebuild.
Lucien Gentis [Sat, 23 Jun 2018 13:44:41 +0000 (13:44 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834208 13f79535-47bb-0310-9956-ffa450edef68

6 years agoXML updates.
Lucien Gentis [Sat, 23 Jun 2018 13:43:45 +0000 (13:43 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834207 13f79535-47bb-0310-9956-ffa450edef68

6 years agoReorder section to be more logical.
Christophe Jaillet [Sat, 23 Jun 2018 13:15:03 +0000 (13:15 +0000)]
Reorder section to be more logical.
Based on r1553469.

This fixes an example which contains spaces in a LDAP group name (i.e. cn=Temporary Employees,o=Airius)

I've also synch with trunk:
   -  add some " to improve syntax highlight
   - use AuthLDAPUrl in stead of AuthLDAPURL in order to have syntax highlight work

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834205 13f79535-47bb-0310-9956-ffa450edef68

6 years agoBackported in r1834104.
Yann Ylavic [Fri, 22 Jun 2018 10:44:41 +0000 (10:44 +0000)]
Backported in r1834104.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834105 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1829038, r1829039, r1830523 from trunk:
Yann Ylavic [Fri, 22 Jun 2018 10:44:13 +0000 (10:44 +0000)]
Merge r1829038, r1829039, r1830523 from trunk:

mod_xml2enc: Fix forwarding of error metadata/responses. PR 62180.

All meta buckets are now aggregated (besides FLUSH) and forwarded down
the chain, and the output filter bails out on EOS.

Proposed by: Micha Lenk <micha lenk.info>

mod_xml2enc: follow up to r1829038.

If any, pass pending meta bucket down the chain before leaving.

mod_xml2enc: follow up to r1829038 and r1829039.

Use below pending_data logic for EOS bucket.
This closes #48

Submitted by: ylavic
Reviewed by: ylavic, jim, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834104 13f79535-47bb-0310-9956-ffa450edef68

6 years agoBackported in r1834093.
Yann Ylavic [Fri, 22 Jun 2018 10:35:28 +0000 (10:35 +0000)]
Backported in r1834093.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834103 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1827362, r1828926, r1828927, r1829557, r1829573, r1829645, r1829657 from trunk:
Yann Ylavic [Fri, 22 Jun 2018 10:04:49 +0000 (10:04 +0000)]
Merge r1827362, r1828926, r1828927, r1829557, r1829573, r1829645, r1829657 from trunk:

core: ap_getline_core() reads nothing for n == 0.

PR62199: add worker parameter ResponseFieldSize to mod_proxy

Submitted By: Hank Ibell
Committed By: covener

add log id for r1828926

core: Add and handle AP_GETLINE_NOSPC_EOL flag in ap_rgetline_core().

This tells the ap_getline() family of functions to consume the end of line
when the buffer is exhausted.

PR 62198.

mod_proxy_http: make use of AP_GETLINE_NOSPC_EOL in ap_proxygetline().

Fixes response header thrown away after the previous one was considered too
large and truncated.

PR 62196.

core: forward flags to recursive/folding call to ap_rgetline_core().

We still need them when folding, other than AP_GETLINE_FOLD itself of course.

mod_proxy_http: follow up to r1829573: remain EBCDIC friendly.

Keep using ap_rgetline() as before r1829573, since ap_rgetline_core() is
EBCDIC agnostic.

Submitted by: ylavic, covener, covener, ylavic, ylavic, ylavic, ylavic
Reviewed by: ylavic, covener, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834093 13f79535-47bb-0310-9956-ffa450edef68

6 years agoBackported in r1834089.
Yann Ylavic [Fri, 22 Jun 2018 09:46:18 +0000 (09:46 +0000)]
Backported in r1834089.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834090 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1826995, r1827001 from trunk:
Yann Ylavic [Fri, 22 Jun 2018 09:45:39 +0000 (09:45 +0000)]
Merge r1826995, r1827001 from trunk:

Extend SSLOCSPEnable with mode 'leaf' that only checks the leaf of a
certificate chain. PR62112 [Ricardo Martin Camarero <rickyepoderi yahoo.es>]

Fixed OCSPEnable to keep accepting "off", not "none".

Submitted by: icing
Reviewedby: icing, ylavic, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834089 13f79535-47bb-0310-9956-ffa450edef68

6 years ago* Vote and promote
Ruediger Pluem [Fri, 22 Jun 2018 09:06:46 +0000 (09:06 +0000)]
* Vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834086 13f79535-47bb-0310-9956-ffa450edef68

6 years agoxforms
Christophe Jaillet [Thu, 21 Jun 2018 20:16:21 +0000 (20:16 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834052 13f79535-47bb-0310-9956-ffa450edef68

6 years agoImprove syntax highlight and add the default value of ProxyHTMLBufSize in the descrip...
Christophe Jaillet [Thu, 21 Jun 2018 20:04:56 +0000 (20:04 +0000)]
Improve syntax highlight and add the default value of ProxyHTMLBufSize in the description of the directive.
(r1834041 in trunk)

Add a missing word to synch with trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834050 13f79535-47bb-0310-9956-ffa450edef68

6 years agoxforms
Jim Jagielski [Thu, 21 Jun 2018 13:37:53 +0000 (13:37 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834015 13f79535-47bb-0310-9956-ffa450edef68

6 years agoBackport fix proposal for wstunnel
Jim Jagielski [Thu, 21 Jun 2018 13:34:37 +0000 (13:34 +0000)]
Backport fix proposal for wstunnel

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834014 13f79535-47bb-0310-9956-ffa450edef68

6 years agoVote.
Yann Ylavic [Wed, 20 Jun 2018 15:28:57 +0000 (15:28 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833923 13f79535-47bb-0310-9956-ffa450edef68

6 years agoVote and promote.
Rainer Jung [Tue, 19 Jun 2018 22:50:31 +0000 (22:50 +0000)]
Vote and promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833878 13f79535-47bb-0310-9956-ffa450edef68

6 years agoPropose.
Rainer Jung [Tue, 19 Jun 2018 22:49:32 +0000 (22:49 +0000)]
Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833877 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1833014 from trunk:
Jim Jagielski [Tue, 19 Jun 2018 13:15:49 +0000 (13:15 +0000)]
Merge r1833014 from trunk:

* modules/http/http_request.c (ap_process_request_after_handler,
  ap_process_request): Cache and retrieve the brigade structure used
  to send EOR and FLUSH between requests in c->pool userdata, to avoid
  allocating a brigade structure per-request out of c->pool.

Submitted by: rpluem, jorton

Submitted by: jorton
Reviewed by: jorton, covener, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833841 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1830746 from trunk:
Jim Jagielski [Tue, 19 Jun 2018 13:14:38 +0000 (13:14 +0000)]
Merge r1830746 from trunk:

mod_proxy_html: Fix variable interpolation and memory allocation failure in ProxyHTMLURLMap.

Proposed by: Ewald Dieterich <ewald mailbox.org>
Reviewed by: ylavic

Submitted by: ylavic
Reviewed by: ylavic, jailletc36, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833840 13f79535-47bb-0310-9956-ffa450edef68

6 years agopromote
Jim Jagielski [Tue, 19 Jun 2018 13:12:38 +0000 (13:12 +0000)]
promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833839 13f79535-47bb-0310-9956-ffa450edef68

6 years agovotes
Jim Jagielski [Tue, 19 Jun 2018 13:11:42 +0000 (13:11 +0000)]
votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833837 13f79535-47bb-0310-9956-ffa450edef68

6 years agoleave a note/reminder
Eric Covener [Tue, 19 Jun 2018 12:13:29 +0000 (12:13 +0000)]
leave a note/reminder

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833830 13f79535-47bb-0310-9956-ffa450edef68

6 years agoadd easy to flub trailing .
Eric Covener [Tue, 19 Jun 2018 12:10:27 +0000 (12:10 +0000)]
add easy to flub trailing .

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833829 13f79535-47bb-0310-9956-ffa450edef68

6 years agovote/add
Eric Covener [Tue, 19 Jun 2018 12:09:38 +0000 (12:09 +0000)]
vote/add

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833828 13f79535-47bb-0310-9956-ffa450edef68

6 years agoClose to closing out showstopper
Daniel Ruggeri [Fri, 15 Jun 2018 13:08:23 +0000 (13:08 +0000)]
Close to closing out showstopper

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833595 13f79535-47bb-0310-9956-ffa450edef68

6 years agofix a potential NULL dereference spotted by gcc 8.1.0
Daniel Ruggeri [Thu, 14 Jun 2018 21:44:06 +0000 (21:44 +0000)]
fix a potential NULL dereference spotted by gcc 8.1.0

 *) mod_ssl: fix a potential NULL dereference spotted by gcc 8.1.0
    mod_http2: silence gcc strncpy warnings which break compilation in
               maintainer mode with gcc 8.1.0
    trunk patch: http://svn.apache.org/r1831231
                 http://svn.apache.org/r1831591
                 http://svn.apache.org/r1832934
                 http://svn.apache.org/r1832937
    2.4.x patch: svn merge -c 1831231,1831591,1832934,1832937 ^/httpd/httpd/trunk .
    +1: ylavic, icing, jailletc36 (by inspection)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833564 13f79535-47bb-0310-9956-ffa450edef68

6 years agoAdd a missing PR reference
Christophe Jaillet [Wed, 13 Jun 2018 18:28:59 +0000 (18:28 +0000)]
Add a missing PR reference

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833471 13f79535-47bb-0310-9956-ffa450edef68

6 years agoVote and promote
Christophe Jaillet [Tue, 12 Jun 2018 17:04:58 +0000 (17:04 +0000)]
Vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833414 13f79535-47bb-0310-9956-ffa450edef68

6 years agoRebuild.
Lucien Gentis [Sat, 9 Jun 2018 14:35:25 +0000 (14:35 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833244 13f79535-47bb-0310-9956-ffa450edef68

6 years agoXML updates.
Lucien Gentis [Sat, 9 Jun 2018 14:34:40 +0000 (14:34 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833243 13f79535-47bb-0310-9956-ffa450edef68

6 years agoNominate r1833014.
Joe Orton [Fri, 8 Jun 2018 16:35:21 +0000 (16:35 +0000)]
Nominate r1833014.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833196 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1832580, r1832581 from trunk:
Jim Jagielski [Wed, 6 Jun 2018 19:04:45 +0000 (19:04 +0000)]
Merge r1832580, r1832581 from trunk:

mod_remoteip: Fix RemoteIP{Trusted,Internal}ProxyList loading broken by 2.4.30.

Overwriting server config in pre_config hook breaks EXEC_ON_READ directives,
it's automatically created on purpose anyway.

PR 62220.

Follow up to r1832580: correct CHANGES entry.
Submitted by: ylavic
Reviewed by: ylavic, wrowe, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833070 13f79535-47bb-0310-9956-ffa450edef68

6 years agopromote
Jim Jagielski [Wed, 6 Jun 2018 19:02:50 +0000 (19:02 +0000)]
promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833069 13f79535-47bb-0310-9956-ffa450edef68

6 years agovote on showstopper
Jim Jagielski [Wed, 6 Jun 2018 19:02:35 +0000 (19:02 +0000)]
vote on showstopper

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833068 13f79535-47bb-0310-9956-ffa450edef68

6 years agoBackported to 2.4.x in r1833007.
Yann Ylavic [Wed, 6 Jun 2018 10:57:13 +0000 (10:57 +0000)]
Backported to 2.4.x in r1833007.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833008 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1776458 from trunk:
Yann Ylavic [Wed, 6 Jun 2018 10:56:19 +0000 (10:56 +0000)]
Merge r1776458 from trunk:

mod_remoteip: Set useragent port to zero PR59931

When overriding the useragent address from X-Forwarded-For,
zero out what had been initialized as the connection-level port.

Submitted By: Hank Ibell <hwibell gmail.com>
Reviewed by: ylavic, covener, icing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833007 13f79535-47bb-0310-9956-ffa450edef68

6 years agoBackported to 2.4.x in r1833005.
Yann Ylavic [Wed, 6 Jun 2018 10:53:54 +0000 (10:53 +0000)]
Backported to 2.4.x in r1833005.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833006 13f79535-47bb-0310-9956-ffa450edef68

6 years agoMerge r1822537, r1830744 from trunk:
Yann Ylavic [Wed, 6 Jun 2018 10:53:16 +0000 (10:53 +0000)]
Merge r1822537, r1830744 from trunk:

mpm_unix(es): cleanup properly on exit in one_process mode.

We can't destroy ap_pglobal in the MPMs because clean_child_exit() runs in
a DSO which would be unloaded under us.

So we defer an ap_terminate() with atexit() in ap_unixd_mpm_set_signals(),
all this is static/builtin code in "os/unix/unixd.c".

Follow up to r1822537: replace static variable with pool userdata.

Also adds a comment and a CHANGES entry.

Submitted by: ylavic
Reviewed by: ylavic, jim, icing

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833005 13f79535-47bb-0310-9956-ffa450edef68

6 years agopromote
Stefan Eissing [Wed, 6 Jun 2018 10:32:41 +0000 (10:32 +0000)]
promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1833000 13f79535-47bb-0310-9956-ffa450edef68