]> granicus.if.org Git - apache/log
apache
5 years agoUpdate docs and bump logno for PKCS#11 support change in r1835615.
Joe Orton [Wed, 11 Jul 2018 07:45:57 +0000 (07:45 +0000)]
Update docs and bump logno for PKCS#11 support change in r1835615.

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

5 years ago* acinclude.m4 (APACHE_GEN_MAKEFILES): Respect configure --quiet by
Joe Orton [Tue, 10 Jul 2018 15:58:27 +0000 (15:58 +0000)]
* acinclude.m4 (APACHE_GEN_MAKEFILES): Respect configure --quiet by
  sending fastgen output to the appropriate fd.

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

6 years agoXML update.
Lucien Gentis [Sat, 7 Jul 2018 14:48:29 +0000 (14:48 +0000)]
XML update.

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

6 years agoReview by popcorner with further edits by both CodeingBoy and popcorner,
William A. Rowe Jr [Fri, 6 Jul 2018 21:56:50 +0000 (21:56 +0000)]
Review by popcorner with further edits by both CodeingBoy and popcorner,
their discussion at https://github.com/popcorner/chect/pull/1

Added CONTENT_LANGUAGE variable for both translations.

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

6 years ago* modules/ssl/ssl_engine_pphrase.c: Add logno tags.
Joe Orton [Fri, 6 Jul 2018 12:03:27 +0000 (12:03 +0000)]
* modules/ssl/ssl_engine_pphrase.c: Add logno tags.

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

6 years agoHook up PKCS#11 PIN entry through configured passphrase entry method.
Joe Orton [Fri, 6 Jul 2018 12:01:29 +0000 (12:01 +0000)]
Hook up PKCS#11 PIN entry through configured passphrase entry method.

* modules/ssl/ssl_engine_pphrase.c: Add wrappers for OpenSSL UI * API
  around passphrase entry.
  (modssl_load_engine_keypair): Take vhost ID and use above rather than
  default OpenSSL UI.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Pass vhost ID.

Submitted by: Anderson Sasaki<ansaski redhat.com>, jorton

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

6 years agoXML update.
Lucien Gentis [Thu, 5 Jul 2018 15:53:10 +0000 (15:53 +0000)]
XML update.

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

6 years agoXML updates.
Lucien Gentis [Thu, 5 Jul 2018 14:51:21 +0000 (14:51 +0000)]
XML updates.

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

6 years agoOn the trunk:
Stefan Eissing [Thu, 5 Jul 2018 10:21:00 +0000 (10:21 +0000)]
On the trunk:

 * silencing gcc uninitialized warning
 * refrainning from apr_table_addn() use since pool debug assumptions are in conflict
 * adding more assertions
 * copy-porting changes to base64 encoding code from mod_md

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

6 years agoOn the trunk:
Stefan Eissing [Thu, 5 Jul 2018 10:18:46 +0000 (10:18 +0000)]
On the trunk:

Silencing a gcc uninitialized warning.

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

6 years agoglobal ap_server_conf must be reset when process->pconf is cleared
Eric Covener [Thu, 5 Jul 2018 02:33:34 +0000 (02:33 +0000)]
global ap_server_conf must be reset when process->pconf is cleared

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

6 years agoRebuild.
Lucien Gentis [Tue, 3 Jul 2018 09:22:09 +0000 (09:22 +0000)]
Rebuild.

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

6 years agoXML updates.
Lucien Gentis [Tue, 3 Jul 2018 09:21:10 +0000 (09:21 +0000)]
XML updates.

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

6 years agobackported
Eric Covener [Mon, 2 Jul 2018 20:49:25 +0000 (20:49 +0000)]
backported

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

6 years agoSynch with 2.4.x
Christophe Jaillet [Fri, 29 Jun 2018 16:33:53 +0000 (16:33 +0000)]
Synch with 2.4.x

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

6 years agoBe more consistent on how we display the paramters of a directive
Christophe Jaillet [Fri, 29 Jun 2018 16:31:34 +0000 (16:31 +0000)]
Be more consistent on how we display the paramters of a directive

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

