2 weeks agorestore use of global mutex under !APR_HAS_THREADS trunk 37/head trunk
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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks 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

2 weeks agobump
Eric Covener [Mon, 26 Aug 2019 15:09:14 +0000 (15:09 +0000)]

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

2 weeks agolognos
Eric Covener [Mon, 26 Aug 2019 15:09:00 +0000 (15:09 +0000)]

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

2 weeks 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

2 weeks 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

Eric Covener [Mon, 26 Aug 2019 13:55:40 +0000 (13:55 +0000)]

... 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

3 weeks 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

3 weeks 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

3 weeks 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

3 weeks 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

3 weeks 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

3 weeks agoxforms
Jim Jagielski [Mon, 19 Aug 2019 16:15:02 +0000 (16:15 +0000)]

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

4 weeks 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 weeks agos/cacheing/caching/
Christophe Jaillet [Sun, 18 Aug 2019 18:29:09 +0000 (18:29 +0000)]
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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks agobump
Eric Covener [Thu, 8 Aug 2019 13:07:21 +0000 (13:07 +0000)]

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

5 weeks agolognos
Eric Covener [Thu, 8 Aug 2019 13:07:16 +0000 (13:07 +0000)]

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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

5 weeks 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

6 weeks 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

6 weeks agoremove request details from error documents
Eric Covener [Fri, 2 Aug 2019 01:27:37 +0000 (01:27 +0000)]
remove request details from error documents

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

6 weeks 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

6 weeks 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

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

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

7 weeks 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

8 weeks agofr doc rebuild.
Lucien Gentis [Sat, 20 Jul 2019 15:44:04 +0000 (15:44 +0000)]
fr doc rebuild.

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

8 weeks agofr doc - adding a new xml file.
Lucien Gentis [Sat, 20 Jul 2019 15:41:10 +0000 (15:41 +0000)]
fr doc - adding a new xml file.

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

8 weeks agoSynch trunk and 2.4.x
Christophe Jaillet [Sat, 20 Jul 2019 09:08:21 +0000 (09:08 +0000)]
Synch trunk and 2.4.x

Remove some useless spaces which have never been backported in 2.4.x.
This was part of r1724879 and was backported in r1744951

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

8 weeks agoSynch 2.4 and trunk.
Christophe Jaillet [Sat, 20 Jul 2019 08:06:04 +0000 (08:06 +0000)]
Synch 2.4 and trunk.

Remove an empty line that must have been missed in a backport.

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

8 weeks ago *) mod_http2: core setting "LimitRequestFieldSize" is not additionally checked on
Stefan Eissing [Thu, 18 Jul 2019 12:31:01 +0000 (12:31 +0000)]
  *) mod_http2: core setting "LimitRequestFieldSize" is not additionally checked on
     merged header fields, just as HTTP/1.1 does. [Stefan Eissing, Michael Kaufmann]

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

2 months ago mod_http2: update log tags, log field len errors at INFO level (via mkaufmann)
Stefan Eissing [Wed, 17 Jul 2019 13:54:47 +0000 (13:54 +0000)]
 mod_http2: update log tags, log field len errors at INFO level (via mkaufmann)
 mod_proxy_http2: udpate log tags

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

2 months agoupdate aplogno in recent hook changes
Stefan Eissing [Wed, 17 Jul 2019 12:57:33 +0000 (12:57 +0000)]
update aplogno in recent hook changes

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

2 months agomod_cgid: Continuation of r1862968, experimental fd passing support.
Joe Orton [Wed, 17 Jul 2019 07:51:53 +0000 (07:51 +0000)]
mod_cgid: Continuation of r1862968, experimental fd passing support.

Split out CGI bucket implementation from mod_cgi and use in both
mod_cgi and mod_cgid, bringing stderr handling in mod_cgid up to par
with mod_cgi.  (There is a lot of code which has been copied between
mod_cgi{,d} so there's scope for further reduction of source
duplication between the modules using this header)

* modules/generators/cgi_common.h: Copied from mod_cgi.c, removed
  everything but the CGI bucket implementation with only one change:
  (struct cgi_bucket_data, cgi_bucket_create, cgi_bucket_read): Take a
  timeout on bucket creation, store and use on reads.

* modules/generators/mod_cgi.c [APR_FILES_AS_SOCKETS]: Include
  (cgi_handler): Pass configured timeout to CGI bucket.

* modules/generators/mod_cgid.c: Include cgi_common.h.
  (log_script_err): Copy from mod_cgi.c.
  (log_script): Use log_script_err.
  (send_req): Take fd for stderr.
  (cgid_child_errfn): Handle fd-passing case by writing error
  to stderr for client to pass through ap_log_rerror.
  (cgid_handler): Create pipe for stderr, pass write-end to
  server via send_req, use read-end to create CGI bucket.  Handle
  stderr output in failure paths.

