]> granicus.if.org Git - apache/log
apache
5 years agoAdd some additional tests to report badly formatted synopsis.
Christophe Jaillet [Fri, 15 Feb 2019 07:25:54 +0000 (07:25 +0000)]
Add some additional tests to report badly formatted synopsis.
Comment-out these tests because of the noise it generates, but leave it there, if useful for s.o.

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

5 years agomod_proxy_http: follow up to r1853561.
Yann Ylavic [Thu, 14 Feb 2019 08:45:36 +0000 (08:45 +0000)]
mod_proxy_http: follow up to r1853561.

Handle "proxy-sendextracrlf" within the loop too.

Btw, this extra CRLF heresy should go (at least in trunk)

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

5 years agoRevert r1853564.
Yann Ylavic [Thu, 14 Feb 2019 08:40:38 +0000 (08:40 +0000)]
Revert r1853564.

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

5 years agomod_proxy_http: follow up to r1853409: no need to double flush on EOS.
Yann Ylavic [Thu, 14 Feb 2019 08:34:05 +0000 (08:34 +0000)]
mod_proxy_http: follow up to r1853409: no need to double flush on EOS.

[Reverted by r1853565]

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

5 years agomod_proxy_http: follow up to r1853409: don't play with meta-buckets.
Yann Ylavic [Thu, 14 Feb 2019 08:22:49 +0000 (08:22 +0000)]
mod_proxy_http: follow up to r1853409: don't play with meta-buckets.

It's better/simpler to handle the final 0-size chunk within the loop (on EOS).

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

5 years agoCreate the configure for mod_proxy_hcheck when used in BalancerMember.
Jean-Frederic Clere [Thu, 14 Feb 2019 08:14:52 +0000 (08:14 +0000)]
Create the configure for mod_proxy_hcheck when used in BalancerMember.

PR 60757

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

5 years agomod_proxy_http: follow up to r1853409.
Yann Ylavic [Wed, 13 Feb 2019 16:53:50 +0000 (16:53 +0000)]
mod_proxy_http: follow up to r1853409.

Don't send two final 0-size chunks when the last read brigade is a single EOS.

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

5 years agoFix numbering
Christophe Jaillet [Tue, 12 Feb 2019 07:49:32 +0000 (07:49 +0000)]
Fix numbering

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

5 years agomod_proxy_http: rework the flushing strategy when forwarding the request body.
Yann Ylavic [Mon, 11 Feb 2019 21:55:43 +0000 (21:55 +0000)]
mod_proxy_http: rework the flushing strategy when forwarding the request body.

Since the forwarding of 100-continue (end to end) in r1836588, we depended on
reading all of the requested HUGE_STRING_LEN bytes to avoid the flushes, but
this is a bit fragile.

This commit introduces the new stream_reqbody_read() function which will try a
nonblocking read first and, if it fails with EAGAIN, will flush on the backend
side before blocking for the next client side read.

We can then use it in stream_reqbody_{chunked,cl}() to flush client forwarded
data only when necessary. This both allows "optimal" flushing and simplifies
code (note that spool_reqbody_cl() also makes use of the new function but not
its nonblocking/flush functionality, thus only for consistency with the two
others, simplification and common error handling).

Also, since proxy_http_req_t::flushall/subprocess_env::proxy-flushall are now
meaningless (and unused) on the backend side, they are renamed respectively to
prefetch_nonblocking/proxy-prefetch-nonblocking, and solely determine whether
to prefetch in nonblocking mode or not. These flags were trunk only and may
not be really useful if we decided to prefetch in nonblocking mode in any case,
but for 2.4.x the opt-in looks wise.

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

5 years agoFollow up to r1847430.
Christophe Jaillet [Sun, 10 Feb 2019 10:14:37 +0000 (10:14 +0000)]
Follow up to r1847430.

- These flags are not for apr_dir_ function. Clarify comment.
- Initialize 'depth', especially when AP_DIR_FLAG_RECURSIVE is explicitelly required.
- Avoid an harmless over-allocation .

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 9 Feb 2019 16:30:38 +0000 (16:30 +0000)]
fr doc rebuild.

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

5 years agoXML file fr doc update.
Lucien Gentis [Sat, 9 Feb 2019 16:29:03 +0000 (16:29 +0000)]
XML file fr doc update.

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

5 years agomod_rewrite doc rebuild
Luca Toscano [Sat, 9 Feb 2019 14:15:27 +0000 (14:15 +0000)]
mod_rewrite doc rebuild

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

5 years agomod_rewrite.xml: add an example about override behavior
Luca Toscano [Sat, 9 Feb 2019 14:14:43 +0000 (14:14 +0000)]
mod_rewrite.xml: add an example about override behavior