6 years agomod_md: more robust handling of http-01 challenges and hands-off when module
Stefan Eissing [Fri, 29 Jun 2018 10:52:07 +0000 (10:52 +0000)]
mod_md: more robust handling of http-01 challenges and hands-off when module
     should not be involved, e.g. challenge setup by another ACME client.

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

6 years agoRegenerate.
Joe Orton [Fri, 29 Jun 2018 10:39:05 +0000 (10:39 +0000)]
Regenerate.

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

6 years agoFollow up to r1833368: apr_crypto_prng_after_fork() changed its args.
Yann Ylavic [Wed, 27 Jun 2018 22:29:53 +0000 (22:29 +0000)]
Follow up to r1833368: apr_crypto_prng_after_fork() changed its args.

Once again :p

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

6 years agodocumentation rebuild
Luca Toscano [Wed, 27 Jun 2018 17:49:33 +0000 (17:49 +0000)]
documentation rebuild

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

6 years agomod_proxy.xml: add vhost/server contextes for ProxySet
Luca Toscano [Wed, 27 Jun 2018 17:49:17 +0000 (17:49 +0000)]
mod_proxy.xml: add vhost/server contextes for ProxySet

While reading PR 62422 I noticed that ProxySet's available
contextes list only 'directory', that looks odd:

AP_INIT_RAW_ARGS("ProxySet", set_proxy_param, NULL, RSRC_CONF|ACCESS_CONF

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

6 years agoAllow openssl.pc to be in lib64 (like other components).
Jean-Frederic Clere [Wed, 27 Jun 2018 12:15:32 +0000 (12:15 +0000)]
Allow openssl.pc to be in lib64 (like other components).

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

6 years agoRender <code> in bold in man pages, matching commonly used style in
Joe Orton [Wed, 27 Jun 2018 07:24:39 +0000 (07:24 +0000)]
Render <code> in bold in man pages, matching commonly used style in
both help2man and the standard DocBook XSL stylesheets for man output.

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

6 years agodocumentation rebuild
Luca Toscano [Wed, 27 Jun 2018 06:34:06 +0000 (06:34 +0000)]
documentation rebuild

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

6 years agooutput-filters.xml: add a use case study
Luca Toscano [Wed, 27 Jun 2018 06:32:53 +0000 (06:32 +0000)]
output-filters.xml: add a use case study

While working on http://svn.apache.org/r1833875
I learned a ton of non trivial things about
the output filter chain and how to design a filter,
and I thought to report them as a separate section
of the output filters doc page. Feedback is welcome
for inaccuracies or wrong understanding :)

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

6 years agoRe-allow '_' (underscore) in hostnames.
Eric Covener [Mon, 25 Jun 2018 13:18:24 +0000 (13:18 +0000)]
Re-allow '_' (underscore) in hostnames.

'_' was not permitted in hostnames since 2.4.25's "HTTP Strict"
changes.

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

6 years agoSynch with 2.4.x.
Christophe Jaillet [Sun, 24 Jun 2018 20:41:09 +0000 (20:41 +0000)]
Synch with 2.4.x.

mod_http2 is no more marked as experimental.

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

6 years agoThis is not part of 2.4.x yet.
Christophe Jaillet [Sun, 24 Jun 2018 20:16:17 +0000 (20:16 +0000)]
This is not part of 2.4.x yet.

Add a reference to 2.5 for regex within AuthName and update the misleading 2.4.x reference in AuthType

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

6 years agoxforms
Christophe Jaillet [Sun, 24 Jun 2018 19:28:04 +0000 (19:28 +0000)]
xforms

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

6 years agoFix typo
Christophe Jaillet [Sun, 24 Jun 2018 19:27:36 +0000 (19:27 +0000)]
Fix typo

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

6 years agoxforms
Christophe Jaillet [Sun, 24 Jun 2018 19:22:14 +0000 (19:22 +0000)]
xforms

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

6 years agoSynch with 2.4.x.
Christophe Jaillet [Sun, 24 Jun 2018 19:21:53 +0000 (19:21 +0000)]
Synch with 2.4.x.
mod_http2 is nor more experimental.

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

6 years agoxforms
Christophe Jaillet [Sun, 24 Jun 2018 19:19:11 +0000 (19:19 +0000)]
xforms

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

