]> granicus.if.org Git - apache/log
apache
4 years agofr doc new built file.
Lucien Gentis [Fri, 18 Oct 2019 11:08:26 +0000 (11:08 +0000)]
fr doc new built file.

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

4 years agofr doc adding a new file.
Lucien Gentis [Fri, 18 Oct 2019 11:04:46 +0000 (11:04 +0000)]
fr doc adding a new file.

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

4 years agomod_proxy_http: Fix 100-continue deadlock for spooled request bodies. PR 63855.
Yann Ylavic [Fri, 18 Oct 2019 07:50:59 +0000 (07:50 +0000)]
mod_proxy_http: Fix 100-continue deadlock for spooled request bodies. PR 63855.

Send "100 Continue", if needed, before fetching/blocking on the request body in
spool_reqbody_cl(), otherwise mod_proxy and the client can wait for each other,
leading to a request timeout (408).

While at it, make so that ap_send_interim_response() uses the default status
line if none is set in r->status_line.

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

4 years ago *) mod_md: Adding the several new features.
Stefan Eissing [Wed, 16 Oct 2019 12:31:43 +0000 (12:31 +0000)]
  *) mod_md: Adding the several new features.
     The module offers an implementation of OCSP Stapling that can replace fully or
     for a limited set of domains the existing one from mod_ssl. OCSP handling
     is part of mod_md's monitoring and message notifications. If can be used
     for sites that do not have ACME certificates.
     The url for a CTLog Monitor can be configured. It is used in the server-status
     to link to the external status page of a certicate.
     The MDMessageCmd is called with argument "installed" when a new certificate
     has been activated on server restart/reload. This allows for processing of
     the new certificate, for example to applications that require it in different
     locations or formats.

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

4 years agoupdate mod_md tags
Stefan Eissing [Wed, 16 Oct 2019 10:13:24 +0000 (10:13 +0000)]
update mod_md tags

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

4 years ago* Correctly initialize nomime member
Ruediger Pluem [Mon, 14 Oct 2019 20:14:58 +0000 (20:14 +0000)]
* Correctly initialize nomime member

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

4 years agoHonor "Accept-Encoding: foo;q=0" as per RFC 7231; which means 'foo' is "not acceptabl...
Christophe Jaillet [Fri, 11 Oct 2019 20:21:14 +0000 (20:21 +0000)]
Honor "Accept-Encoding: foo;q=0" as per RFC 7231; which means 'foo' is "not acceptable".  PR 58158

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

4 years agoFix pool concurrency problems
Ruediger Pluem [Fri, 11 Oct 2019 15:11:40 +0000 (15:11 +0000)]
Fix pool concurrency problems

Create a subpool of the connection pool for worker scoped DNS resolutions.
This is needed to avoid race conditions in using the connection pool by multiple
threads during ramp up.

Recheck after obtaining the lock if we still need to do things or if they
were already done by another thread while we were waiting on the lock.

* modules/proxy/proxy_util.c: Create a subpool of the connection pool for worker
  scoped DNS resolutions and use it.

* modules/proxy/mod_proxy.h: Define AP_VOLATILIZE_T and add dns_pool to
  struct proxy_conn_pool.

* modules/proxy/mod_proxy_ftp.c: Use dns_pool and consider that
  worker->cp->addr is volatile in this location of the code.

PR: 63503

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

4 years ago* Add back logging goodness
Ruediger Pluem [Fri, 11 Oct 2019 14:40:10 +0000 (14:40 +0000)]
* Add back logging goodness

Add back logging goodness added by covener in r1865938.

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

4 years ago* Revert r1865944 and r1865938
Ruediger Pluem [Fri, 11 Oct 2019 14:36:32 +0000 (14:36 +0000)]
* Revert r1865944 and r1865938

Revert r1865944 and r1865938 in order to provide a better patch with less
locking and thus contention.

lognos

PR63503: fix pool concurrency problems in mod_proxy