A user in PR 63051 was confused about the default behavior
of mod_rewrite (override) when merging two sections in the
directory context at the same nesting level. I was confused
as well, but after a quick look at the code I figured out that
RewriteOptions Inherit seems to solve the issue (naming is,
in this case, a bit counter intuitive). I hope that I added
a good clarification in the code, if not please amend it as
you think it's best!

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

5 years agoFix a race condition.
Christophe Jaillet [Fri, 8 Feb 2019 06:14:47 +0000 (06:14 +0000)]
Fix a race condition.
Authentication with valid credentials could be refused in case of concurrent accesses from different users.

PR 63124 [Simon Kappel <simon.kappel axis.com>]

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

5 years agohttp2: mark tasks' pools.
Yann Ylavic [Thu, 7 Feb 2019 22:32:22 +0000 (22:32 +0000)]
http2: mark tasks' pools.

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

5 years agoFollow up to r1853133: CHANGES entry.
Yann Ylavic [Thu, 7 Feb 2019 22:23:27 +0000 (22:23 +0000)]
Follow up to r1853133: CHANGES entry.

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

5 years agomod_ssl: unset FIPS mode only if we set it.
Yann Ylavic [Thu, 7 Feb 2019 13:38:12 +0000 (13:38 +0000)]
mod_ssl: unset FIPS mode only if we set it.

If FIPS mode is set by default per openssl lib/module, we should not
unset it on restart or it might never be set again.

PR 63136

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

5 years ago* server/core.c (core_pre_config): Reset state dir during pre_config.
Joe Orton [Tue, 5 Feb 2019 10:11:44 +0000 (10:11 +0000)]
* server/core.c (core_pre_config): Reset state dir during pre_config.

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

5 years agodocumentation rebuild
Luca Toscano [Sun, 3 Feb 2019 01:33:02 +0000 (01:33 +0000)]
documentation rebuild

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 2 Feb 2019 14:20:47 +0000 (14:20 +0000)]
fr doc rebuild.

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

5 years agoXML fr doc files updates.
Lucien Gentis [Sat, 2 Feb 2019 14:18:54 +0000 (14:18 +0000)]
XML fr doc files updates.

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

5 years agodelete a blanck space
Luis Gil [Wed, 30 Jan 2019 22:19:13 +0000 (22:19 +0000)]
delete a blanck space

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

5 years agoFixing typos in documentation files.
Luis Gil [Tue, 29 Jan 2019 22:37:40 +0000 (22:37 +0000)]
Fixing typos in documentation files.
Bug issue https://bz.apache.org/bugzilla/show_bug.cgi?id=63122

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

5 years agoMake proxy modules compile if APR_HAS_THREADS is not defined.
Stefan Sperling [Tue, 29 Jan 2019 12:28:35 +0000 (12:28 +0000)]
Make proxy modules compile if APR_HAS_THREADS is not defined.

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

5 years ago * inc http2 version number to distinguish to github released version
Stefan Eissing [Mon, 28 Jan 2019 10:43:44 +0000 (10:43 +0000)]
 * inc http2 version number to distinguish to github released version
 * further disentangle streama and request memory pools

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

5 years ago *) mod_http2: Configuration directoves H2Push and H2Upgrade can now be specified per
Stefan Eissing [Mon, 28 Jan 2019 10:27:08 +0000 (10:27 +0000)]
  *) mod_http2: Configuration directoves H2Push and H2Upgrade can now be specified per
     Location/Directory, e.g. disabling PUSH for a specific set of resources. [Stefan Eissing]

  *) mod_http2: HEAD requests to some module such as mod_cgid caused the stream to
     terminate improperly and cause a HTTP/2 PROTOCOL_ERROR.
     Fixes <https://github.com/icing/mod_h2/issues/167>. [Michael Kaufmann]

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

5 years agofr doc rebuild.
Lucien Gentis [Sun, 27 Jan 2019 14:15:48 +0000 (14:15 +0000)]
fr doc rebuild.

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

5 years agofr doc XML update.
Lucien Gentis [Sun, 27 Jan 2019 14:14:58 +0000 (14:14 +0000)]
fr doc XML update.

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

5 years agofr doc rebuild.
Lucien Gentis [Sun, 27 Jan 2019 14:08:09 +0000 (14:08 +0000)]
fr doc rebuild.

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

5 years agofr doc XML updates.
Lucien Gentis [Sun, 27 Jan 2019 14:06:35 +0000 (14:06 +0000)]
fr doc XML updates.

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