6 years agoMore s/code/module/
Christophe Jaillet [Sun, 24 Jun 2018 19:15:34 +0000 (19:15 +0000)]
More s/code/module/
Prefer <module> to hard coded <a href=...>
Add some direct links to directives
Split long lines

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

6 years agoFix a typo and use <module> instead of <code> in order to have links and a better...
Christophe Jaillet [Sun, 24 Jun 2018 18:55:12 +0000 (18:55 +0000)]
Fix a typo and use <module> instead of <code> in order to have links and a better syntax highlight

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

6 years agoAdd a CHANGES entry
Christophe Jaillet [Sun, 24 Jun 2018 17:04:00 +0000 (17:04 +0000)]
Add a CHANGES entry

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

6 years agoSynch with 2.4.x.
Christophe Jaillet [Sun, 24 Jun 2018 15:47:12 +0000 (15:47 +0000)]
Synch with 2.4.x.

Change position of #loadModule mod_proxy_http2 to keep alphabetical order.

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

6 years agodocumentation rebuild
Luca Toscano [Sun, 24 Jun 2018 10:30:55 +0000 (10:30 +0000)]
documentation rebuild

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

6 years agomod_proxy.xml: follow up r1834203
Luca Toscano [Sun, 24 Jun 2018 10:29:49 +0000 (10:29 +0000)]
mod_proxy.xml: follow up r1834203

Add more precise info and warn notes about
variable interpolation.

PR: 62477

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

6 years agoFunction used as 'apr_reslist_destructor' when calling 'apr_reslist_create()' should...
Christophe Jaillet [Sat, 23 Jun 2018 21:52:09 +0000 (21:52 +0000)]
Function used as 'apr_reslist_destructor' when calling 'apr_reslist_create()' should have the following prototype:

apr_status_t (*apr_reslist_destructor)(void *resource, void *params, apr_pool_t *pool);

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

