]>
granicus.if.org Git - apache/log
Luis Gil [Wed, 1 Aug 2018 00:00:43 +0000 (00:00 +0000)]
rebuilt spanish docs access.html.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837198 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 23:38:04 +0000 (23:38 +0000)]
rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837196 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 23:23:20 +0000 (23:23 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837195 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 22:41:14 +0000 (22:41 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837193 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 22:39:29 +0000 (22:39 +0000)]
fixed miss spells and rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837191 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 22:38:15 +0000 (22:38 +0000)]
rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837190 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 22:03:00 +0000 (22:03 +0000)]
fixed miss spells and rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837183 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 31 Jul 2018 21:59:31 +0000 (21:59 +0000)]
spelling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837182 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 21:58:33 +0000 (21:58 +0000)]
fixed miss spells and rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837180 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 21:37:28 +0000 (21:37 +0000)]
mached ENG rev
1824187
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837179 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Tue, 31 Jul 2018 21:29:11 +0000 (21:29 +0000)]
updated spanish revision to match English Revision:
1807765 index file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837178 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 31 Jul 2018 16:22:29 +0000 (16:22 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837167 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 31 Jul 2018 16:21:26 +0000 (16:21 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837166 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 31 Jul 2018 16:12:49 +0000 (16:12 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837165 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 31 Jul 2018 16:11:48 +0000 (16:11 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837164 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 26 Jul 2018 19:51:52 +0000 (19:51 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836761 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 26 Jul 2018 19:50:41 +0000 (19:50 +0000)]
Merge r1836758 from trunk:
replace mystery smart-quotes copy/pasted from httpd.conf + vi.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836760 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 25 Jul 2018 14:47:11 +0000 (14:47 +0000)]
Merge r1836638 from trunk:
add 2 conditional logging examples
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836640 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2018 09:04:08 +0000 (09:04 +0000)]
Propose 2x buildsystem tweaks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836476 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2018 08:54:55 +0000 (08:54 +0000)]
Merged x2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836473 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2018 08:54:29 +0000 (08:54 +0000)]
Merge r1555631 from trunk:
Fix config merging of SSLOCSPEnable and SSLOCSPOverrideResponder.
Submitted by: trawick, Frank Meier <frank.meier ergon.ch>
Reviewed by: rpluem, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836472 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2018 08:47:59 +0000 (08:47 +0000)]
* modules/proxy/mod_proxy_balancer.c (make_server_id):
Fix APR 1.4 compatibility by avoiding use of apr_escape.h.
Submitted by: jorton
Reviewed by: jorton, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836471 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Jul 2018 09:37:13 +0000 (09:37 +0000)]
Typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836338 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 20 Jul 2018 09:34:45 +0000 (09:34 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836337 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 20 Jul 2018 09:05:15 +0000 (09:05 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836335 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 20 Jul 2018 08:57:46 +0000 (08:57 +0000)]
* Propose patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836334 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 20 Jul 2018 02:30:36 +0000 (02:30 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836315 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 19 Jul 2018 18:01:31 +0000 (18:01 +0000)]
Unclear why half of r1743512 was previously merged, but here's the remainder.
PR62190
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836289 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 19 Jul 2018 17:58:55 +0000 (17:58 +0000)]
Correct see also comment, backports r1836287
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836288 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 19 Jul 2018 16:34:17 +0000 (16:34 +0000)]
I think we need a buildbot for 2.4.x-on-APR-1.4.x...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836277 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 18 Jul 2018 11:51:43 +0000 (11:51 +0000)]
Note CVEs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836159 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 12:57:33 +0000 (12:57 +0000)]
Rebuild after adding new files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836111 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 12:47:37 +0000 (12:47 +0000)]
French translated file - First version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836110 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 11:48:05 +0000 (11:48 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836106 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 11:46:30 +0000 (11:46 +0000)]
Forgotten update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836105 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 Jul 2018 09:39:38 +0000 (09:39 +0000)]
On the 2.4.x branch:
merge r1836095 from trunk:
* using the, hopefully correct, ever elusive libressl version numbering check for the new openssl API calls, fixes PR 62548.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836096 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 09:11:25 +0000 (09:11 +0000)]
Adding new file manual/platform/rpm.html.fr after french doc rebuilding
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836089 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 17 Jul 2018 09:04:58 +0000 (09:04 +0000)]
First version of french translation of manual/platform/rpm.xml.fr
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836088 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 16 Jul 2018 19:47:16 +0000 (19:47 +0000)]
paraphrase slightly better
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836061 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 16 Jul 2018 12:09:08 +0000 (12:09 +0000)]
Rebuild after style/lang/fr.xml update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836025 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 16 Jul 2018 12:06:02 +0000 (12:06 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1836024 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 12 Jul 2018 12:52:43 +0000 (12:52 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835730 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 12 Jul 2018 12:51:11 +0000 (12:51 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835729 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 12 Jul 2018 12:42:48 +0000 (12:42 +0000)]
Rebuild (with 8 bits characters replaced by their HTML entities because -Xbootclasspath/p option disabled in build.sh script because it is no more supported in openjdk 10)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835727 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 10 Jul 2018 13:48:27 +0000 (13:48 +0000)]
Post 2.4.34 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835553 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 10 Jul 2018 13:48:23 +0000 (13:48 +0000)]
Get ready to tag httpd 2.4.34
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835551 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 10 Jul 2018 12:21:25 +0000 (12:21 +0000)]
Xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835546 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Jul 2018 14:49:14 +0000 (14:49 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835314 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 Jul 2018 22:06:17 +0000 (22:06 +0000)]
Backport: r1835287
Review by popcorner with further edits for clarity by both CodeingBoy
and popcorner, their discussion at https://github.com/popcorner/chect/pull/1
Added CONTENT_LANGUAGE variable for both translations.
Note user-visible update in CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835289 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 6 Jul 2018 13:18:58 +0000 (13:18 +0000)]
Typo correction.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835249 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 6 Jul 2018 08:44:47 +0000 (08:44 +0000)]
Transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835220 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 6 Jul 2018 08:43:37 +0000 (08:43 +0000)]
Merge r1834470 from trunk:
Render <code> in bold in man pages, matching commonly used style in
both help2man and the standard DocBook XSL stylesheets for man output.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835219 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Jul 2018 20:52:46 +0000 (20:52 +0000)]
zap my name, I just noticed the accepted proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835189 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:47:51 +0000 (19:47 +0000)]
Follow up to r1835179: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835180 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Jul 2018 19:45:14 +0000 (19:45 +0000)]
Merge r1588806 from trunk:
r1494157 from eventopt for event, per sf's review comments.
use a subpool of pchild since skiplist allocations will
happen across threads and are only protected from
other skiplist operations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835179 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 5 Jul 2018 19:39:12 +0000 (19:39 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835177 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jul 2018 19:27:26 +0000 (19:27 +0000)]
Backported in r1835175.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1835176 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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