reslist and resolver related calls could concurrently access the same pool.

Submitted By: Don Poitras <Don.Poitras sas.com>
Committed By: covener

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

4 years agoFix a typo in a message.
Christophe Jaillet [Sat, 5 Oct 2019 13:42:00 +0000 (13:42 +0000)]
Fix a typo in a message.

Reported and fixed by Christian Bartolomäus (bartolin gmx.de)
PR 63806

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

4 years agoFix build broken w/o --enable-cgid-fdpassing by r1867968:
Joe Orton [Fri, 4 Oct 2019 09:56:42 +0000 (09:56 +0000)]
Fix build broken w/o --enable-cgid-fdpassing by r1867968:

* modules/generators/cgi_common.h: Only define CGI bucket type
  if WANT_CGI_BUCKET is defined.

* modules/generators/mod_cgi.c: Always include cgi_common.h, defining
  WANT_CGI_BUCKET iff APR_FILES_AS_SOCKETS is defined

* modules/generators/mod_cgid.c: Always include cgi_common.h, defining
  WANT_CGI_BUCKET iff HAVE_CGID_FDPASSING (--enable-cgid-fdpassing).

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

4 years ago* modules/generators/cgi_common.h (discard_script_output): Simplify
Joe Orton [Fri, 4 Oct 2019 09:24:07 +0000 (09:24 +0000)]
* modules/generators/cgi_common.h (discard_script_output): Simplify
  slightly and ensure constant rather than unlimited memory
  consumption when discarding CGI script output (for e.g. a redirect
  response).

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

4 years agoMove common (and near-identical) code for CGI response output handling
Joe Orton [Fri, 4 Oct 2019 09:20:33 +0000 (09:20 +0000)]
Move common (and near-identical) code for CGI response output handling
to cgi_common.h; the diff between the modules for this code was as
follows:

https://people.apache.org/~jorton/mod_cgi-to-cgid-handler.diff

Change from previous: mod_cgi will now explicitly discard output when
returning HTTP_MOVED_TEMPORARILY for relative redirects (should not be
functionally different), TRACE1 logging of ap_pass_brigade failures
for mod_cgid is dropped.

* modules/generators/cgi_common.h (cgi_handle_response): New function,
  factored out from mod_cgid.
  (discard_script_output): Copied function from mod_cgi/d unchanged.

* modules/generator/mod_cgid.c (cgid_handler),
  modules/generator/mod_cgi.c (cgi_handler): Use cgi_handle_response.

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

4 years ago* modules/generators/cgi_common.h (cgi_bucket_create):
Joe Orton [Wed, 2 Oct 2019 10:41:22 +0000 (10:41 +0000)]
* modules/generators/cgi_common.h (cgi_bucket_create):
  Disable APR timeout handling here for all callers.

* modules/generators/mod_cgi.c (cgi_handler): ... drop it here.

PR: 63797

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

4 years ago* modules/generators/mod_cgid.c (sock_readhdr): Only set up control
Joe Orton [Wed, 2 Oct 2019 09:58:01 +0000 (09:58 +0000)]
* modules/generators/mod_cgid.c (sock_readhdr): Only set up control
  message block when required; add some additional error handling.

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

4 years agoMerge r1866760 from ^/httpd/apreq/trunk:
Joe Orton [Mon, 30 Sep 2019 09:50:44 +0000 (09:50 +0000)]
Merge r1866760 from ^/httpd/apreq/trunk:

parser_multipart: fix NULL pointer dereference in nested multipart

create_multipart_context() can return NULL if the given Content-Type
was not recognized (if there is no "boundary" attribute).  This
crashes libapreq2.

This bug was introduced by SVN commit 227276.  Prior to this commit,
there was a NULL check, but the commit removed it:

 http://svn.apache.org/viewvc/httpd/apreq/trunk/library/parser_multipart.c?r1=227276&r2=227275&pathrev=227276

Submitted by: max

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

