Lucien Gentis [Sat, 27 Oct 2018 12:52:09 +0000 (12:52 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844960 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 Oct 2018 12:50:48 +0000 (12:50 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844958 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 27 Oct 2018 07:33:57 +0000 (07:33 +0000)]
mod_ssl: follow up to r1844928: revert an unintentional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844942 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 26 Oct 2018 22:00:30 +0000 (22:00 +0000)]
mod_ssl: axe dead code.
No functional change, we never get there when *len > 0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844928 13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 26 Oct 2018 10:24:17 +0000 (10:24 +0000)]
* Add a command to dump some data from the scoreboard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844889 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 24 Oct 2018 15:43:35 +0000 (15:43 +0000)]
mod_ssl: follow up to r1844779: fix rollback in char_buffer_consume().
This needs the same bucket insertion code as in char_buffer_write(), so define
a new char_buffer_insert() helper.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844781 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 24 Oct 2018 15:06:04 +0000 (15:06 +0000)]
request: forward as much buckets as possible in ap_request_core_filter().
This improves performances while still preventing morphing buckets bound to
r->pool from reaching connection filters.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844780 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 24 Oct 2018 14:55:44 +0000 (14:55 +0000)]
mod_ssl: bind buffered data to filter's pending data.
Otherwise they are not considered by ap_filter_input_pending() and pipelining
is not detected (MPM event times out).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844779 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 22 Oct 2018 20:45:11 +0000 (20:45 +0000)]
Retsore 2.4.x default behavior modified in r1557580.
Update doc accordingly.
Slightly tweak mod_speling doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844598 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 22 Oct 2018 13:15:54 +0000 (13:15 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844557 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 22 Oct 2018 13:15:30 +0000 (13:15 +0000)]
mod_proxy.xml: explicitly state that proxypass cannot be used with If
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844556 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 21 Oct 2018 12:10:09 +0000 (12:10 +0000)]
Fx a likely typo in r1842929: runtimedir plus
statedir instead of runtimedir twice.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844484 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Oct 2018 15:04:17 +0000 (15:04 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844421 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Oct 2018 15:02:32 +0000 (15:02 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844420 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 20 Oct 2018 09:31:43 +0000 (09:31 +0000)]
STATUS: added item to the wishlist for 2.next
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844403 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 20 Oct 2018 09:22:16 +0000 (09:22 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844402 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 20 Oct 2018 09:21:47 +0000 (09:21 +0000)]
mod_headers.xml: clarify the difference between
onsuccess vs always
In PR 62380 a user was confused why Header set always
was not overriding a header set by a HTTP backend managed
via mod_proxy_http. The difference between 'onsuccess'
and 'always' is really subtle, even if somebody is familiar
with r->headers_out and r->err_headers_out and the httpd's
internals.
As Stefan mentioned over email, the absence of a "normalized"
headers list in the response should be explained, so I tried to
do so in this commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844401 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 19 Oct 2018 16:19:39 +0000 (16:19 +0000)]
* modules/ssl/ssl_engine_init.c: Fix typo in log message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844354 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 19 Oct 2018 15:57:06 +0000 (15:57 +0000)]
Fix a shadow (and useless) variable.
Fix a cppcheck warning and a style issue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844352 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 19 Oct 2018 13:21:11 +0000 (13:21 +0000)]
* modules/md/md_acme_authz.c (md_acme_authz_update): Fix typo in log
message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844343 13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Wed, 17 Oct 2018 12:48:18 +0000 (12:48 +0000)]
rollback
1844001.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844090 13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 16 Oct 2018 12:55:01 +0000 (12:55 +0000)]
* Correctly merge configurations that have client certificates set
by SSLProxyMachineCertificate{File|Path}.
The certificates and keys loaded during configuration time got lost during
runtime if e.g. SSLProxyMachineCertificate{File|Path} was set on virtual host
level and there was an SSL directive at directory level, e.g. SSLRequire.
This fixes a regression likely introduced in r1740928.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844002 13f79535-47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 16 Oct 2018 12:53:18 +0000 (12:53 +0000)]
And a way to custom modules to guess and extract ssl variable.
See https://github.com/jfclere/JBCSP-17 for example...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1844001 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 15 Oct 2018 21:14:21 +0000 (21:14 +0000)]
SSL_read() doesn't distinguish between return value 0 and <0,
at least not for OpenSSL 1.1.1. This is documented in the man
page for SSL_read and let to h2 failures when using OpenSSL 1.1.1.
When no data could be read, our code returned EAGAIN up until
OpenSSL 1.1.0, but APR_EOF for OpenSSL 1.1.1.
Now instead check SSL_get_error() also when SSL_read() returns 0.
To keep changes small, this change should not influence behavior,
when (rc=SSL_read()):
- rc < 0
- rc == 0 && *len > 0
- rc == 0 &&
(APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc) &&
inctx->block == APR_NONBLOCK_READ
Behavior changes if
- rc == 0 &&
!(APR_STATUS_IS_EAGAIN(inctx->rc) || APR_STATUS_IS_EINTR(inctx->rc) &&
!*len > 0
Instead of APR_EOF:
- same behavior as rc < 0 for SSL_ERROR_WANT_READ
- same behavior as rc < 0 for SSL_ERROR_SYSCALL && APR_STATUS_IS_EAGAIN(inctx->rc)
Another change is that rc == 0 && ssl_err == SSL_ERROR_ZERO_RETURN
also results in APR_EOF.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843954 13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 15 Oct 2018 19:25:20 +0000 (19:25 +0000)]
* Ensure that aborted connections are logged as such.
Set c->aborted before apr_brigade_cleanup to have the correct status
when logging the request as apr_brigade_cleanup triggers the logging
of the request if it contains an EOR bucket.
PR: 62823
Submitted by: Arnaud Grandville <contact@grandville.net>
Reviewed by:rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843939 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 13 Oct 2018 12:10:49 +0000 (12:10 +0000)]
md_acme_drive.c: remove unused variable
Compiling in maintainer mode leads to a failure
due to challenges_configured initialized but
not used. Removing it seems harmless, Stefan
please let me know if this is not the case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843743 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 12 Oct 2018 15:19:19 +0000 (15:19 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843677 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 12 Oct 2018 15:18:23 +0000 (15:18 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843676 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 12 Oct 2018 14:43:56 +0000 (14:43 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843671 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 12 Oct 2018 14:39:21 +0000 (14:39 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843670 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 11 Oct 2018 11:22:55 +0000 (11:22 +0000)]
On the trunk:
mod_md: eliminating compiler warnings re signedness and unused. Adding a APLOG_WARNING
when the only available ACME challenge is "tls-sni-01" since Let's Encrypt will
disable that completely beginning of 2019.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843543 13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 10 Oct 2018 21:47:53 +0000 (21:47 +0000)]
mpm_event: avoid AH00484 with idle threads
mpm_event: Stop issuing AH00484 "server reached MaxRequestWorkers..." when
there are still idle threads available. When there are less idle threads than
MinSpareThreads, issue new one-time message AH10159. Matches worker MPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843513 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 10 Oct 2018 12:02:34 +0000 (12:02 +0000)]
Eliminating some advanced conversion and shadow declaration compiler warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843430 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 10 Oct 2018 11:35:48 +0000 (11:35 +0000)]
mod_http2: adding defensive code for stream EOS handling, in case the request handler
missed to signal it the normal way (eos buckets). Addresses github issues
https://github.com/icing/mod_h2/issues/164, https://github.com/icing/mod_h2/issues/167
and https://github.com/icing/mod_h2/issues/170.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843426 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 10 Oct 2018 11:22:53 +0000 (11:22 +0000)]
mod_http2: bringing some signed/unsigned casting goodness, aligning with github mod-h2 again
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843424 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 9 Oct 2018 14:28:14 +0000 (14:28 +0000)]
Add CHANGES entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843290 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 9 Oct 2018 12:29:08 +0000 (12:29 +0000)]
mod_session_cookie: avoid adding the Set-Cookie header
in both r->headers_out and r->err_headers_out
to avoid duplication.
In session_cookie_save it seems that ap_cookie_write is called
with r->headers_out and r->err_headers_out, ending up in the same
Set-Cookie header on both tables and eventually duplicated in the
HTTP response. I took Emmanuel's patch and trimmed out the bits
that remove the header only from r->err_headers_out (leaving it
to do the work on both tables) as attempt to change this bit of code
in the most conservative way as possible. Sending a commit for
a broader review.
PR: 60910,56098,55278
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843244 13f79535-47bb-0310-9956-
ffa450edef68
Evgeny Kotkov [Tue, 9 Oct 2018 12:16:08 +0000 (12:16 +0000)]
mod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified
responses allowing these modules to properly set or fix-up the response
headers such as Vary or ETag.
This change follows up on r1837056 that disabled that special handling and
thus resulted in a potential violation of RFC7232, 4.1:
The server generating a 304 response MUST generate any of the following
header fields that would have been sent in a 200 (OK) response to the
same request: Cache-Control, Content-Location, Date, ETag, Expires,
and Vary.)
References:
https://lists.apache.org/thread.html/
f5733ca6743757e8aa8b58a0cd9e27680971551c2a20f5606c66507e@%3Cdev.httpd.apache.org%3E
https://tools.ietf.org/html/rfc7232#section-4.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843242 13f79535-47bb-0310-9956-
ffa450edef68
André Malo [Mon, 8 Oct 2018 21:09:09 +0000 (21:09 +0000)]
ran `build bootstrap` and rebuild transformation. sorry for the noise.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843205 13f79535-47bb-0310-9956-
ffa450edef68
André Malo [Mon, 8 Oct 2018 20:59:30 +0000 (20:59 +0000)]
move es and fr targets to *.utf8 extension. Update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843201 13f79535-47bb-0310-9956-
ffa450edef68
André Malo [Mon, 8 Oct 2018 15:06:12 +0000 (15:06 +0000)]
Fix xml validation error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1843164 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Oct 2018 15:47:58 +0000 (15:47 +0000)]
Add changes, docs for DefaultStateDir and DavLockDB default change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842938 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Oct 2018 15:26:14 +0000 (15:26 +0000)]
* modules/dav/fs/mod_dav_fs.c (dav_fs_create_server_config): Use
statedir-relative default lock database path.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842931 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Oct 2018 15:25:04 +0000 (15:25 +0000)]
Define "state directory" for storing persistent child-writable state,
with default from config.layout, configurable via DefaultStateDir.
* server/core.c (set_state_dir, ap_state_dir_relative):
New functions.
* config.layout, acinclude.m4, Makefile.in, configure.in: Define
statedir variables, drop davlockdb.
* include/ap_config_layout.h.in: Define DEFAULT_REL_STATEDIR,
DEFAULT_EXP_STATEDIR in place of _DAVLOCKDB.
* include/ap_mmn.h: Bump MMN minor.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842929 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Oct 2018 14:38:28 +0000 (14:38 +0000)]
* modules/cache/mod_cache_disk.c (write_headers): Handle
mkdir_structure error case. Fixes Coverity warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842926 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Oct 2018 14:05:20 +0000 (14:05 +0000)]
* server/protocol.c (ap_rvputs): Call va_end before returning in the
error case, as required by C89/POSIX stdarg.h - Coverity warns for
this.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842919 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Oct 2018 12:06:27 +0000 (12:06 +0000)]
* modules/ldap/util_ldap_cache_mgr.c (util_ald_create_caches): Destroy
rather than leak caches if all three cannot be allocated (Coverity
warning). Remove unnecessary pointer.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842898 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Oct 2018 10:43:46 +0000 (10:43 +0000)]
* modules/filters/mod_deflate.c
(deflate_out_filter): Fix typo setting output note. (Coverity warning)
(deflate_in_filter): Fix redundant assignment. (clang warning)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842888 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Oct 2018 10:31:35 +0000 (10:31 +0000)]
* modules/mappers/mod_negotiation.c (set_language_quality): Remove
redundant branch (warning from Coverity).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842884 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Oct 2018 10:18:53 +0000 (10:18 +0000)]
* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey): Remove
redundant assignment (clang warning).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842883 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Oct 2018 10:17:18 +0000 (10:17 +0000)]
* modules/slotmem/mod_slotmem_shm.c (restore_slotmem): Remove
redundant assignment (clang warning), the apr_file_eof(fp)=>APR_EOF
case assigns rv to APR_EOF and then to APR_SUCCESS after already.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842882 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Oct 2018 10:12:12 +0000 (10:12 +0000)]
* modules/proxy/ajp_header.c (sc_for_req_header): Zero-initialize
buffer to avoid potential (harmless) memcmp comparison against
garbage stack data later. (clang warning).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842881 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 2 Oct 2018 16:20:26 +0000 (16:20 +0000)]
XForms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842640 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 2 Oct 2018 16:20:07 +0000 (16:20 +0000)]
Remove garbage.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842639 13f79535-47bb-0310-9956-
ffa450edef68
André Malo [Tue, 2 Oct 2018 06:49:42 +0000 (06:49 +0000)]
build bootstrap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842598 13f79535-47bb-0310-9956-
ffa450edef68
Luis Gil [Mon, 1 Oct 2018 21:13:30 +0000 (21:13 +0000)]
Spanish html doc files : UTF-8 encoding in order to get rid of HTML entities.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842568 13f79535-47bb-0310-9956-
ffa450edef68
Luis Gil [Mon, 1 Oct 2018 21:13:15 +0000 (21:13 +0000)]
Spanish html doc files : UTF-8 encoding in order to get rid of HTML entities.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842567 13f79535-47bb-0310-9956-
ffa450edef68
Luis Gil [Mon, 1 Oct 2018 21:12:38 +0000 (21:12 +0000)]
Spanish html doc files : UTF-8 encoding in order to get rid of HTML entities.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842566 13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 1 Oct 2018 18:21:18 +0000 (18:21 +0000)]
* Pickup the proxy related configuration for verify mode and verify depth and
not the configuration settings for frontend connections in case of
connections by the proxy to the backend.
PR: 62769
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842540 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 30 Sep 2018 15:25:51 +0000 (15:25 +0000)]
Rebuild after XML typo correction.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842394 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 30 Sep 2018 15:24:38 +0000 (15:24 +0000)]
XML typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842389 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 30 Sep 2018 15:20:59 +0000 (15:20 +0000)]
Rebuild after fr doc update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842388 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 30 Sep 2018 15:19:33 +0000 (15:19 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842387 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 30 Sep 2018 15:02:28 +0000 (15:02 +0000)]
French html doc files : UTF-8 encoding in order to get rid of HTML entities.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842386 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 27 Sep 2018 20:44:08 +0000 (20:44 +0000)]
The XSLT Saxon engine warns about some "Ambiguous rule matches".
Use priority to remove the ambiguity.
The only rational for choosing "3" and "4" for these priorities, is that "4" is related to <h4> tags, and 3=4-1 for the previous level.
Tested with the actual Xalan XSL engine:
./build.sh all
with and without the change.
Outputs are exactly the same.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842165 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 27 Sep 2018 20:42:24 +0000 (20:42 +0000)]
Revert r1842160
Some rules to help me detect un-needed links to directives, or missing ones were sent by error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842164 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 27 Sep 2018 20:26:59 +0000 (20:26 +0000)]
The XSLT Saxon engine warns about some "Ambiguous rule matches".
Use priority to remove the ambiguity.
The only rational for choosing "3" and "4" for these priorities, is that "4" is related to <h4> tags, and 3=4-1 for the previous level.
Tested with the actual Xalan XSL engine:
./build.sh all
with and without the change.
Outputs are exactly the same.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842160 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 27 Sep 2018 19:18:51 +0000 (19:18 +0000)]
The XSLT Saxon engine warns that match="@*" will return only attribute nodes, which can't have any attributes or child.
So simplify the xsl rules accordingly.
Tested with the actual Xalan XSL engine:
./build.sh all
with and without the change.
Outputs are exactly the same.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842146 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 27 Sep 2018 15:35:44 +0000 (15:35 +0000)]
Revert borked transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842104 13f79535-47bb-0310-9956-
ffa450edef68
Luis Gil [Wed, 26 Sep 2018 22:28:40 +0000 (22:28 +0000)]
updated bind.xml.es and uploading meta file for build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842058 13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 26 Sep 2018 09:46:42 +0000 (09:46 +0000)]
* dav_stream_response processes data that has been allocated from the propdb
pool. Hence close the propdb *after* dav_stream_response which clears thei
probdb pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842010 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 26 Sep 2018 09:01:19 +0000 (09:01 +0000)]
* include/httpd.h: Define HTTP_TOO_EARLY (425) per RFC 8470.
* modules/http/http_protocol.c (status_lines,
get_canned_error_string): Add 425 response.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1842007 13f79535-47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 23 Sep 2018 21:48:32 +0000 (21:48 +0000)]
Apply transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1841786 13f79535-47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 23 Sep 2018 21:39:15 +0000 (21:39 +0000)]
ab: Add client certificate support.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1841784 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Sep 2018 13:34:41 +0000 (13:34 +0000)]
XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1841680 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 21 Sep 2018 23:36:06 +0000 (23:36 +0000)]
mod_ssl doc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1841640 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 21 Sep 2018 23:35:45 +0000 (23:35 +0000)]
mod_ssl.xml: fix TLS 1.3 RFC link
Suggested by the IRC Freenode user 'a-ja' on #httpd-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1841639 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 20 Sep 2018 09:56:01 +0000 (09:56 +0000)]
On the trunk:
mod_ssl: changing from APLOG_WARN to DEBUG to INFO after review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1841455 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 20 Sep 2018 09:04:14 +0000 (09:04 +0000)]
On the trunk:
downgrade mod_ssl log level for requests not carrying SNI when SSLStrictSNIVHostCheck is on.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1841446 13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 18 Sep 2018 12:58:57 +0000 (12:58 +0000)]
* Doing a PROPFIND on a large collection e.g. 50.000 elements can easily
consume 1 GB of memory as the subrequests and propdb pools are not
destroyed and cleared after each element was handled.
Do this now. There is one case in dav_get_props where elem->priv
lives longer then the propdb pool. In this case allocate from r->pool.
Furthermore also recycle propdb's which allows to clear the propdb's
pools instead of destroying them and creating them again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1841225 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 18 Sep 2018 11:05:43 +0000 (11:05 +0000)]
* modules/ssl/ssl_engine_kernel.c (ssl_check_post_client_verify):
Retrieve and set sslconn->client_cert here for both "modern" and
classic access control.
(ssl_hook_Access_classic, ssl_hook_Access_modern, ssl_hook_Access):
Restore SSLRequire and FakeBasicAuth checks to ssl_hook_Access so tests
are still applied for TLSv1.3.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1841218 13f79535-47bb-0310-9956-
ffa450edef68
André Malo [Tue, 18 Sep 2018 09:15:19 +0000 (09:15 +0000)]
Fix properties, add missing html file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1841203 13f79535-47bb-0310-9956-
ffa450edef68
André Malo [Tue, 18 Sep 2018 09:03:58 +0000 (09:03 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1841200 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 15 Sep 2018 14:06:34 +0000 (14:06 +0000)]
Rebuild fr doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840972 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 15 Sep 2018 14:05:21 +0000 (14:05 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840971 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 15 Sep 2018 05:09:49 +0000 (05:09 +0000)]
Add some compatibility information
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840964 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 13 Sep 2018 04:19:27 +0000 (04:19 +0000)]
follow-up to r1656549.
Instead of logging a password (which is not a good practice), clarify the associated message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840776 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 12 Sep 2018 15:54:24 +0000 (15:54 +0000)]
* modules/ssl/ssl_engine_init.c (ssl_init_ctx_protocol):
Disable AUTO_RETRY mode for OpenSSL 1.1.1, which fixes
post-handshake authentication.
(ssl_init_proxy_certs): Fix proxy client cert support with
TLSv1.3, which is now crippled by default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840710 13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Sep 2018 13:06:00 +0000 (13:06 +0000)]
move the assignment to the end of the loop.
This is more readable and isn't miscompiled w/ -O3 on a certain
unnamed EBCDIC platforms compiler.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840678 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 11 Sep 2018 21:21:40 +0000 (21:21 +0000)]
Follow up to r1840265: really privatize ap_filter_{recycle,adopt_brigade}().
Move ap_filter_adopt_brigade()'s declaration to "server/core.h" (private).
For ap_filter_recycle(), make it static/internal to util_filter (renamed to
recycle_dead_filters() which better fits what it does). It's now also called
unconditionally from ap_filter_input_pending() which itself is always called
after the request processing and from MPM event (as input_pending hook).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840611 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 11 Sep 2018 16:01:47 +0000 (16:01 +0000)]
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access_modern): Fail with
403 if SSL_verify_client_post_handshake() fails, e.g. when the
TLS/1.3 client didn't send the Post-Handshake Authentication
extension.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840585 13f79535-47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Sep 2018 15:06:50 +0000 (15:06 +0000)]
mod_proxy_hcheck: Fix issues with TCP health checks. PR 61499
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840582 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 11 Sep 2018 14:06:15 +0000 (14:06 +0000)]
cleanup after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840575 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 11 Sep 2018 12:57:36 +0000 (12:57 +0000)]
* modules/arch/unix/mod_systemd.c (systemd_pre_mpm, systemd_monitor):
Ignore sd_notify{,f} failure cases as currently recommended by the
systemd API docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840555 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 11 Sep 2018 12:53:30 +0000 (12:53 +0000)]
* modules/arch/unix/mod_systemd.c (systemd_post_config): Fix systemd
service getting stuck reloading if "ExtendedStatus off" is
configured; regression in r1802251.
PR: 62697
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840554 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 6 Sep 2018 22:48:28 +0000 (22:48 +0000)]
Follow up to r1840149: core input filter pending data.
Since r1840149 ap_core_input_filter() can't use use f->[priv->]bb directly, so
ap_filter_input_pending() stopped accounting for its pending data.
But ap_core_input_filter() can't (and doesn't need to) setaside its socket
bucket, so ap_filter_setaside_brigade() is not an option. This commit adds
ap_filter_adopt_brigade() which simply moves the given buckets (brigade) into
f->priv->bb, and since this is not something to be done blindly (the buckets
need to have c->pool/bucket_alloc lifetime, which is the case in the core
filter) the function is not AP_DECLAREd/exported thus can be used in core only.
With ap_filter_adopt_brigade() and ap_filter_reinstate_brigade(), the core
input is now ap_filter_input_pending() friendly.
Also, ap_filter_recycle() is no more part of the API (AP_DECLARE removed too),
there really is no point to call it outside core code. MAJOR bumped once again
because of this.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840265 13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 6 Sep 2018 15:24:29 +0000 (15:24 +0000)]
fix StrictHostCheck in single/non-NVH vhosts
While all VH'es are NVH'es in 2.4 and later, something special happens
once a second NVH in a set is added. This case covers the
global server config scenario as well.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840229 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 5 Sep 2018 17:39:24 +0000 (17:39 +0000)]
Follow up to r1840149: MMN text rephrased.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840150 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 5 Sep 2018 17:27:43 +0000 (17:27 +0000)]
util_filter: protect ap_filter_t private fields from external (ab)use.
Introduce opaque struct ap_filter_private to move ap_filter_t "pending", "bb"
and "deferred_pool" fields to the "priv" side of things.
This allows to trust values set internally (only!) in util_filter code, and
make useful assertions between the different functions calls, along with the
usual nice extensibility property.
Likewise, the private struct ap_filter_conn_ctx in conn_rec (from r1839997)
allows now to implement the new ap_acquire_brigade() and ap_release_brigade()
functions useful to get a brigade with c->pool's lifetime. They obsolete
ap_reuse_brigade_from_pool() which is replaced where previously used.
Some comments added in ap_request_core_filter() regarding the lifetime of the
data it plays with, up to EOR...
MAJOR bumped (once again).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840149 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 4 Sep 2018 10:32:10 +0000 (10:32 +0000)]
core: follow up to r1839997: some runtime optimizations.
We don't mind about cleaning up a connection filter when its pool is being
cleaned up already. For request filters, let pending_filter_cleanup() do
nothing if the given filter is not pending (anymore), which allows to save a
cleanup kill when the filter is removed.
Clear (zero) the reused filters (ap_filter_t) on reuse rather than cleanup,
then a single APR_RING_CONCAT() can be used to recycle dead_filters in a one
go.
Always call ap_filter_recycle() in ap_filter_output_pending(), even if no
filter is pending, and while at it fix s/ap_filter_recyle/ap_filter_recycle/
silly typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1840028 13f79535-47bb-0310-9956-
ffa450edef68