PR: 54221

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

2 months agoFix crashes when running with debug APR (APR_POOL_DEBUG),
Rainer Jung [Tue, 16 Jul 2019 20:38:18 +0000 (20:38 +0000)]
Fix crashes when running with debug APR (APR_POOL_DEBUG),
because all pools have NULL allocators then.

This workaround is probably not very efficient,
but is only used when we do APR_POOL_DEBUG
and efficiency shouldn't be a big concern then.

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

2 months agofr doc rebuild.
Lucien Gentis [Sat, 13 Jul 2019 13:40:20 +0000 (13:40 +0000)]
fr doc rebuild.

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

2 months agofr doc XML file update.
Lucien Gentis [Sat, 13 Jul 2019 13:39:17 +0000 (13:39 +0000)]
fr doc XML file update.

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

2 months agoAdd experimental support for fd passing in mod_cgid. Attaches CGI
Joe Orton [Fri, 12 Jul 2019 12:09:04 +0000 (12:09 +0000)]
Add experimental support for fd passing in mod_cgid.  Attaches CGI
script stderr to the error log specific to the vhost, by passing the
appropriate fd over the AF_UNIX socket from the request handling
thread to the cgid server process.

* modules/generators/config5.m4: Add --enable-cgid-fdpassing.

* modules/generators/mod_cgid.c (sock_readhdr): New function, also
  returns auxiliary control data (the stderr fd) if available.
  (sock_write): Take optional aux fd argument, send it as control
  data.  (send_req, get_req): Adjust accordingly to pass/receive the
  stderr fd.
  (cgid_server): Use passed fd if available, limit the lifetime.

PR: 60692

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

2 months ago *) mod_http2: fixed a bug that prevented proper stream cleanup when connection
Stefan Eissing [Wed, 10 Jul 2019 10:18:15 +0000 (10:18 +0000)]
  *) mod_http2: fixed a bug that prevented proper stream cleanup when connection
     throttling was in place. Stream resets by clients on streams initiated by them
     are counted as possible trigger for throttling.

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

2 months ago * moving the openssl related new hooks into mod_ssl_openssl.h
Stefan Eissing [Tue, 9 Jul 2019 16:57:59 +0000 (16:57 +0000)]
 * moving the openssl related new hooks into mod_ssl_openssl.h
 * chaning type parameter to openssl types
 * adding explanation of return value in get_stapling_status()
 * adding array element description for add_cert_files and add_fallback_cert_files hooks

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

2 months ago * using mod_ssl_openssl.h to see hooks in new place
Stefan Eissing [Tue, 9 Jul 2019 16:47:36 +0000 (16:47 +0000)]
 * using mod_ssl_openssl.h to see hooks in new place

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

2 months ago* include/ssl/mod_ssl.h: Include apr_tables.h and use apr_array_header_t
Joe Orton [Tue, 9 Jul 2019 11:02:43 +0000 (11:02 +0000)]
* include/ssl/mod_ssl.h: Include apr_tables.h and use apr_array_header_t

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

2 months agoupdate after mod_md backport
Stefan Eissing [Tue, 9 Jul 2019 08:41:30 +0000 (08:41 +0000)]
update after mod_md backport

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

2 months agomod_md: adding log tag numbers
Stefan Eissing [Tue, 9 Jul 2019 07:49:45 +0000 (07:49 +0000)]
mod_md: adding log tag numbers

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

2 months ago* support/htpasswd.c (usage): More usage fixes for SHA-2; describe
Joe Orton [Mon, 8 Jul 2019 08:39:53 +0000 (08:39 +0000)]
* support/htpasswd.c (usage): More usage fixes for SHA-2; describe
  as "secure", leave bcrypt only algorithm described as "very secure".

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

2 months agoUpdate transform.
Joe Orton [Fri, 5 Jul 2019 12:42:28 +0000 (12:42 +0000)]
Update transform.

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

2 months ago* support/htpasswd.c (usage): Document SHA-256/512 support.
Joe Orton [Fri, 5 Jul 2019 12:38:27 +0000 (12:38 +0000)]
* support/htpasswd.c (usage): Document SHA-256/512 support.

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

2 months agoTransforms.
Joe Orton [Fri, 5 Jul 2019 12:21:52 +0000 (12:21 +0000)]

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

2 months agoDocument SHA-2 support.
Joe Orton [Fri, 5 Jul 2019 12:20:55 +0000 (12:20 +0000)]
Document SHA-2 support.

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

2 months ago * applying v4 of the patch for PR 63534.
Stefan Eissing [Fri, 5 Jul 2019 07:08:19 +0000 (07:08 +0000)]
 * applying v4 of the patch for PR 63534.

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