4 years agofr doc rebuild.
Lucien Gentis [Sat, 28 Sep 2019 13:21:42 +0000 (13:21 +0000)]
fr doc rebuild.

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

4 years agofr doc XML file update.
Lucien Gentis [Sat, 28 Sep 2019 13:20:38 +0000 (13:20 +0000)]
fr doc XML file update.

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

4 years agoRefresh prettify.js to update some missing syntax highlight
Christophe Jaillet [Sat, 28 Sep 2019 11:38:54 +0000 (11:38 +0000)]
Refresh prettify.js to update some missing syntax highlight
(mostly related to mod_md)

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

4 years ago* modules/ssl/ssl_engine_log.c (ssl_log_cert_error): Use string
Joe Orton [Thu, 26 Sep 2019 09:17:58 +0000 (09:17 +0000)]
* modules/ssl/ssl_engine_log.c (ssl_log_cert_error): Use string
  length returned by apr_vsnprintf.  No functional change.

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

4 years agoFix a typo
Christophe Jaillet [Fri, 20 Sep 2019 20:53:56 +0000 (20:53 +0000)]
Fix a typo

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

4 years agoFix a typo
Christophe Jaillet [Fri, 20 Sep 2019 20:52:56 +0000 (20:52 +0000)]
Fix a typo

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

4 years agoFix a typo
Christophe Jaillet [Fri, 20 Sep 2019 20:51:26 +0000 (20:51 +0000)]
Fix a typo

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

4 years agoFix a typo
Christophe Jaillet [Fri, 20 Sep 2019 20:46:08 +0000 (20:46 +0000)]
Fix a typo

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

4 years agoFix a typo
Christophe Jaillet [Fri, 20 Sep 2019 20:44:47 +0000 (20:44 +0000)]
Fix a typo

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

4 years agoReverse the order of the test... if clang, then use clang, because some clangs also...
Jim Jagielski [Thu, 19 Sep 2019 15:50:43 +0000 (15:50 +0000)]
Reverse the order of the test... if clang, then use clang, because some clangs also represent as GNUC.

This fixes breaking the macOS builds due to r1864435 under maint-mode

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

4 years agofr doc rebuild.
Lucien Gentis [Mon, 16 Sep 2019 16:31:41 +0000 (16:31 +0000)]
fr doc rebuild.

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

4 years agofr doc XML files updates.
Lucien Gentis [Mon, 16 Sep 2019 16:22:17 +0000 (16:22 +0000)]
fr doc XML files updates.

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

4 years agoMissing </p> tag.
Lucien Gentis [Mon, 16 Sep 2019 16:19:52 +0000 (16:19 +0000)]
Missing </p> tag.

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

4 years agoap_http_header_filter: avoid double encoding of output headers in traces.
Yann Ylavic [Mon, 16 Sep 2019 11:46:27 +0000 (11:46 +0000)]
ap_http_header_filter: avoid double encoding of output headers in traces.

When output headers are logged (TRACE4) in send_all_header_fields(), we don't
need to explicitely ap_escape_logitem() them since ap_log_rerror() takes care
of log files escaping already.

Otherwise, characters like '"' are unncesseralily encoded, and '\\' is doubly
encoded (including for controls).

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

4 years ago* modules/mappers/mod_rewrite.c: Enhance trace-level logging to log
Joe Orton [Fri, 13 Sep 2019 10:43:16 +0000 (10:43 +0000)]
* modules/mappers/mod_rewrite.c: Enhance trace-level logging to log
  line numbers accurately for C99 compilers, and remove odd/awkward
  double-parentheses using the rewritelog() macro.  For non-C99
  compilers do_rewritelog() will now be defined - but as a noop - if
  REWRITELOG_DISABLED is defined at compile time.

No functional change at runtime apart from the line numbers being
fixed.

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

4 years ago * mod_md: manual updates and challenge description
Stefan Eissing [Thu, 12 Sep 2019 13:40:49 +0000 (13:40 +0000)]
 * mod_md: manual updates and challenge description

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