6 years agoFix some style issue to improve readability:
Christophe Jaillet [Sat, 23 Jun 2018 20:10:54 +0000 (20:10 +0000)]
Fix some style issue to improve readability:
   - break long lines
   - remove un-needed 'return' statement
   - fix the position of the first { in function

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

6 years agoFollow-up to r1754161
Christophe Jaillet [Sat, 23 Jun 2018 20:06:46 +0000 (20:06 +0000)]
Follow-up to r1754161

Fix a missed s/backconn/backend connection/ in an un-likely error path.

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

6 years agoRemove a compatibility note that is not relevant any more.
Christophe Jaillet [Sat, 23 Jun 2018 17:53:00 +0000 (17:53 +0000)]
Remove a compatibility note that is not relevant any more.

The corresponding code was added in r1807709 but reverted in r1827760.
The compatibility note was added as part of r1807869 but was not removed when the code has been axed.

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

6 years agoRebuild.
Lucien Gentis [Sat, 23 Jun 2018 14:23:13 +0000 (14:23 +0000)]
Rebuild.

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

6 years agoXML update.
Lucien Gentis [Sat, 23 Jun 2018 14:22:19 +0000 (14:22 +0000)]
XML update.

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

6 years agoXML update.
Lucien Gentis [Sat, 23 Jun 2018 14:21:30 +0000 (14:21 +0000)]
XML update.

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

6 years agoXML update.
Lucien Gentis [Sat, 23 Jun 2018 14:20:10 +0000 (14:20 +0000)]
XML update.

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

6 years agoXML update.
Lucien Gentis [Sat, 23 Jun 2018 14:19:06 +0000 (14:19 +0000)]
XML update.

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

6 years agoIf several parameters are used in a AuthzProviderAlias directive, if these parameters...
Christophe Jaillet [Sat, 23 Jun 2018 14:17:26 +0000 (14:17 +0000)]
If several parameters are used in a AuthzProviderAlias directive, if these parameters are not enclosed in quotation mark, only the first one is handled. The other ones are silently ignored.

Add a message to warn about such a spurious configuration.
PR 62469

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

6 years agodocumentation rebuild
Luca Toscano [Sat, 23 Jun 2018 13:14:17 +0000 (13:14 +0000)]
documentation rebuild

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

6 years agomod_proxy.xml: clarify the usage of variable interpolation
Luca Toscano [Sat, 23 Jun 2018 13:12:09 +0000 (13:12 +0000)]
mod_proxy.xml: clarify the usage of variable interpolation

PR: 62477

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

6 years agoAxe some CHANGES entries backported to 2.4.x.
Yann Ylavic [Fri, 22 Jun 2018 10:57:24 +0000 (10:57 +0000)]
Axe some CHANGES entries backported to 2.4.x.

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

6 years agoCompat 2.4.24 for SSLOCSPEnable leaf (r1834089) and ResponseFieldSize (r1834093).
Yann Ylavic [Fri, 22 Jun 2018 10:52:29 +0000 (10:52 +0000)]
Compat 2.4.24 for SSLOCSPEnable leaf (r1834089) and ResponseFieldSize (r1834093).

This was already adjusted on merge to 2.4.x, no need to backport.

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

6 years agoImprove syntax highlight and add the default value of ProxyHTMLBufSize in the descrip...
Christophe Jaillet [Thu, 21 Jun 2018 18:18:35 +0000 (18:18 +0000)]
Improve syntax highlight and add the default value of ProxyHTMLBufSize in the description of the directive.

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

6 years agore-add uwsgi
Jim Jagielski [Thu, 21 Jun 2018 13:40:02 +0000 (13:40 +0000)]
re-add uwsgi

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

6 years agoxforms
Jim Jagielski [Thu, 21 Jun 2018 13:38:20 +0000 (13:38 +0000)]
xforms

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

6 years agoNore userland/PR change
Jim Jagielski [Thu, 21 Jun 2018 13:32:02 +0000 (13:32 +0000)]
Nore userland/PR change

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

6 years agoAdd default schema ports for websockets
Jim Jagielski [Thu, 21 Jun 2018 13:28:51 +0000 (13:28 +0000)]
Add default schema ports for websockets
PR:62480
Lubos Uhliarik <luhliari@redhat.com>

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

6 years agodocumentation rebuild
Luca Toscano [Wed, 20 Jun 2018 20:47:40 +0000 (20:47 +0000)]
documentation rebuild

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

6 years agoRemove some trailing spaces to synch trunk with 2.4
Christophe Jaillet [Wed, 20 Jun 2018 19:45:32 +0000 (19:45 +0000)]
Remove some trailing spaces to synch trunk with 2.4

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

6 years agomod_cache: Per RFC 7234 section 5.3 an invalid
Rainer Jung [Tue, 19 Jun 2018 22:40:19 +0000 (22:40 +0000)]
mod_cache: Per RFC 7234 section 5.3 an invalid
Expires header value must be interpreted as a
time in the past. So apply the logic concerning
"CacheStoreExpired" and "max-age" and "s-maxage"
handling, which we are already using for a valid
Expires header containing a time in the past,
also to the case of an invalid Expires header.

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

6 years agomod_ratelimit: fix behavior with proxied content
Luca Toscano [Tue, 19 Jun 2018 22:28:24 +0000 (22:28 +0000)]
mod_ratelimit: fix behavior with proxied content

mod_ratelimit works by splitting data in "chunks"
to send to the client, sleeping a predefined amount
of time between them (200ms). So for example,
a rate-limit 40 value would correspond to a chunk size
of 8192 bytes, flushed to the client every 200ms.

The idea works fine when httpd directly serves the
content, since the filter will be called once with
a single bucket brigade. In the context of a proxied
content though the filter is likely to be called multiple
times, with a bucket brigade size that corresponds to
the maximum allowed buffer size. If this value is lower
or higher than the chunk size, the filter will not
properly rate limit the data going to the client.

This patch solves the problem with two fix:
1) do_sleep is now stored in the ctx context struct,
   so if the filter is invoked multiple times it
   will still sleep when needed. For example, say
   that the chunk_size is 8192 and the bucket brigate
   len is 10240: the filter will flush 8192 bytes
   on the first invocation, sleep 200ms, flush the
   remaining bytes and then finish. The next invocation
   will do the same, clearly not leading to the
   correct "sleeping pattern".
2) The example above highlights also another issue:
   mod_ratelimit should  flush only chunk_size bytes
   at the time (I am now excluding the burst calculation
   from the picture), and buffer between invocations
   unless the brigade contains EOS.

The change has been tested with various scenarios and
it looks working as expected, but of course more
feedback/testing is welcome.