2 months ago *) mod_http2/mpm_event: Fixes the behaviour when a HTTP/2 connection has nothing
Stefan Eissing [Wed, 3 Jul 2019 13:46:31 +0000 (13:46 +0000)]
  *) mod_http2/mpm_event: Fixes the behaviour when a HTTP/2 connection has nothing
     more to write with streams ongoing (flow control block). The timeout waiting
     for the client to send WINODW_UPDATE was incorrectly KeepAliveTimeout and not
     Timeout as it should be. Fixes PR 63534. [Yann Ylavic, Stefan Eissing]

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

2 months ago* All backported
Ruediger Pluem [Tue, 2 Jul 2019 09:14:36 +0000 (09:14 +0000)]
* All backported

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

2 months ago* Backported in r1862410
Ruediger Pluem [Tue, 2 Jul 2019 09:11:49 +0000 (09:11 +0000)]
* Backported in r1862410

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

2 months ago *) mod_ssl/mod_md:
Stefan Eissing [Mon, 1 Jul 2019 14:22:04 +0000 (14:22 +0000)]
  *) mod_ssl/mod_md:
     Adding 2 new hooks for init/get of OCSP stapling status information when
     other modules want to provide those. Falls back to own implementation with
     same behaviour as before.

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

2 months ago* Replace apr_psprintf with apr_pstrcat where the format strings only
Ruediger Pluem [Fri, 28 Jun 2019 08:50:31 +0000 (08:50 +0000)]
* Replace apr_psprintf with apr_pstrcat where the format strings only
  contain %s to improve efficiency. Leave out error messages as they
  are not on a crtical code path and error message become less readable
  when taking out the format specifiers.

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

2 months ago* modules/metadata/mod_mime_magic.c: Constify some constant
Joe Orton [Thu, 27 Jun 2019 09:22:48 +0000 (09:22 +0000)]
* modules/metadata/mod_mime_magic.c: Constify some constant
  data, remove unused "suf_recursion" field.  No functional

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

2 months ago* docs/conf/magic: Allow mod_mime_magic to return "audio/x-wav" for
Joe Orton [Thu, 27 Jun 2019 09:06:56 +0000 (09:06 +0000)]
* docs/conf/magic: Allow mod_mime_magic to return "audio/x-wav" for
  WAV files, and omit returning "audio/unknown" for other RIFF
  format files.  Having a MIME type defined on a continuation line
  *and* the preceding top-level match breaks mod_mime_magic, which
  treats the second result "printed" as the MIME encoding. Neither
  audio/x-wav nor audio/unknown are IANA registered, though Firefox
  and Chrome both appear to recognize the former.  Since the RIFF
  format can contain non-audio media, returning audio/unknown as
  a fallback for all RIFF files appears to be bogus anyway.

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

2 months ago mod_md: silencing unsed warnings when no mod_ssl hooks are not available
Stefan Eissing [Wed, 26 Jun 2019 08:45:29 +0000 (08:45 +0000)]
 mod_md: silencing unsed warnings when no mod_ssl hooks are not available

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

2 months ago *) mod_ssl/mod_md: reversing dependency by letting mod_ssl offer hooks for
Stefan Eissing [Tue, 25 Jun 2019 15:21:10 +0000 (15:21 +0000)]
  *) mod_ssl/mod_md: reversing dependency by letting mod_ssl offer hooks for
     adding certificates and keys to a virtual host. An additional hook allows
     answering special TLS connections as used in ACME challenges.

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

2 months ago* server/main.c (main): Don't create a separate subpool for pcommands
Joe Orton [Tue, 25 Jun 2019 12:16:24 +0000 (12:16 +0000)]
* server/main.c (main): Don't create a separate subpool for pcommands
  (it had an identical lifetime to the global pool).

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

2 months ago mod_md: updated documenation with new directives and chapters about wildcards and...
Stefan Eissing [Tue, 25 Jun 2019 11:14:38 +0000 (11:14 +0000)]
 mod_md: updated documenation with new directives and chapters about wildcards and monitoring.

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

2 months ago* modules/proxy/mod_proxy.c (create_proxy_config): Tag the pool.
Joe Orton [Tue, 25 Jun 2019 10:57:00 +0000 (10:57 +0000)]
* modules/proxy/mod_proxy.c (create_proxy_config): Tag the pool.

* modules/lua/mod_lua.c (lua_post_config, create_vm_spec): Tag pools.

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

2 months ago* modules/dav/main/mod_dav.c (dav_send_multistatus): Tag the pool.
Joe Orton [Tue, 25 Jun 2019 09:00:13 +0000 (09:00 +0000)]
* modules/dav/main/mod_dav.c (dav_send_multistatus): Tag the pool.

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

2 months ago mod_md: copy recent fixes, adding new sources to mod_md.dsp
Stefan Eissing [Tue, 25 Jun 2019 08:56:57 +0000 (08:56 +0000)]
  mod_md: copy recent fixes, adding new sources to mod_md.dsp
  Adding module to CMakeLists, needs testing.

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