4 years agoFix an issue on Windows where <IfFile> looks for a file on a non-existent drive ...
Christophe Jaillet [Wed, 4 Sep 2019 19:11:28 +0000 (19:11 +0000)]
Fix an issue on Windows where <IfFile> looks for a file on a non-existent drive (on a USB key that is not plugged for example)

Issue repported by Heather Lotz <knot22 hotmail.com>

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

4 years agoPR63715: s/can/came and add a caution about REDIRECT_-prefixed envvars
Eric Covener [Sun, 1 Sep 2019 18:10:34 +0000 (18:10 +0000)]
PR63715: s/can/came and add a caution about REDIRECT_-prefixed envvars

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

4 years agoFix PR 63713 reported by WJCarpenter:
Christophe Jaillet [Sun, 1 Sep 2019 09:15:45 +0000 (09:15 +0000)]
Fix PR 63713 reported by  WJCarpenter:
  Add a small word about '\' which is used in the examples below.

Add some missing links (<module>, <directive>)
Improve some xml layout to have it readable.

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

4 years agofr doc rebuild.
Lucien Gentis [Sat, 31 Aug 2019 13:32:47 +0000 (13:32 +0000)]
fr doc rebuild.

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

4 years agofr doc XML update.
Lucien Gentis [Sat, 31 Aug 2019 13:31:39 +0000 (13:31 +0000)]
fr doc XML update.

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

4 years agorestore use of global mutex under !APR_HAS_THREADS
Eric Covener [Fri, 30 Aug 2019 11:58:41 +0000 (11:58 +0000)]
restore use of global mutex under !APR_HAS_THREADS

followup to r1852442 which appears to have been too agressive in wrapping
blocks with #if APR_HAS_THREADS.  With !APR_HAS_THREADS a global mutex
is a proc mutex.

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

4 years agoComplete mod_md CMake config by adding a _requires iterator, using the official
William A. Rowe Jr [Fri, 30 Aug 2019 08:25:13 +0000 (08:25 +0000)]
Complete mod_md CMake config by adding a _requires iterator, using the official
curl FIND_PACKAGE logic and completing the jansson detection logic.

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

4 years agoImprovement to mod_md cmake support. thanks to bill.
Stefan Eissing [Fri, 30 Aug 2019 07:13:28 +0000 (07:13 +0000)]
Improvement to mod_md cmake support. thanks to bill.

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

4 years ago* Make it obsolete to supply a starting pool
Ruediger Pluem [Thu, 29 Aug 2019 14:53:04 +0000 (14:53 +0000)]
* Make it obsolete to supply a starting pool

  Improve dump_all_pools by making it obsolete to supply a starting pool.
  If the parameter is not supplied ap_pglobal which is a global symbol is
  used as starting pool.
  The pool parameter is still accepted and considered for backwards
  compatibility or if ap_pglobal cannot be resolved.

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

4 years ago* Lock the worker, not the balancer. We even do not know if we have a balancer
Ruediger Pluem [Thu, 29 Aug 2019 11:30:56 +0000 (11:30 +0000)]
* Lock the worker, not the balancer. We even do not know if we have a balancer

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

4 years agoMore about RegexDefaultOptions.
Yann Ylavic [Thu, 29 Aug 2019 10:55:43 +0000 (10:55 +0000)]
More about RegexDefaultOptions.

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

4 years agobump
Eric Covener [Mon, 26 Aug 2019 15:09:14 +0000 (15:09 +0000)]
bump

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

4 years agolognos
Eric Covener [Mon, 26 Aug 2019 15:09:00 +0000 (15:09 +0000)]
lognos

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

4 years agoPR63503: fix pool concurrency problems in mod_proxy
Eric Covener [Mon, 26 Aug 2019 14:19:31 +0000 (14:19 +0000)]
PR63503: fix pool concurrency problems in mod_proxy

reslist and resolver related calls could concurrently access the same pool.