The original patch was written by me and then Yann
refactored the code to be more precise and efficient,
basically transforming an axe in a wonderful Japanese
katana sword, so credits to him for this work.

PR: 62362

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

6 years agoadd server_rec to log.c fatal startup errors
Eric Covener [Tue, 19 Jun 2018 12:07:19 +0000 (12:07 +0000)]
add server_rec to log.c fatal startup errors

Not strictly necessary for trunk, but in 2.4.x if the main ErrorLog is
using syslog, these messages are lost.  In trunk, the low-level logging
routines reach up and find the syslog provider when no server_rec is provided
but that backport is stalled.

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

6 years agomod_ssl: build with LibreSSL.
Yann Ylavic [Fri, 15 Jun 2018 14:35:31 +0000 (14:35 +0000)]
mod_ssl: build with LibreSSL.

LibreSSL seems to be openssl-1.1 API compatible only in version 2.8 (master).
So use that for MODSSL_USE_OPENSSL_PRE_1_1_API instead of 2.7, the two 2.7
compatibility-exceptions are handled explicitely but overall it's simpler.

Regarding CRYPTO_malloc_init vs OPENSSL_malloc_init, libreSSL uses none, the
former used to be a no-op but depends is LIBRESSL_INTERNAL in latest versions,
while the latter has never been (and will never be) defined. So don't call any
with LibreSSL.

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

6 years agomod_ssl: use SSL_HAVE_PROTOCOL_TLSV1_3 to check for compiled in TLS 1.3.
Yann Ylavic [Fri, 15 Jun 2018 11:25:46 +0000 (11:25 +0000)]
mod_ssl: use SSL_HAVE_PROTOCOL_TLSV1_3 to check for compiled in TLS 1.3.

More meaningful than SSL_OP_NO_TLSv1_3, hopefully...

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

6 years agomod_ssl: disable check for client initiated renegotiations with TLS 1.3.
Yann Ylavic [Fri, 15 Jun 2018 11:12:19 +0000 (11:12 +0000)]
mod_ssl: disable check for client initiated renegotiations with TLS 1.3.

This is already forbidden by the protocol, enforced by OpenSSL, and the
current logic can't work (ssl_callback_Info() may be called multiple times
with TLS 1.3).

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

6 years agoFollow up to r1833368: share openssl between modules.
Yann Ylavic [Wed, 13 Jun 2018 09:54:16 +0000 (09:54 +0000)]
Follow up to r1833368: share openssl between modules.

Both libapr[-util], the core PRNG, mod_ssl, mod_crypto and mod_session_crypto
can use the same crypto library (e.g. openssl), use the new APR crypto loading
API so that they can work together and initialize/terminate the lib either once
for all or on demand and reusable by the others.

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

6 years agoRemove extra and un-needed ""
Christophe Jaillet [Tue, 12 Jun 2018 17:14:23 +0000 (17:14 +0000)]
Remove extra and un-needed ""

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

