]> granicus.if.org Git - apache/log
apache
5 years ago* modules/aaa/mod_authn_dbm.c (fetch_dbm_value): No functional change:
Joe Orton [Wed, 9 Jan 2019 09:34:34 +0000 (09:34 +0000)]
* modules/aaa/mod_authn_dbm.c (fetch_dbm_value): No functional change:
  return APR_SUCCESS rather than rv, which is guaranteed to be
  APR_SUCCESS in current code.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1850835 13f79535-47bb-0310-9956-ffa450edef68

5 years ago* modules/md/md_acme_drive.c (acme_driver_init):
Joe Orton [Wed, 9 Jan 2019 09:31:26 +0000 (09:31 +0000)]
* modules/md/md_acme_drive.c (acme_driver_init):
  Remove written-but-not-read variable (gcc 8.x warning).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1850834 13f79535-47bb-0310-9956-ffa450edef68

5 years agoMake mod_dialup.c compile when APR has no thread support.
Stefan Sperling [Tue, 8 Jan 2019 15:02:15 +0000 (15:02 +0000)]
Make mod_dialup.c compile when APR has no thread support.
+1 from covener and jim on dev@

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1850757 13f79535-47bb-0310-9956-ffa450edef68

5 years agoThis just got me. I upgraded macOS to Mojave (w/ latest Xcode) and I always build...
Jim Jagielski [Tue, 8 Jan 2019 13:12:34 +0000 (13:12 +0000)]
This just got me. I upgraded macOS to Mojave (w/ latest Xcode) and I always build w/ maintainer-mode. The problem is that libxml2 will include various unicode/*.h files that have C++ type comments, which causes building to fail (due to Werror). Work around this.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1850745 13f79535-47bb-0310-9956-ffa450edef68

5 years agoAdd new modules to the list of the 2.4 new features list
Christophe Jaillet [Sun, 6 Jan 2019 11:36:54 +0000 (11:36 +0000)]
Add new modules to the list of the 2.4 new features list

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1850545 13f79535-47bb-0310-9956-ffa450edef68

5 years agoAdd compatibility note
Christophe Jaillet [Sun, 6 Jan 2019 11:35:41 +0000 (11:35 +0000)]
Add compatibility note

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1850544 13f79535-47bb-0310-9956-ffa450edef68

5 years agoAdd compatibility note as already noted in new_features_2_4.xml
Christophe Jaillet [Sun, 6 Jan 2019 11:11:20 +0000 (11:11 +0000)]
Add compatibility note as already noted in new_features_2_4.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1850539 13f79535-47bb-0310-9956-ffa450edef68

5 years agoDocs rebuild after copyright year update.
Rainer Jung [Tue, 1 Jan 2019 20:52:56 +0000 (20:52 +0000)]
Docs rebuild after copyright year update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1850117 13f79535-47bb-0310-9956-ffa450edef68

5 years agoHappy New Year 2019
Rainer Jung [Tue, 1 Jan 2019 12:07:58 +0000 (12:07 +0000)]
Happy New Year 2019

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1850098 13f79535-47bb-0310-9956-ffa450edef68

5 years agoUse apr_uint64_t instead of uint64_t; Pointed out by ylavic
Stefan Sperling [Sun, 23 Dec 2018 14:26:06 +0000 (14:26 +0000)]
Use apr_uint64_t instead of uint64_t; Pointed out by ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1849630 13f79535-47bb-0310-9956-ffa450edef68

5 years agoAvoid hard-coded "%ld" format strings in mod_deflate's logging statements.
Stefan Sperling [Sun, 23 Dec 2018 09:26:56 +0000 (09:26 +0000)]
Avoid hard-coded "%ld" format strings in mod_deflate's logging statements.
On some platforms (e.g. OpenBSD) zlib's input/output counters are off_t
instead of ulong, which resuls in format-string warnings from some
compilers (e.g. clang). Work around this by upcasting to uint64_t.
Discussed on dev@ with ylavic and wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1849590 13f79535-47bb-0310-9956-ffa450edef68

5 years agoAnd we are at 2.5.1...
William A. Rowe Jr [Wed, 19 Dec 2018 17:29:05 +0000 (17:29 +0000)]
And we are at 2.5.1...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1849325 13f79535-47bb-0310-9956-ffa450edef68

5 years agoFor posterity
William A. Rowe Jr [Wed, 19 Dec 2018 17:17:52 +0000 (17:17 +0000)]
For posterity

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1849323 13f79535-47bb-0310-9956-ffa450edef68

5 years agomod_http2: mergine trunk+2.4.x code divergences back into a single source with proper...
Stefan Eissing [Wed, 19 Dec 2018 12:57:05 +0000 (12:57 +0000)]
mod_http2: mergine trunk+2.4.x code divergences back into a single source with proper MMN checks.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1849296 13f79535-47bb-0310-9956-ffa450edef68

5 years agoUpdate after backport of r1849174 r1849174
Stefan Eissing [Tue, 18 Dec 2018 13:58:31 +0000 (13:58 +0000)]
Update after backport of r1849174 r1849174

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1849177 13f79535-47bb-0310-9956-ffa450edef68

5 years ago *) mod_md: incorrect behaviour when synchronizing ongoing ACME challenges
Stefan Eissing [Tue, 18 Dec 2018 13:45:25 +0000 (13:45 +0000)]
  *) mod_md: incorrect behaviour when synchronizing ongoing ACME challenges
     have been fixed. [Michael Kaufmann, Stefan Eissing]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1849174 13f79535-47bb-0310-9956-ffa450edef68

5 years agocore: Fix incorrect substitution of env vars in directives containing multiple env...
Hank Ibell [Wed, 5 Dec 2018 19:13:38 +0000 (19:13 +0000)]
core: Fix incorrect substitution of env vars in directives containing multiple env vars.

In ap_resolve_env(), the string returned from getenv() should be copied since
the returned string may be statically allocated.

This fixes an issue where the value for the last env var is substituted for all
env vars in a directive containing multiple env vars.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1848236 13f79535-47bb-0310-9956-ffa450edef68

5 years agoBump seems to have been missed
Jim Jagielski [Mon, 3 Dec 2018 15:05:05 +0000 (15:05 +0000)]
Bump seems to have been missed

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1848047 13f79535-47bb-0310-9956-ffa450edef68

5 years agocore: Split out the ability to parse wildcard files and directories
Graham Leggett [Sun, 25 Nov 2018 21:15:21 +0000 (21:15 +0000)]
core: Split out the ability to parse wildcard files and directories
from the Include/IncludeOptional directives into a generic set of
functions ap_dir_nofnmatch() and ap_dir_fnmatch().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1847430 13f79535-47bb-0310-9956-ffa450edef68

5 years agoArrange the xml display and make it uses xml.
Jean-Frederic Clere [Fri, 23 Nov 2018 17:10:45 +0000 (17:10 +0000)]
Arrange the xml display and make it uses xml.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1847295 13f79535-47bb-0310-9956-ffa450edef68

5 years agofix incorrect rv. Sorry.
Jean-Frederic Clere [Fri, 23 Nov 2018 09:36:36 +0000 (09:36 +0000)]
fix incorrect rv. Sorry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1847234 13f79535-47bb-0310-9956-ffa450edef68

5 years agoAdd error messages and return bad request.
Jean-Frederic Clere [Fri, 23 Nov 2018 09:32:20 +0000 (09:32 +0000)]
Add error messages and return bad request.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1847232 13f79535-47bb-0310-9956-ffa450edef68

5 years ago* modules/dav/main/mod_dav.c (dav_method_propfind): Tag the scratchpool.
Joe Orton [Thu, 15 Nov 2018 13:19:32 +0000 (13:19 +0000)]
* modules/dav/main/mod_dav.c (dav_method_propfind): Tag the scratchpool.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846651 13f79535-47bb-0310-9956-ffa450edef68

5 years agoCHANGES related to r1842010.
Christophe Jaillet [Sun, 11 Nov 2018 08:22:48 +0000 (08:22 +0000)]
CHANGES related to r1842010.

I have choosen "unlikely" because this bug has been around for ever ([1]) and the pool is only "cleared"; that is to say, the data is still valid, but the memory *could* be re-used.

[1]: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c?revision=85717&view=markup&sortby=date#l1610

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846339 13f79535-47bb-0310-9956-ffa450edef68

5 years agofr doc rebuild.
Lucien Gentis [Sat, 10 Nov 2018 13:48:12 +0000 (13:48 +0000)]
fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846310 13f79535-47bb-0310-9956-ffa450edef68

5 years agofr doc XML update.
Lucien Gentis [Sat, 10 Nov 2018 13:47:08 +0000 (13:47 +0000)]
fr doc XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846309 13f79535-47bb-0310-9956-ffa450edef68

6 years ago* support/htpasswd.c (usage): Fix bcrypt round maximum.
Joe Orton [Fri, 9 Nov 2018 16:33:04 +0000 (16:33 +0000)]
* support/htpasswd.c (usage): Fix bcrypt round maximum.

* docs/manual/programs/htpasswd.xml: Document that bcrypt rounds are
capped at 17.

PR: 62078

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846254 13f79535-47bb-0310-9956-ffa450edef68

6 years ago* support/suexec.c (clean_env): Avoid use of sprintf; no functional change.
Joe Orton [Fri, 9 Nov 2018 16:02:21 +0000 (16:02 +0000)]
* support/suexec.c (clean_env): Avoid use of sprintf; no functional change.

PR: 33207

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846253 13f79535-47bb-0310-9956-ffa450edef68

6 years ago mod_http2: version bump, slave connections cleanup strategy changed
Stefan Eissing [Thu, 8 Nov 2018 10:55:08 +0000 (10:55 +0000)]
 mod_http2: version bump, slave connections cleanup strategy changed

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846125 13f79535-47bb-0310-9956-ffa450edef68

6 years ago *) mod_ssl: Fix mod_authz provider for "require ssl" directive to check correctly
Stefan Eissing [Thu, 8 Nov 2018 10:09:21 +0000 (10:09 +0000)]
  *) mod_ssl: Fix mod_authz provider for "require ssl" directive to check correctly
     on HTTP/2 connections. Fixes PR 62654. [Stefan Eissing]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846111 13f79535-47bb-0310-9956-ffa450edef68

6 years ago *) mod_ssl: clear *SSL errors before loading certificates and checking
Stefan Eissing [Mon, 5 Nov 2018 10:37:32 +0000 (10:37 +0000)]
  *) mod_ssl: clear *SSL errors before loading certificates and checking
     afterwards. Otherwise errors are reported when other SSL using modules
     are in play. Fixes PR 62880. [Michael Kaufmann]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1845768 13f79535-47bb-0310-9956-ffa450edef68

6 years ago* Makefile.in (check-yes): Re-run make before running t/TEST in case
Joe Orton [Thu, 1 Nov 2018 11:09:40 +0000 (11:09 +0000)]
* Makefile.in (check-yes): Re-run make before running t/TEST in case
  Apache::Test is stale and needs updating.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1845441 13f79535-47bb-0310-9956-ffa450edef68

6 years agoRevert r1844928 and follow up r1844942.
Yann Ylavic [Sun, 28 Oct 2018 20:55:43 +0000 (20:55 +0000)]
Revert r1844928 and follow up r1844942.

Actually *len can be > 0 here, at least without a change I'm working on but now
think should be discussed first probably. Anyway r1844928 alone is broken, just
rollback for now.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1845064 13f79535-47bb-0310-9956-ffa450edef68

6 years agofr doc rebuild.
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

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

6 years agomod_ssl: follow up to r1844928: revert an unintentional change.
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

6 years agomod_ssl: axe dead code.
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

6 years ago* Add a command to dump some data from the scoreboard
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

6 years agomod_ssl: follow up to r1844779: fix rollback in char_buffer_consume().
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

6 years agorequest: forward as much buckets as possible in ap_request_core_filter().
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

6 years agomod_ssl: bind buffered data to filter's pending data.
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

6 years agoRetsore 2.4.x default behavior modified in r1557580.
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

6 years agodocumentation rebuild
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

6 years agomod_proxy.xml: explicitly state that proxypass cannot be used with If
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

6 years agoFx a likely typo in r1842929: runtimedir plus
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

6 years agofr doc rebuild.
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

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

6 years agoSTATUS: added item to the wishlist for 2.next
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

6 years agodocumentation rebuild
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

6 years agomod_headers.xml: clarify the difference between
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

6 years ago* modules/ssl/ssl_engine_init.c: Fix typo in log message.
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

6 years agoFix a shadow (and useless) variable.
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

6 years ago* modules/md/md_acme_authz.c (md_acme_authz_update): Fix typo in log
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

6 years agorollback 1844001.
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

6 years ago* Correctly merge configurations that have client certificates set
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

6 years agoAnd a way to custom modules to guess and extract ssl variable.
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

6 years agoSSL_read() doesn't distinguish between return value 0 and <0,
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

6 years ago* Ensure that aborted connections are logged as such.
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

6 years agomd_acme_drive.c: remove unused variable
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

6 years agofr doc rebuild.
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

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

6 years agofr doc rebuild.
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

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

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

6 years agompm_event: avoid AH00484 with idle threads
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

6 years agoEliminating some advanced conversion and shadow declaration compiler warnings.
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

6 years agomod_http2: adding defensive code for stream EOS handling, in case the request handler
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

6 years agomod_http2: bringing some signed/unsigned casting goodness, aligning with github mod...
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

6 years agoAdd CHANGES entry
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

6 years agomod_session_cookie: avoid adding the Set-Cookie header
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

6 years agomod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified
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

6 years agoran `build bootstrap` and rebuild transformation. sorry for the noise.
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

6 years agomove es and fr targets to *.utf8 extension. Update transformation
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

6 years agoFix xml validation error
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

6 years agoAdd changes, docs for DefaultStateDir and DavLockDB default change.
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

6 years ago* modules/dav/fs/mod_dav_fs.c (dav_fs_create_server_config): Use
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

6 years agoDefine "state directory" for storing persistent child-writable state,
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

6 years ago* modules/cache/mod_cache_disk.c (write_headers): Handle
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

6 years ago* server/protocol.c (ap_rvputs): Call va_end before returning in the
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

6 years ago* modules/ldap/util_ldap_cache_mgr.c (util_ald_create_caches): Destroy
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

6 years ago* modules/filters/mod_deflate.c
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

6 years ago* modules/mappers/mod_negotiation.c (set_language_quality): Remove
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

6 years ago* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey): Remove
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

6 years ago* modules/slotmem/mod_slotmem_shm.c (restore_slotmem): Remove
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

6 years ago* modules/proxy/ajp_header.c (sc_for_req_header): Zero-initialize
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

6 years agoXForms.
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

6 years agoRemove garbage.
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

6 years agobuild bootstrap
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

6 years agoSpanish html doc files : UTF-8 encoding in order to get rid of HTML entities.
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

6 years agoSpanish html doc files : UTF-8 encoding in order to get rid of HTML entities.
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

6 years agoSpanish html doc files : UTF-8 encoding in order to get rid of HTML entities.
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

6 years ago* Pickup the proxy related configuration for verify mode and verify depth and
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

6 years agoRebuild after XML typo correction.
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

6 years agoXML typo.
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

6 years agoRebuild after fr doc update.
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

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

6 years agoFrench html doc files : UTF-8 encoding in order to get rid of HTML entities.
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

6 years agoThe XSLT Saxon engine warns about some "Ambiguous rule matches".
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

6 years agoRevert r1842160
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

6 years agoThe XSLT Saxon engine warns about some "Ambiguous rule matches".
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