Submitted By: Don Poitras <Don.Poitras sas.com>
Committed By: covener

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

4 years agoremove APR_HAS_THREADS check
Eric Covener [Mon, 26 Aug 2019 14:07:08 +0000 (14:07 +0000)]
remove APR_HAS_THREADS check

no need to wrap these after r1865936

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

4 years agono-op PROXY_THREAD_LOCK if !APR_HAS_THREADS
Eric Covener [Mon, 26 Aug 2019 13:55:40 +0000 (13:55 +0000)]
no-op PROXY_THREAD_LOCK if !APR_HAS_THREADS

... instead of wrapping them in #if themselves in the C code.

r1852442 is a trunk-only change to make mod_proxy compile with !APR_HAS_THREADS.

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

4 years agoleave a hint about session expiration at TRACE2
Eric Covener [Sun, 25 Aug 2019 01:54:39 +0000 (01:54 +0000)]
leave a hint about session expiration at TRACE2

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

4 years agofr doc rebuild.
Lucien Gentis [Sat, 24 Aug 2019 13:33:49 +0000 (13:33 +0000)]
fr doc rebuild.

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

4 years agofr doc XML updates.
Lucien Gentis [Sat, 24 Aug 2019 13:32:33 +0000 (13:32 +0000)]
fr doc XML updates.

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

4 years agoPR63688 balancer csrf problems
Eric Covener [Fri, 23 Aug 2019 13:06:57 +0000 (13:06 +0000)]
PR63688 balancer csrf problems

fix case-sensitive referer check

Submitted By: Armin Abfalterer

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

4 years agomod_ssl: OCSP does not apply to proxy mode, fix verify context.
Yann Ylavic [Fri, 23 Aug 2019 10:31:01 +0000 (10:31 +0000)]
mod_ssl: OCSP does not apply to proxy mode, fix verify context.

Since ssl_callback_SSLVerify() is called for both server and proxy modes,
use myCtxConfig()->ocsp_mask to check the right mode/configuration (i.e.
none for proxy in any case).

PR 63679.
Submitted by: Lubos Uhliarik <luhliari redhat.com>

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

4 years agoxforms
Jim Jagielski [Mon, 19 Aug 2019 16:15:02 +0000 (16:15 +0000)]
xforms

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

4 years agoIncrease the maximum length of strings that can be cached by the module from 100...
Christophe Jaillet [Sun, 18 Aug 2019 18:52:40 +0000 (18:52 +0000)]
Increase the maximum length of strings that can be cached by the module from 100 to 256.  PR 62149 [<thorsten.meinl knime.com>]

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

4 years agos/cacheing/caching/
Christophe Jaillet [Sun, 18 Aug 2019 18:29:09 +0000 (18:29 +0000)]
s/cacheing/caching/
Improve layout.

Add some missing <module> tags.
Add some missing <directive> tags.
Add some missing <directive module=...> links
Add the name of the directive in <default>, so that 'quickreference.html' is generated correctly.
In the AuthnCacheContext directive, fix the way 'directory' and 'server' are displayed. They are key-words and should not be in italic.

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

4 years agoFix a broken link.
Christophe Jaillet [Sat, 17 Aug 2019 16:53:04 +0000 (16:53 +0000)]
Fix a broken link.

Add a missing <module></module>
Synch with 2.4.x

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

4 years agofr doc rebuild.
Lucien Gentis [Sat, 17 Aug 2019 13:59:55 +0000 (13:59 +0000)]
fr doc rebuild.

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

4 years agoXML update.
Lucien Gentis [Sat, 17 Aug 2019 13:58:41 +0000 (13:58 +0000)]
XML update.

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

4 years agofr doc rebuild.
Lucien Gentis [Tue, 13 Aug 2019 11:59:00 +0000 (11:59 +0000)]
fr doc rebuild.

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

4 years agofr doc - new translated file.
Lucien Gentis [Tue, 13 Aug 2019 11:56:27 +0000 (11:56 +0000)]
fr doc - new translated file.

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