6 years agoapr_pcalloc can be turned into apr_palloc (the allocated memory is fully initialized...
Christophe Jaillet [Tue, 12 Jun 2018 17:13:27 +0000 (17:13 +0000)]
apr_pcalloc can be turned into apr_palloc (the allocated memory is fully initialized by the subsequent memcpy/strcpy) and '(int)strlen(p)' can be replaced by 'plen - 1' to save some cycles.

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

6 years agoFollow up to r1833368: fix "mixed declarations and code" warning (buildbot).
Yann Ylavic [Tue, 12 Jun 2018 12:48:42 +0000 (12:48 +0000)]
Follow up to r1833368: fix "mixed declarations and code" warning (buildbot).

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

6 years agoFollow up to r1833368: apr_crypto_prng_after_fork() now used a PID.
Yann Ylavic [Tue, 12 Jun 2018 08:01:04 +0000 (08:01 +0000)]
Follow up to r1833368: apr_crypto_prng_after_fork() now used a PID.

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

6 years agoMake use of the new apr_crypto_rng API if available.
Yann Ylavic [Mon, 11 Jun 2018 23:43:16 +0000 (23:43 +0000)]
Make use of the new apr_crypto_rng API if available.

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

6 years agoRebuild.
Lucien Gentis [Sat, 9 Jun 2018 14:34:02 +0000 (14:34 +0000)]
Rebuild.

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

6 years agoXML update.
Lucien Gentis [Sat, 9 Jun 2018 14:32:58 +0000 (14:32 +0000)]
XML update.

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

6 years ago* configure.in, Makefile.in: Handle no-test-suite case through
Joe Orton [Thu, 7 Jun 2018 13:17:27 +0000 (13:17 +0000)]
* configure.in, Makefile.in: Handle no-test-suite case through
  check-no rule.  Only regenerate the test suite on repeated
  "make check" run if a header file has changed.

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

6 years agoAvoid cyclic dependency by moving ap_set_etag() from module http to core.
Yann Ylavic [Wed, 6 Jun 2018 21:04:21 +0000 (21:04 +0000)]
Avoid cyclic dependency by moving ap_set_etag() from module http to core.

This function, along with ap_make_etag(), is used by the default_handler in
core.c, and in several modules other than builtin mod_http, breaking static
linking and httpdunit tests build.

The move is done by "svn move modules/http/http_etag.c server/util_etag.c".
MMN major bumped, not backportable (as is) to 2.4.x.

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

6 years ago* modules/http/http_request.c (ap_process_request_after_handler,
Joe Orton [Wed, 6 Jun 2018 11:39:33 +0000 (11:39 +0000)]
* modules/http/http_request.c (ap_process_request_after_handler,
  ap_process_request): Cache and retrieve the brigade structure used
  to send EOR and FLUSH between requests in c->pool userdata, to avoid
  allocating a brigade structure per-request out of c->pool.

Submitted by: rpluem, jorton

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

6 years ago* Makefile.in: Pass TESTS=... to run only specific tests with make check.
Joe Orton [Wed, 6 Jun 2018 11:25:32 +0000 (11:25 +0000)]
* Makefile.in: Pass TESTS=... to run only specific tests with make check.

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

6 years agomod_ssl: after code review, changed:
Stefan Eissing [Wed, 6 Jun 2018 09:56:00 +0000 (09:56 +0000)]
mod_ssl: after code review, changed:
 * eliminated SSLPolicyRec as name no longer used
 * eliminated some left over parameters in internal functions due to policy def removal
 * reverted a NULL test, necessary before

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

6 years ago* modules/proxy/mod_proxy_hcheck.c (sctx_t, hc_create_config):
Joe Orton [Wed, 6 Jun 2018 08:42:33 +0000 (08:42 +0000)]
* modules/proxy/mod_proxy_hcheck.c (sctx_t, hc_create_config):
  Remove unused bucket allocator created off pconf.
  Tag the subpool.

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

6 years ago* modules/proxy/proxy_util.c (ap_proxy_share_worker): Skip creating subpool
Joe Orton [Tue, 5 Jun 2018 14:47:52 +0000 (14:47 +0000)]
* modules/proxy/proxy_util.c (ap_proxy_share_worker): Skip creating subpool
  for debugging unless debug-level logging is enabled.  No functional change.

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

6 years ago * mod_proxy_http2: ressurrecting some of the good parts of r1831231 and using memcpy...
Stefan Eissing [Tue, 5 Jun 2018 12:57:55 +0000 (12:57 +0000)]
 * mod_proxy_http2: ressurrecting some of the good parts of r1831231 and using memcpy instead of strncpy to make intentions more clear

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

6 years ago * integrating latest changes from microgrit
Stefan Eissing [Tue, 5 Jun 2018 12:43:08 +0000 (12:43 +0000)]
 * integrating latest changes from microgrit
 * MDNotifyCmd can now specify arguments to the command

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

6 years agoFixing h2 proxy link header mapping to substitute correctly again after r1831231...
Stefan Eissing [Tue, 5 Jun 2018 12:33:20 +0000 (12:33 +0000)]
Fixing h2 proxy link header mapping to substitute correctly again after r1831231 breakage.

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

6 years agoimage size 0x34000 exceeds specified maximum 0x30000
Gregg Lewis Smith [Mon, 4 Jun 2018 18:54:47 +0000 (18:54 +0000)]
image size 0x34000 exceeds specified maximum 0x30000

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

6 years agobuild mod_proxy before mod_proxy_http2
Gregg Lewis Smith [Mon, 4 Jun 2018 18:42:32 +0000 (18:42 +0000)]
build mod_proxy before mod_proxy_http2

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

6 years agoThese are in 2.4.x
Jim Jagielski [Thu, 31 May 2018 13:38:00 +0000 (13:38 +0000)]
These are in 2.4.x

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

6 years agoFollow up to r1832580: correct CHANGES entry.
Yann Ylavic [Thu, 31 May 2018 07:36:39 +0000 (07:36 +0000)]
Follow up to r1832580: correct CHANGES entry.

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

6 years agomod_remoteip: Fix RemoteIP{Trusted,Internal}ProxyList loading broken by 2.4.30.
Yann Ylavic [Thu, 31 May 2018 07:24:24 +0000 (07:24 +0000)]
mod_remoteip: Fix RemoteIP{Trusted,Internal}ProxyList loading broken by 2.4.30.

Overwriting server config in pre_config hook breaks EXEC_ON_READ directives,
it's automatically created on purpose anyway.

PR 62220.

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

6 years agomod_proxy_balancer: follow up to r1828890: indentation and 80 col.
Yann Ylavic [Tue, 29 May 2018 21:43:01 +0000 (21:43 +0000)]
mod_proxy_balancer: follow up to r1828890: indentation and 80 col.

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

6 years agoAxe backported entries.
Yann Ylavic [Tue, 29 May 2018 21:37:16 +0000 (21:37 +0000)]
Axe backported entries.

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

6 years agomod_slotmem_shm: follow up to r1831869: fix dead else if condition.
Yann Ylavic [Tue, 29 May 2018 20:22:44 +0000 (20:22 +0000)]
mod_slotmem_shm: follow up to r1831869: fix dead else if condition.

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

6 years agoRpm: fix the location of the PID file so as to avoid timeout
Graham Leggett [Mon, 28 May 2018 12:03:21 +0000 (12:03 +0000)]
Rpm: fix the location of the PID file so as to avoid timeout
delays on systemd.

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

6 years agoAll error handling paths of this function call 'apr_brigade_destroy()' , except this...
Christophe Jaillet [Sun, 27 May 2018 20:48:00 +0000 (20:48 +0000)]
All error handling paths of this function call 'apr_brigade_destroy()' , except this one.
So add it here too.

Probably spotted with the help of the Coccinelle software (Thx Julia for the patch and for Coccinelle)

See PR 53016

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

6 years agoAll error handling paths of this function call 'apr_socket_close()' , except this...
Christophe Jaillet [Sun, 27 May 2018 20:38:39 +0000 (20:38 +0000)]
All error handling paths of this function call 'apr_socket_close()' , except this one.
So add it here too.

Probably spotted with the help of the Coccinelle software (Thx Julia for the patch and for Coccinelle)

See PR 53015

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

6 years agoHave code and doc consistent.
Christophe Jaillet [Sun, 27 May 2018 20:14:16 +0000 (20:14 +0000)]
Have code and doc consistent.
The SSLRandomSeed  builtin, uses 128 bytes of stack, not 1kb of scoreboard data.

See PR 54752

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

6 years agoRebuild.
Lucien Gentis [Sun, 27 May 2018 12:25:30 +0000 (12:25 +0000)]
Rebuild.

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

6 years agoXML updates.
Lucien Gentis [Sun, 27 May 2018 12:20:10 +0000 (12:20 +0000)]
XML updates.

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

6 years agoFix a potential un-intialized variable usage warning.
Christophe Jaillet [Sat, 26 May 2018 16:54:23 +0000 (16:54 +0000)]
Fix a potential un-intialized variable usage warning.
This can not be a runtime ixsue, because, in such a case, we would assert and abort before.

 PR 59819.

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

6 years agoIf several directories are given in a UserDir directive, only files in the first...
Christophe Jaillet [Sat, 26 May 2018 12:25:10 +0000 (12:25 +0000)]
If several directories are given in a UserDir directive, only files in the first existing one are checked. If the file is not found there, the other possible directories are not checked. The doc clearly states that they will be checked one by one, until a match is found or an external redirect is performed.

 PR 59636.

While at it, add some debug messages to better understand what is performed.

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