5 years agoQuireference extract the default value of a directive from the <default> of the...
Christophe Jaillet [Sun, 27 Jan 2019 13:49:29 +0000 (13:49 +0000)]
Quireference extract the default value of a directive  from the <default> of the corresponding <directivesynopsis> block.

The current implementation  expects <default> to be formated like:
directive_name default_value

If the directive name is not there, no default value can be extracted and it is missing in the quickreference table.

This commit adds a basic check to see if the formating looks correct. It catches cases where the directive name is  omited or is misspelled.

If it generates too much noise, feel free to revert or improve :)

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

5 years agoFix typo (s/ProxyExpressDBMFile/ProxyExpressDBMType/)
Christophe Jaillet [Sun, 27 Jan 2019 08:18:45 +0000 (08:18 +0000)]
Fix typo (s/ProxyExpressDBMFile/ProxyExpressDBMType/)
PR 63119.

Move compatibility note in the module synopsis instead of repeating it in all directives.
Fix the way <default> values are given, so that they can be reflected in quickreference.html.
Fix the style used in <syntax> to be consistent with the documentation.
Improve syntax highlight.

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

5 years agoRemove a useless compatibility note.
Christophe Jaillet [Sat, 26 Jan 2019 12:51:05 +0000 (12:51 +0000)]
Remove a useless compatibility note.
It is already stated at the very begining of the page.

Add a missing ')' to ease reading

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

5 years agomod_ssl: give mod_md the chance to override certificate after ALPN protocol negotiation.
Stefan Eissing [Fri, 25 Jan 2019 13:33:07 +0000 (13:33 +0000)]
mod_ssl: give mod_md the chance to override certificate after ALPN protocol negotiation.

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

5 years agomod_http2: fixed slave connection keepalives counter.
Stefan Eissing [Fri, 25 Jan 2019 09:27:39 +0000 (09:27 +0000)]
mod_http2: fixed slave connection keepalives counter.

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

5 years agomod_http2: enable re-use of slave connections again.
Stefan Eissing [Thu, 24 Jan 2019 15:25:52 +0000 (15:25 +0000)]
mod_http2: enable re-use of slave connections again.

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

5 years agoreverting last change
Stefan Eissing [Thu, 24 Jan 2019 15:21:04 +0000 (15:21 +0000)]
reverting last change

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

5 years agomod_http2: enable re-use of slave connections again.
Stefan Eissing [Thu, 24 Jan 2019 15:10:34 +0000 (15:10 +0000)]
mod_http2: enable re-use of slave connections again.

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

5 years agorevert of r808895 somehow missed mod_proxy_ftp
Eric Covener [Wed, 23 Jan 2019 18:25:50 +0000 (18:25 +0000)]
revert of r808895 somehow missed mod_proxy_ftp

r808895 added `ServerTokens OFF` so some modules were
switched from ap_get_server_banner() to
ap_get_server_description() so they would never be empty.

But ap_get_server_description() is documnented as being for local
use only, so it was not really a suitable replacement much less
w/ `ServerTokens OFF` subsequently taken out.

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

5 years agoXforms
Rainer Jung [Tue, 22 Jan 2019 09:53:04 +0000 (09:53 +0000)]
Xforms

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

5 years agoCopy the "Note about /" note from the Location
Rainer Jung [Tue, 22 Jan 2019 09:27:15 +0000 (09:27 +0000)]
Copy the "Note about /" note from the Location
explanation to the LocationMatch explanation.
Probably more people use LocationMatch than
Location with "~".

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

5 years agoFix a typo reported by [stephane.blondon gmail.com]
Christophe Jaillet [Sun, 20 Jan 2019 09:55:41 +0000 (09:55 +0000)]
Fix a typo reported by [stephane.blondon gmail.com]
PR 63092

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 19 Jan 2019 14:42:23 +0000 (14:42 +0000)]
fr doc rebuild.

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

5 years agoXML fr doc update.
Lucien Gentis [Sat, 19 Jan 2019 14:22:40 +0000 (14:22 +0000)]
XML fr doc update.

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

5 years agoAdd compatibility note missing in r1740967
Christophe Jaillet [Fri, 18 Jan 2019 20:50:40 +0000 (20:50 +0000)]
Add compatibility note missing in r1740967

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

5 years agoClarify potentially unsuccessful success results.
William A. Rowe Jr [Thu, 17 Jan 2019 17:19:04 +0000 (17:19 +0000)]
Clarify potentially unsuccessful success results.

Curious why modules/aaa/mod_authz_dbm.c:get_dbm_grp() doesn't need the same
net changes?

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