4 years agoInclude for mod_status.h
Steffen Land [Sun, 11 Aug 2019 10:52:56 +0000 (10:52 +0000)]
Include for mod_status.h

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

4 years agoFix the directive name used in <usage> of 'RemoteIPProxyProtocolExceptions'.
Christophe Jaillet [Sun, 11 Aug 2019 06:19:01 +0000 (06:19 +0000)]
Fix the directive name used in <usage> of 'RemoteIPProxyProtocolExceptions'.

Fix some style (there is no need to have a link to the directive within its <directivesynopsis> block)

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

4 years agoRevert r1864878.
Christophe Jaillet [Sat, 10 Aug 2019 15:46:45 +0000 (15:46 +0000)]
Revert r1864878.
This breaks compilation because of a use defore definition.

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

4 years agoFix a signed/unsigned comparison in 'ap_filter_should_yield()' and 'ap_request_core_f...
Christophe Jaillet [Sat, 10 Aug 2019 15:26:01 +0000 (15:26 +0000)]
Fix a signed/unsigned comparison in 'ap_filter_should_yield()' and 'ap_request_core_filter()'.

This is harmless and only present in trunk.

Spotted by gcc 9.1 and -Wextra

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

4 years agoFix a signed/unsigned comparison that can never match.
Christophe Jaillet [Sat, 10 Aug 2019 09:52:34 +0000 (09:52 +0000)]
Fix a signed/unsigned comparison that can never match.

-1 is a valid length value (for socket, pipe and cgi buckets for example)
All path I've checked cast the -1 to (apr_size_t) in order for the comparison to work. So do it as well here.

This has been like that in trunk since r708144, about 11 years ago, so I assume that it is not really an issue.

Spotted by gcc 9.1 and -Wextra

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

4 years agoFix a signed/unsigned comparison that can never match.
Christophe Jaillet [Sat, 10 Aug 2019 08:59:13 +0000 (08:59 +0000)]
Fix a signed/unsigned comparison that can never match.
(+ add a missing space to improve formating)

Spotted by gcc 9.1 and -Wextra

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

4 years agoFix to allow the logging of SSL_CIPHER variable (instead of SSL_COPHER)
Christophe Jaillet [Sat, 10 Aug 2019 01:02:02 +0000 (01:02 +0000)]
Fix to allow the logging of SSL_CIPHER variable (instead of SSL_COPHER)

