]>
granicus.if.org Git - apache/log
Rainer Jung [Wed, 29 Aug 2018 02:23:36 +0000 (02:23 +0000)]
mod_status: Complete the data shown for async
MPMs in "auto" mode. Added number of processes,
number of stopping processes and number
of busy and idle workers.
This changes only the key/value list of the
server-status "auto" output. The data is already
part of the "html" output.
Backport of r1837589 from trunk.
Submitted by: rjung
Reviewed by: rjung, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839530 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Aug 2018 20:11:39 +0000 (20:11 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839500 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Aug 2018 20:07:07 +0000 (20:07 +0000)]
Merge r1837130 from trunk:
mod_ratelimit: Don't interfere with "chunked" encoding.
By the time ap_http_header_filter() sends the header brigade and adds the
"CHUNK" filter, we need to garantee that the header went through all the
filters' stack, and more specifically above ap_http_chunk_filter() which
assumes that all it receives is content data.
Since rate_limit_filter() may retain the header brigade, make it run after
ap_http_chunk_filter(), just before AP_FTYPE_CONNECTION filters.
Also, ap_http_header_filter() shouldn't eat the EOS for HEAD/no-body responses.
For instance mod_ratelimit depends on it since r1835168, but any next request
filter may as well to flush and/or bail out approprietely.
This fixes the regression introduced in 2.4.34 (r1835168).
PR 62568.
Submitted by: ylavic
Reviewed by: covener, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839497 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Aug 2018 13:56:42 +0000 (13:56 +0000)]
Vote, promote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839446 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 Aug 2018 12:56:41 +0000 (12:56 +0000)]
Fix proposal for ssl_io_filter_error() w.r.t. mod_proxy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839443 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 28 Aug 2018 12:26:12 +0000 (12:26 +0000)]
Rebuil fr doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839438 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 28 Aug 2018 12:25:21 +0000 (12:25 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839437 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Aug 2018 13:53:07 +0000 (13:53 +0000)]
oops... remove one already covered
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839328 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Aug 2018 13:52:39 +0000 (13:52 +0000)]
More backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839327 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Aug 2018 13:24:52 +0000 (13:24 +0000)]
backport prop vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839318 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 27 Aug 2018 12:44:13 +0000 (12:44 +0000)]
backport prop
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839309 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 26 Aug 2018 21:17:20 +0000 (21:17 +0000)]
Add some more modules that use mod_watchdog
r1839250 in trunk
+ remove some trailing spaces to synch with trunk
+ add the optional [s] in WatchdogInterval syntax
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839254 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 26 Aug 2018 20:29:47 +0000 (20:29 +0000)]
Add missing space
(r1839245 on trunk)
+ remove some trailling spaces to synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1839246 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 24 Aug 2018 20:22:44 +0000 (20:22 +0000)]
Use the default location to display a default value
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838953 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 24 Aug 2018 19:49:59 +0000 (19:49 +0000)]
Fix an example (/foo vs /foo/bar)
Synch with trunk and improve alignment in examples.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838946 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Aug 2018 19:48:29 +0000 (19:48 +0000)]
comment change... no functional
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838944 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Aug 2018 13:06:50 +0000 (13:06 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838849 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Aug 2018 13:06:30 +0000 (13:06 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838848 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 24 Aug 2018 13:06:11 +0000 (13:06 +0000)]
voted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838846 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 24 Aug 2018 12:36:37 +0000 (12:36 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838838 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 22 Aug 2018 22:56:33 +0000 (22:56 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838688 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Aug 2018 19:15:24 +0000 (19:15 +0000)]
add to status while I test
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838676 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 22 Aug 2018 18:49:42 +0000 (18:49 +0000)]
forgot to add vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838673 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 22 Aug 2018 17:22:27 +0000 (17:22 +0000)]
Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838667 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 20 Aug 2018 20:52:27 +0000 (20:52 +0000)]
propose fix for 2.4.34 regression
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838490 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 20 Aug 2018 19:48:59 +0000 (19:48 +0000)]
Backport r1786113 (Wording/formatting/typo fixes.)
+ s/require/Require/ to help syntax color highlight work correctly. (r1838458 + r1838459 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838466 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Aug 2018 15:50:50 +0000 (15:50 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838342 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Aug 2018 15:49:58 +0000 (15:49 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838341 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 18 Aug 2018 07:56:02 +0000 (07:56 +0000)]
- Add some links.
- Remove the space in "character set" in the syntax of ProxyFtpDirCharset to avoid confusion (it is 1 parameter only)
- Use the correct syntax for the "default" values, so that they are parsed and correctly displayed in 'quickreference'
- Remove extra [] when directive's parameter are required
- correct the default password: apache-proxy@ instead of apache_proxy@.
This was silently changed in r88745, 17 years ago!
(r1838313 in trunk + some style to synch 2.4.x and trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838314 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 15 Aug 2018 15:01:08 +0000 (15:01 +0000)]
Merge r1418761, r1418765, r1510295, r1757147, r1805163, r1818924, r1827374, r1831772, r1832351, r1832951, r1815004 from trunk:
Don't claim "BIO dump follows" if it is not logged due to log level config.
make ssl_io_data_dump respect per-conn loglevel
add high trace level log messages for debugging buffering and write completion
* modules/ssl/ssl_engine_kernel.c (ssl_callback_SessionTicket): Fail
if RAND_bytes() fails; possible per API, although not in practice
with the OpenSSL implementation.
Fix typo in log message.
ap_add_common_vars(): use apr_pstrmemdup().
This avoids a transient replacement/restore of '?' by '\0' in r->filename.
Use 'ap_request_has_body()' instead of duplicating its implemenation.
The logic in 'ap_request_has_body()' is:
has_body = (!r->header_only
&& (r->kept_body
|| apr_table_get(r->headers_in, "Transfer-Encoding")
|| ( (cls = apr_table_get(r->headers_in, "Content-Length"))
&& (apr_strtoff(&cl, cls, &estr, 10) == APR_SUCCESS)
&& (!*estr)
&& (cl > 0) )
)
);
So the test is slighly different from the original code. (but this looks fine to me)
This also has the advantage to avoid a redundant call to 'apr_table_get()' and to improve readability.
While at it, move the test '!r->expecting_100' a few lines above because it is cheap.
PR62368: Print the unparsed URI in AH03454
... to include r->args and get otherwise get as close to possible to
what came in over the wire.
Submitted By: Hank Ibell <hwibell gmail.com>
Committed By: covener
All error handling paths of this function call 'apr_brigade_destroy()' , except this one.
So add it here too.
Probably spotted with the help of the Coccinelle software (Thx Julia for the patch and for Coccinelle)
See PR 53016
* modules/proxy/proxy_util.c (ap_proxy_share_worker): Skip creating subpool
for debugging unless debug-level logging is enabled. No functional change.
mod_watchdog: Correct some log messages and fix
compiler warning
"'rv' may be used uninitialized in this function".
Follow up to r1722154.
Submitted by: sf, jorton, jorton, ylavic, jailletc36, covener, jailletc36, jorton, rjung
Reviewed by: jailletc36, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838103 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 15 Aug 2018 14:52:43 +0000 (14:52 +0000)]
Merge r1801143 from trunk:
mpm_winnt: Don't forget to close the I/O completion port as part of the
cleanup in the child process.
Submitted by: kotkov
Reviewed by: jailletc36, ylavic (by inspection), covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838102 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 14 Aug 2018 21:03:42 +0000 (21:03 +0000)]
Merge r1797844 from trunk:
allow quoted paths in <IfFile>
The boilerplate code for config sections conflicts with TAKE1
because of the trailing stuff to terminate the opening tag.
Change from TAKE1 to RAW_ARGS and call ap_getword_conf()
directly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838053 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 14 Aug 2018 20:56:54 +0000 (20:56 +0000)]
Merge r1809135 from trunk:
On the trunk:
mpm_common.h: guarding AP_ENABLE_EXCEPTION_HOOK against use when undefined so that -Wundef does not triggger.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838052 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 14 Aug 2018 17:32:23 +0000 (17:32 +0000)]
Vote+promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838039 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 14 Aug 2018 12:21:52 +0000 (12:21 +0000)]
and promote those with 3 +1s
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838015 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 14 Aug 2018 12:21:13 +0000 (12:21 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1838014 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 10 Aug 2018 20:30:07 +0000 (20:30 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837834 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 10 Aug 2018 13:39:56 +0000 (13:39 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837803 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 10 Aug 2018 03:35:34 +0000 (03:35 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837769 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 8 Aug 2018 17:20:35 +0000 (17:20 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837663 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 8 Aug 2018 14:53:56 +0000 (14:53 +0000)]
quick fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837654 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Aug 2018 11:48:15 +0000 (11:48 +0000)]
Merge r1836469, r1836154 from trunk:
* config.layout: Allow configure --localstatedir to over-ride /var/www
location in Fedora layout.
* Makefile.in (install-suexec*): Fix make -jN install.
Submitted by: Arkadiusz Miskiewicz <arekm maven.pl>
Submitted by: jorton
Reviewed by: jorton, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837645 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Aug 2018 11:46:52 +0000 (11:46 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837644 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 8 Aug 2018 11:46:19 +0000 (11:46 +0000)]
vote on some backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837643 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 7 Aug 2018 14:19:31 +0000 (14:19 +0000)]
Propose a few monitoring improvements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837599 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 5 Aug 2018 14:15:25 +0000 (14:15 +0000)]
vote/comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837467 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 4 Aug 2018 08:09:54 +0000 (08:09 +0000)]
Fix comment in mod_lua and docs.
s/addoutputfilter/add_output_filter/
See PR 62359
(r1837404 on trunk)
Note: .c file is patch without any vote because it is only a comment in order to be consistent with the doc and the code, and mod_lua is marked as experimental.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837405 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 3 Aug 2018 13:17:28 +0000 (13:17 +0000)]
update backport prop
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837368 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 3 Aug 2018 10:54:47 +0000 (10:54 +0000)]
On the 2.4.x branch:
backport of r1837357 from trunk.
*) mod_md: When the last domain name from an MD is moved to another one,
that now empty MD gets moved to the store archive. PR 62572.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837358 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 1 Aug 2018 12:54:54 +0000 (12:54 +0000)]
Propose mod_socache_redis as backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837233 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 1 Aug 2018 11:58:52 +0000 (11:58 +0000)]
backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837226 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 01:15:48 +0000 (01:15 +0000)]
rebuilt added misc index.html.es ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837206 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:56:32 +0000 (00:56 +0000)]
rebuilt added ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837205 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:44:00 +0000 (00:44 +0000)]
rebuilt added ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837204 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:29:33 +0000 (00:29 +0000)]
rebuilt added ES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837203 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:20:07 +0000 (00:20 +0000)]
forgot to commit html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837202 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:17:49 +0000 (00:17 +0000)]
rebuilt spanish docs to match eng rev of ssi
translated adding ssi spanish doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837201 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:08:43 +0000 (00:08 +0000)]
built and update file http2.html.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837200 13f79535 -47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 1 Aug 2018 00:01:15 +0000 (00:01 +0000)]
rebuilt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1837199 13f79535 -47bb-0310-9956-
ffa450edef68
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