5 years agomod_lua was moved to stable; https://s.apache.org/Xnh1
Daniel Gruno [Tue, 15 Jan 2019 12:40:11 +0000 (12:40 +0000)]
mod_lua was moved to stable; https://s.apache.org/Xnh1
also linting.

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

5 years agofix a misleading comment about s->defn_name
Eric Covener [Tue, 15 Jan 2019 10:14:57 +0000 (10:14 +0000)]
fix a misleading comment about s->defn_name

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

5 years agoReverse the order of 2 tests to potentially save a few cycles.
Christophe Jaillet [Sun, 13 Jan 2019 12:51:42 +0000 (12:51 +0000)]
Reverse the order of 2 tests to potentially save a few cycles.

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 12 Jan 2019 15:42:15 +0000 (15:42 +0000)]
fr doc rebuild.

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

5 years agoXML fr doc update.
Lucien Gentis [Sat, 12 Jan 2019 15:40:57 +0000 (15:40 +0000)]
XML fr doc update.

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 12 Jan 2019 15:31:26 +0000 (15:31 +0000)]
fr doc rebuild.

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

5 years agoXML fr doc update.
Lucien Gentis [Sat, 12 Jan 2019 15:29:08 +0000 (15:29 +0000)]
XML fr doc update.

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

5 years agoTypo.
Lucien Gentis [Sat, 12 Jan 2019 15:28:10 +0000 (15:28 +0000)]
Typo.

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

5 years agoGive a littlet breath before the permalink
Christophe Jaillet [Sat, 12 Jan 2019 13:50:26 +0000 (13:50 +0000)]
Give a littlet breath before the permalink

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

5 years agoFollow up to r1828588.
Christophe Jaillet [Sat, 12 Jan 2019 13:38:03 +0000 (13:38 +0000)]
Follow up to r1828588.

Update css to have permalink more in line with httpd.a.o:
   - default to white (blue on dark-blue is not really visible)
   - visible only when the mouse is over the corresponding heading

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

5 years agoRemove the default CacheKeyBaseURL value, it doesn't have any.
Christophe Jaillet [Sat, 12 Jan 2019 08:32:14 +0000 (08:32 +0000)]
Remove the default CacheKeyBaseURL value, it doesn't have any.

Improve syntax highlight and hyper-links.

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

5 years agoWhen a :port is included in the CacheKeyBaseURL the ":" is lost from the actual cache...
Christophe Jaillet [Sat, 12 Jan 2019 07:51:48 +0000 (07:51 +0000)]
When a :port is included in the CacheKeyBaseURL the ":" is lost from the actual cache key value.  This doesn't harm apache by itself, the real problem arise if some external program which "knows" about the cache keys structure is used to modify the cache.

When CacheKeyBaseURL is not use, the ":" is kept.

So, be consistent when building the key and keep the ":" in all cases.

PR 53915 [Rein Tollevik <rein basefarm.no>]

+ merge 2 lines of a comment to have it more compact

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

5 years agoFix a typo
Christophe Jaillet [Fri, 11 Jan 2019 21:24:47 +0000 (21:24 +0000)]
Fix a typo

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

5 years agoFix websocket proxy over UDS.
Christophe Jaillet [Fri, 11 Jan 2019 19:31:43 +0000 (19:31 +0000)]
Fix websocket proxy over UDS.

configuration example:
<Location "/apis">
ProxyPass unix:/var/run/unix.sock|ws://127.0.0.1/api
</Location>

Currently 'ap_proxy_get_worker()' can't get matched pre-defined worker because
of different uri formatting in 'proxy_wstunnel_canon()' and ap_proxy_define_worker()'

PR 62932 <pavel dcmsys.com>

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

5 years agoLanguagePriority should be case-insensitive in order to match AddLanguage behavior...
Christophe Jaillet [Thu, 10 Jan 2019 22:41:59 +0000 (22:41 +0000)]
LanguagePriority should be case-insensitive in order to match AddLanguage behavior. PR 39730

Test case  added in r1850983

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

5 years agoAlways decode session attributes early.
Hank Ibell [Thu, 10 Jan 2019 15:52:31 +0000 (15:52 +0000)]
Always decode session attributes early.

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

5 years ago* modules/ssl/ssl_engine_io.c (bio_filter_out_write,
Joe Orton [Thu, 10 Jan 2019 15:46:07 +0000 (15:46 +0000)]
* modules/ssl/ssl_engine_io.c (bio_filter_out_write,
  bio_filter_in_read): Clear retry flags before aborting
  on client-initiated reneg.

PR: 63052

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

5 years agoResync several generated docs
William A. Rowe Jr [Wed, 9 Jan 2019 20:21:41 +0000 (20:21 +0000)]
Resync several generated docs

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

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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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

5 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