(reported by  eric-therond in GitHub issue #60)

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

4 years ago-l and -L are not exclusive.
Christophe Jaillet [Fri, 9 Aug 2019 11:57:26 +0000 (11:57 +0000)]
-l and -L are not exclusive.
Document the 'G' suffix.

See PR 63638

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

4 years ago-l and -L are not exclusive.
Christophe Jaillet [Fri, 9 Aug 2019 11:44:12 +0000 (11:44 +0000)]
-l and -L are not exclusive.
Document the 'G' suffix.
Fix some minor style issues.

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

4 years agoFix a corner case where automatic APLOGNO number generation generates invalid code...
Christophe Jaillet [Fri, 9 Aug 2019 06:49:46 +0000 (06:49 +0000)]
Fix a corner case where automatic APLOGNO number generation generates invalid code. (see r1864733 fixed in r1864736, thx Eric)

Not sure why this ,? is there, but it looks uneeded to me.
There is maybe a link with the patterns used in 'find-messages.cocci'. They seem to add some extra , after the empty APLOGNO() it generates.
I will investigate further and fix 'find-messages.cocci' accordingly if needed.

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

4 years agoAxe some dead code + slighly improve a comment
Christophe Jaillet [Fri, 9 Aug 2019 05:18:22 +0000 (05:18 +0000)]
Axe some dead code + slighly improve a comment

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

4 years agoTweak coccinelle search pattern.
Christophe Jaillet [Fri, 9 Aug 2019 05:11:53 +0000 (05:11 +0000)]
Tweak coccinelle search pattern.

ssl_log_xerror is the only ssl function that takes a 'pool' argument.
Remove the function name regex as already done for 'ap_log_cserror' above.

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

4 years agofollowup to r1864733
Eric Covener [Thu, 8 Aug 2019 21:24:41 +0000 (21:24 +0000)]
followup to r1864733

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

4 years agoAdd missing APLOGNO
Christophe Jaillet [Thu, 8 Aug 2019 20:40:49 +0000 (20:40 +0000)]
Add missing APLOGNO

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

4 years agofr doc rebuild.
Lucien Gentis [Thu, 8 Aug 2019 15:21:20 +0000 (15:21 +0000)]
fr doc rebuild.

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

4 years agofr doc - new file.
Lucien Gentis [Thu, 8 Aug 2019 15:17:45 +0000 (15:17 +0000)]
fr doc - new file.

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

4 years ago* modules/proxy/mod_proxy_balancer.c (balancer_display_page):
Joe Orton [Thu, 8 Aug 2019 14:00:03 +0000 (14:00 +0000)]
* modules/proxy/mod_proxy_balancer.c (balancer_display_page):
  Add more HTML-escaping.

Submitted by: Niels Heinen <heinenn google.com>

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

4 years agobump
Eric Covener [Thu, 8 Aug 2019 13:07:21 +0000 (13:07 +0000)]
bump

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

4 years agolognos
Eric Covener [Thu, 8 Aug 2019 13:07:16 +0000 (13:07 +0000)]
lognos

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

4 years agoBump next-number after r1864695.
Joe Orton [Thu, 8 Aug 2019 12:12:46 +0000 (12:12 +0000)]
Bump next-number after r1864695.

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

4 years ago* modules/proxy/mod_proxy_balancer.c (balancer_handler): Check Referer
Joe Orton [Thu, 8 Aug 2019 12:11:36 +0000 (12:11 +0000)]
* modules/proxy/mod_proxy_balancer.c (balancer_handler): Check Referer
  to improve on protection against balancer-manager XSRF attacks
  provided by the nonce.

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

4 years ago* modules/proxy/proxy_util.c (ap_proxy_share_balancer): Create the
Joe Orton [Thu, 8 Aug 2019 12:03:14 +0000 (12:03 +0000)]
* modules/proxy/proxy_util.c (ap_proxy_share_balancer): Create the
  nonce as a pseudo-UUID using the PRNG.

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

4 years agoUpdate links to APR/APU svn to recent stable branches.
Rainer Jung [Tue, 6 Aug 2019 16:46:12 +0000 (16:46 +0000)]
Update links to APR/APU svn to recent stable branches.

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

4 years agoBump next-number after r1864526.
Joe Orton [Tue, 6 Aug 2019 15:41:46 +0000 (15:41 +0000)]
Bump next-number after r1864526.

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

4 years ago* modules/metadata/mod_remoteip.c (remoteip_process_v2_header,
Joe Orton [Tue, 6 Aug 2019 15:41:22 +0000 (15:41 +0000)]
* modules/metadata/mod_remoteip.c (remoteip_process_v2_header,
  remoteip_input_filter): Add sanity checks.

Submitted by: jorton, Daniel McCarney <cpu letsencrypt.org>

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

4 years ago* modules/filters/mod_proxy_html.c, modules/filters/mod_xml2enc.c:
Joe Orton [Tue, 6 Aug 2019 07:54:24 +0000 (07:54 +0000)]
* modules/filters/mod_proxy_html.c, modules/filters/mod_xml2enc.c:
  Fix gcc 9 warnings in code attempting to reduce gcc warnings.
  (should have used expat...)

mod_xml2enc.c:26:28: warning: "/*" within comment [-Wcomment]
   26 | /* libxml2 includes unicode/*.h files which uses C++ comments */
      |
mod_proxy_html.c:32:28: warning: "/*" within comment [-Wcomment]
   32 | /* libxml2 includes unicode/*.h files which uses C++ comments */
      |

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

4 years agoUnfortunately -Wcomment can only be influenced
Rainer Jung [Mon, 5 Aug 2019 18:31:35 +0000 (18:31 +0000)]
Unfortunately -Wcomment can only be influenced
using a diagnostics pragma starting with GCC 4.6.

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

4 years agoFollow up to r1864438 and r1864435:
Rainer Jung [Mon, 5 Aug 2019 18:05:12 +0000 (18:05 +0000)]
Follow up to r1864438 and r1864435:
Use the right pragma syntax also in the second file.

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

4 years agoUse the right pragma syntax.
Rainer Jung [Mon, 5 Aug 2019 14:28:41 +0000 (14:28 +0000)]
Use the right pragma syntax.
Follow-up to r1864435.

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

4 years agoThe GCC flag "-Wno-error=comment" introduced by r1855446
Rainer Jung [Mon, 5 Aug 2019 14:18:22 +0000 (14:18 +0000)]
The GCC flag "-Wno-error=comment" introduced by r1855446
and r1850745 are only known since GCC 4.2. Since it gets
set unconditionally, this breaks compilation with old GCC
even when not using maintainer mode.

Make the fix for maintainer mode more specific by using
a version dependent pragma in the relevant two C files
only switching off error status for comment warnings.

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

4 years ago *) mod_ssl: reverting a 2.4.40 change where a superfluous SSLCertificateChainFile...
Stefan Eissing [Mon, 5 Aug 2019 11:29:58 +0000 (11:29 +0000)]
  *) mod_ssl: reverting a 2.4.40 change where a superfluous SSLCertificateChainFile configuration
     for a domain managed by mod_md caused a startup error. This happened when mod_md installed
     its fallback certificate, before it got the first real certificate from Lets Encrypt.

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

4 years ago * mod_md: fix compiler warnings
Stefan Eissing [Mon, 5 Aug 2019 10:27:34 +0000 (10:27 +0000)]
 * mod_md: fix compiler warnings

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

4 years agoset PCRE_DOTALL by default
Eric Covener [Fri, 2 Aug 2019 01:31:28 +0000 (01:31 +0000)]
set PCRE_DOTALL by default

Submitted by ylavic

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

4 years agoremove request details from error documents (CVE-2019-10092).
Eric Covener [Fri, 2 Aug 2019 01:27:37 +0000 (01:27 +0000)]
remove request details from error documents (CVE-2019-10092).

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

4 years agodon't mess with AP_ENABLE_EXCEPTION_HOOK on trunk
Eric Covener [Thu, 1 Aug 2019 13:58:45 +0000 (13:58 +0000)]
don't mess with AP_ENABLE_EXCEPTION_HOOK on trunk

mpm_common defines it later anyway:

In file included from mod_md.c:25:
In file included from /Users/covener/SRC/httpd-trunk/include/mpm_common.h:40:
In file included from /Users/covener/SRC/httpd-trunk/include/ap_config.h:184:
/Users/covener/SRC/httpd-trunk/include/ap_config_auto.h:11:9: error: 'AP_ENABLE_EXCEPTION_HOOK' macro redefined [-Werror,-Wmacro-redefined]

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

4 years agoupdate transformation
André Malo [Thu, 1 Aug 2019 08:37:48 +0000 (08:37 +0000)]
update transformation

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

4 years agosvn:eol-style=native
André Malo [Thu, 1 Aug 2019 08:28:25 +0000 (08:28 +0000)]
svn:eol-style=native

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

4 years agoWrap get_ct_scts_nid() in preproc in order to avoid error: unused function 'get_ct_sc...
Jim Jagielski [Tue, 23 Jul 2019 12:50:04 +0000 (12:50 +0000)]
Wrap get_ct_scts_nid() in preproc in order to avoid error: unused function 'get_ct_scts_nid' [-Werror,-Wunused-function] in maint mode

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