]> granicus.if.org Git - apache/log
apache
5 years 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

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

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

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

5 years ago* modules/dav/main/props.c (dav_do_prop_subreq): Allocate escaped URI
Joe Orton [Tue, 25 Jun 2019 08:56:06 +0000 (08:56 +0000)]
* modules/dav/main/props.c (dav_do_prop_subreq): Allocate escaped URI
  out of propdb pool, fixing small per-resource leak during a PROPFIND
  walk.

Submitted by: jorton, rpluem

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

5 years agoSimplify handling of short-lived pool for dav_propdb in mod_dav. No
Joe Orton [Tue, 25 Jun 2019 08:54:01 +0000 (08:54 +0000)]
Simplify handling of short-lived pool for dav_propdb in mod_dav.  No
functional change.

* modules/dav/main/props.c (dav_popen_propdb): Rename from
  dav_open_propdb, take a pool argument.
  (dav_open_propdb): Reimplement in terms of above, using
  r->pool.
  (dav_propfind_walker): Switch to using dav_open_propdb
  with scratchpool.

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

5 years agoSet connectiontimeout for mod_proxy_hcheck.
Jean-Frederic Clere [Mon, 24 Jun 2019 16:29:22 +0000 (16:29 +0000)]
Set connectiontimeout for mod_proxy_hcheck.
Fix for https://issues.jboss.org/browse/JBCS-448

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

5 years ago *) mod_md: bringing over v2.0.6 from github.
Stefan Eissing [Mon, 24 Jun 2019 16:04:32 +0000 (16:04 +0000)]
  *) mod_md: bringing over v2.0.6 from github.
     - supports the ACMEv2 protocol
     - supports the new challenge method 'tls-alpn-01'
     - supports command configuration to setup/teardown 'dns-01' challenges
     - supports wildcard certificates when dns challenges are configured
     - ACMEv2 is the new default and will be used on the next certificate renewal,
       unless another MDCertificateAuthority is configured
     - challenge type 'tls-sni-01' has been removed as CAs do not offer this any longer
     - a domain exposes its status at https://<domain>/.httpd/certificate-status
     - Managed Domains are now in Apache's 'server-status' page
     - A new handler 'md-status' exposes verbose status information in JSON format
     - new directives "MDCertificateFile" and "MDCertificateKeyFile" to configure a
       Managed Domain that uses static files. Auto-renewal is turned off for those.
     - new MDMessageCmd that is invoked on several events: 'renewed', 'expiring' and
       'errored'. New 'MDWarnWindow' directive to configure when expiration warnings
       shall be issued.
     - ACMEv2 endpoints use the GET via empty POST way of accessing resources, see
       announcement by Let's Encrypt:
       https://community.letsencrypt.org/t/acme-v2-scheduled-deprecation-of-unauthenticated-resource-gets/74380

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

5 years agomod_ssl: use OPENSSL_init_ssl() to initialise OpenSSL on versions 1.1+.
Graham Leggett [Sun, 23 Jun 2019 21:55:48 +0000 (21:55 +0000)]
mod_ssl: use OPENSSL_init_ssl() to initialise OpenSSL on versions 1.1+.

Reference: http://openssl.6102.n7.nabble.com/Shutting-down-openssl-is-the-correct-thing-to-do-nothing-td76857.html#a76862

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

5 years agoAfter reinstatement of DSO support in APR/APR-util, revert r1837437,
Graham Leggett [Sun, 23 Jun 2019 21:10:23 +0000 (21:10 +0000)]
After reinstatement of DSO support in APR/APR-util, revert r1837437,
r1837435, r1834553, r1833598, r1833452, r1833383, r1833368.

Undoes the following:

mod_ssl: OpenSSL now initializes fully through APR, use that.

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.

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.

Follow up to r1833368: apr_crypto_prng_after_fork() now used a PID.

Make use of the new apr_crypto_rng API if available.

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

5 years agoFrench doc rebuild.
Lucien Gentis [Sat, 22 Jun 2019 16:20:11 +0000 (16:20 +0000)]
French doc rebuild.

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

5 years agofrench doc rebuild.
Lucien Gentis [Sat, 22 Jun 2019 16:16:02 +0000 (16:16 +0000)]
french doc rebuild.

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

5 years agoVersion num update.
Lucien Gentis [Sat, 22 Jun 2019 16:14:31 +0000 (16:14 +0000)]
Version num update.

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

5 years agoVersion num mismatch.
Lucien Gentis [Sat, 22 Jun 2019 16:12:17 +0000 (16:12 +0000)]
Version num mismatch.

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

5 years agoMisplaced contextlist tag.
Lucien Gentis [Sat, 22 Jun 2019 15:58:49 +0000 (15:58 +0000)]
Misplaced contextlist tag.

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

5 years agoxml fr doc update.
Lucien Gentis [Sat, 22 Jun 2019 15:54:12 +0000 (15:54 +0000)]
xml fr doc update.

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

5 years agoAdd support for SHA-2 crypt() algorithm in htpasswd.
Joe Orton [Fri, 21 Jun 2019 16:20:29 +0000 (16:20 +0000)]
Add support for SHA-2 crypt() algorithm in htpasswd.

* configure.in: Detect SHA-2 support in crypt().

* support/passwd_common.h: Define ALG_CRYPT_SHA256, ALG_CRYPT_SHA512,
  include ap_config_auto.h.

* support/htpasswd.c (check_args): Allow -2, -5, -r arguments for
  SHA-256, SHA-256 and rounds options respectively.

* support/passwd_common.c
  (parse_common_options): Parse -2, -5, -r args.
  (mkhash): Generate crypt hash for SHA256/SHA512 algorithms.

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

5 years ago* configure.in, acinclude.m4: Inline APACHE_GEN_MAKEFILES in AC_CONFIG_COMMANDS
Joe Orton [Fri, 21 Jun 2019 13:30:17 +0000 (13:30 +0000)]
* configure.in, acinclude.m4: Inline APACHE_GEN_MAKEFILES in AC_CONFIG_COMMANDS
  and run during the "normal" phase of ./config.status rather than as init-cmds.

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

5 years ago* configure.in: Move modules.c creation to config.status.
Joe Orton [Fri, 21 Jun 2019 09:45:28 +0000 (09:45 +0000)]
* configure.in: Move modules.c creation to config.status.

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

5 years ago* configure.in: Fix enabling httpdunit w/o --enable-reduced-exports.
Joe Orton [Fri, 21 Jun 2019 09:35:38 +0000 (09:35 +0000)]
* configure.in: Fix enabling httpdunit w/o --enable-reduced-exports.

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

5 years ago* build/config_vars.sh.in: Remove test-suite (builddir-specific) vars
Joe Orton [Fri, 21 Jun 2019 09:33:22 +0000 (09:33 +0000)]
* build/config_vars.sh.in: Remove test-suite (builddir-specific) vars
  from installed config_vars.mk.

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

5 years ago* server/scoreboard.c (open_scoreboard): Create the scoreboard in the
Joe Orton [Fri, 21 Jun 2019 09:24:19 +0000 (09:24 +0000)]
* server/scoreboard.c (open_scoreboard): Create the scoreboard in the
  parent of pconf rather than creating another global pool.

PR: 43471

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

5 years ago* server/util.c: Make "nul" symbol private.
Joe Orton [Thu, 20 Jun 2019 14:47:23 +0000 (14:47 +0000)]
* server/util.c: Make "nul" symbol private.

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

5 years agoAdd an --enable-reduced-exports configure option to link libmain.a
Joe Orton [Thu, 20 Jun 2019 13:00:37 +0000 (13:00 +0000)]
Add an --enable-reduced-exports configure option to link libmain.a
using ld's --whole-archive mode and avoid building exports.c entirely.
This reduces the size of a minimal httpd binary by 18% on Linux/x86_64
(687K to 560K) with no difference to the set of symbols available to
modules.

This option is only appropriate to use if using a shared libapr*
build, hence is non-default.

* configure.in: Add --enable-reduced-exports; disable httpdunit build
  if used.  Define AP_FORCE_EXPORTS if not enabled (default) in place
  of AP_USING_AUTOCONF.

* server/main.c (ap_suck_in_APR): Only build if AP_FORCE_EXPORTS is
  defined.

* Makefile.in: Link libmain.la using LIBMAIN_LIB.

* server/Makefile.in: Conditionally build exports.c into libmain.

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

5 years agoClarify pool lifetime constraints when modifying ap_server_config_defines.
Joe Orton [Thu, 20 Jun 2019 07:27:06 +0000 (07:27 +0000)]
Clarify pool lifetime constraints when modifying ap_server_config_defines.

PR: 63516

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

5 years agofollowup to r1861542: return early from error path
Eric Covener [Tue, 18 Jun 2019 11:04:50 +0000 (11:04 +0000)]
followup to r1861542: return early from error path

avoid setting a location: header of a non-URL 500 error path

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

5 years agoadd RedirectRelative directive to allow relative Redirect targets
Eric Covener [Mon, 17 Jun 2019 18:35:24 +0000 (18:35 +0000)]
add RedirectRelative directive to allow relative Redirect targets

2616 forbade relative redirect URLs, but 7231 allows them
Early 2.2 maintenance levels did not fix them up, but later 2.2 and all 2.4
fixed them up with ap_construct_url().

Allow opt-in to not fixing up relative URLs with RedirectRelative

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

5 years agostyle: cmd_rec at the bottom
Eric Covener [Mon, 17 Jun 2019 17:06:34 +0000 (17:06 +0000)]
style: cmd_rec at the bottom

no functional change

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

5 years agoAdd missing space in default string of MimeOptions
Christophe Jaillet [Sun, 16 Jun 2019 14:09:27 +0000 (14:09 +0000)]
Add missing space in default string of MimeOptions

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

5 years agoFix:
Christophe Jaillet [Sun, 16 Jun 2019 14:02:30 +0000 (14:02 +0000)]
Fix:
   - some missing syntax highlight
   - a default value not refelcted in quickreference
   - a missing link between

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

5 years agoFix an example in doc
Christophe Jaillet [Sun, 16 Jun 2019 12:02:18 +0000 (12:02 +0000)]
Fix an example in doc

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

5 years agoFix an example in doc
Christophe Jaillet [Sun, 16 Jun 2019 11:25:06 +0000 (11:25 +0000)]
Fix an example in doc

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

5 years ago'flags' are optional in SSLCARevocationCheck. Update the syntax accordingly.
Christophe Jaillet [Sun, 16 Jun 2019 09:07:49 +0000 (09:07 +0000)]
'flags' are optional in SSLCARevocationCheck. Update the syntax accordingly.

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

5 years agoFix missing description of 2 directives
Christophe Jaillet [Sun, 16 Jun 2019 08:46:36 +0000 (08:46 +0000)]
Fix missing description of 2 directives

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

5 years agouse the provided types via the macro
Eric Covener [Sat, 15 Jun 2019 19:39:48 +0000 (19:39 +0000)]
use the provided types via the macro

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

5 years ago * mod_http2: adding support for the new trailer tests.
Stefan Eissing [Fri, 14 Jun 2019 12:01:01 +0000 (12:01 +0000)]
 * mod_http2: adding support for the new trailer tests.

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

5 years ago *) mod_proxy_http2: adding support for handling trailers in both directions. PR...
Stefan Eissing [Fri, 14 Jun 2019 11:59:33 +0000 (11:59 +0000)]
  *) mod_proxy_http2: adding support for handling trailers in both directions. PR 63502.

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

5 years agoAvoid duplicated APLOGNO.
Christophe Jaillet [Fri, 14 Jun 2019 11:58:00 +0000 (11:58 +0000)]
Avoid duplicated APLOGNO.

In this case, the difference is tiny, but it could ease diagniostic (and numbers are cheap anyway)

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

5 years agoReserve 2 new numbers
Christophe Jaillet [Fri, 14 Jun 2019 11:52:25 +0000 (11:52 +0000)]
Reserve 2 new numbers

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

5 years agoFollow up to r1847232.
Christophe Jaillet [Fri, 14 Jun 2019 11:46:18 +0000 (11:46 +0000)]
Follow up to r1847232.
There is no point to use "old" numbers in recent commit.

Also avoid number duplication. The messages are the same but in different code path, so having different numbers makes sense.
This also avoids a warning when running:
   make update-log-msg-tags

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

5 years agoReserve new numbers
Christophe Jaillet [Fri, 14 Jun 2019 11:42:12 +0000 (11:42 +0000)]
Reserve new numbers

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

5 years agoBe a little more verbose when an error in trigerred in 'ap_set_file_slot()'
Christophe Jaillet [Thu, 13 Jun 2019 19:49:10 +0000 (19:49 +0000)]
Be a little more verbose when an error in trigerred in 'ap_set_file_slot()'

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

5 years ago* modules/ssl/ssl_engine_config.c (ssl_cmd_check_file):
Joe Orton [Thu, 13 Jun 2019 15:34:28 +0000 (15:34 +0000)]
* modules/ssl/ssl_engine_config.c (ssl_cmd_check_file):
  If dumping the config, don't validate the paths.  Allows
  e.g. "httpd -L" to work w/ certs configured but not present,
  doesn't affect "httpd -t".

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

5 years agorebuild site map
Luis Gil [Mon, 10 Jun 2019 23:00:14 +0000 (23:00 +0000)]
rebuild site map

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

5 years agoupdated ES
Luis Gil [Mon, 10 Jun 2019 22:19:19 +0000 (22:19 +0000)]
updated ES

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

5 years agoUpdating to match commit EN revision 185570
Luis Gil [Mon, 10 Jun 2019 22:16:22 +0000 (22:16 +0000)]
Updating to match commit EN revision 185570

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

5 years agoUpdating to match commit EN revision 185570
Luis Gil [Mon, 10 Jun 2019 22:16:00 +0000 (22:16 +0000)]
Updating to match commit EN revision 185570

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

5 years agoadded the ISGR https://www.abetterinternet.org/ url
Luis Gil [Mon, 10 Jun 2019 19:42:16 +0000 (19:42 +0000)]
added the ISGR https://www.abetterinternet.org/ url

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

5 years ago * modules/http2: more copying of data to disentangle worker processing from main...
Stefan Eissing [Tue, 28 May 2019 12:52:37 +0000 (12:52 +0000)]
 * modules/http2: more copying of data to disentangle worker processing from main connection

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

5 years ago * modules/http2: reverting r1859724, as no good.
Stefan Eissing [Tue, 28 May 2019 12:42:17 +0000 (12:42 +0000)]
 * modules/http2: reverting r1859724, as no good.

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

5 years ago Addendum to r1856493: check NULLness of new arg parameter.
Stefan Eissing [Thu, 23 May 2019 14:29:10 +0000 (14:29 +0000)]
 Addendum to r1856493: check NULLness of new arg parameter.

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

5 years ago *) mod_http2: internal code cleanups and simplifications. Common output code for
Stefan Eissing [Wed, 22 May 2019 13:41:36 +0000 (13:41 +0000)]
  *) mod_http2: internal code cleanups and simplifications. Common output code for
     h2 and h2c protocols, using nested mutex locks for simplified calls. [Stefan Eissing]

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

5 years ago* Fix the logic to follow the comment. So far we only forwarded the header if
Ruediger Pluem [Wed, 22 May 2019 09:54:05 +0000 (09:54 +0000)]
* Fix the logic to follow the comment. So far we only forwarded the header if
  we have NOT used it AND the env variable was set. But if we have not
  used it we should forward it in any case independent of the env variable
  setting.
  This aligns also with the behaviour in ap_proxy_create_hdrbrgd.

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 18 May 2019 12:12:11 +0000 (12:12 +0000)]
fr doc rebuild.

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

5 years agoXML fr doc update.
Lucien Gentis [Sat, 18 May 2019 12:11:14 +0000 (12:11 +0000)]
XML fr doc update.

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

5 years agoFollow up to r1859371: extend to other ap_proxy_connection_create[_ex]() users.
Yann Ylavic [Fri, 17 May 2019 08:42:17 +0000 (08:42 +0000)]
Follow up to r1859371: extend to other ap_proxy_connection_create[_ex]() users.

This function now now handles SSL reuse as well as the "proxy-request-hostname"
note (SNI), so let's also call it unconditionnaly in all proxy modules.

On the mod_ssl side, since this note has the lifetime of the connection, don't
reset/unset it during handshake (ssl_io_filter_handshake).

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

5 years agomod_proxy/ssl: Proxy SSL client certificate
Rainer Jung [Thu, 16 May 2019 12:52:29 +0000 (12:52 +0000)]
mod_proxy/ssl: Proxy SSL client certificate
configuration and other proxy SSL configurations
broken inside <Proxy> context.
PR 63430
Triggered by r1855646+r1855748.
Patch from rpluem (proxy) and ylavic (ssl).

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

5 years agoArrange balancer_handler() to be able to call
Jean-Frederic Clere [Tue, 14 May 2019 15:26:08 +0000 (15:26 +0000)]
Arrange balancer_handler() to be able to call
balancer_process_balancer_worker() to create/enable/disable
workers from another modules via a provider.
No functional changes in this first commit.

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

5 years ago* Only do one retry to be more in line with the other modules.
Ruediger Pluem [Tue, 14 May 2019 08:07:23 +0000 (08:07 +0000)]
* Only do one retry to be more in line with the other modules.

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

5 years agoAxe some outdated compatibility notes
Christophe Jaillet [Sat, 11 May 2019 05:45:02 +0000 (05:45 +0000)]
Axe some outdated compatibility notes

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

5 years agoFix a typo spotted by Ioannis Cherouvim (PR 63414)
Christophe Jaillet [Thu, 9 May 2019 20:07:12 +0000 (20:07 +0000)]
Fix a typo spotted by Ioannis Cherouvim (PR 63414)

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

5 years agoThe bump in r1855311 looks slighly optimistic.
Christophe Jaillet [Sun, 5 May 2019 09:51:48 +0000 (09:51 +0000)]
The bump in r1855311 looks slighly optimistic.

March, 12th should be enough

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

5 years ago* modules/cache/mod_socache_shmcb.c (socache_shmcb_init): Describe
Joe Orton [Fri, 3 May 2019 09:07:32 +0000 (09:07 +0000)]
* modules/cache/mod_socache_shmcb.c (socache_shmcb_init): Describe
  error better for anon shm failure case, fixing gcc 9 warning on
  passing NULL for '%s'.

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 27 Apr 2019 13:14:56 +0000 (13:14 +0000)]
fr doc rebuild.

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

5 years agoXML fr doc update.
Lucien Gentis [Sat, 27 Apr 2019 13:13:46 +0000 (13:13 +0000)]
XML fr doc update.

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

5 years agorevert r1857857.
Christophe Jaillet [Wed, 24 Apr 2019 20:22:54 +0000 (20:22 +0000)]
revert r1857857.

The comment is useful and the dead-code is future proof (and should be axed by the compiler anyway)

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

5 years agoFix a compilation error when GPROF is defined.
Christophe Jaillet [Sat, 20 Apr 2019 07:21:03 +0000 (07:21 +0000)]
Fix a compilation error when GPROF is defined.

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

5 years agoAxe a useless comment.
Christophe Jaillet [Sat, 20 Apr 2019 07:01:29 +0000 (07:01 +0000)]
Axe a useless comment.

Remove some dead code and innacurate comment. 'r' can not be dereferenced later in the function. (this is obvious since r1814659)

(Reverted in r1858070)

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

5 years agoFix use of StateDir directive after r1852982:
Joe Orton [Thu, 18 Apr 2019 10:25:33 +0000 (10:25 +0000)]
Fix use of StateDir directive after r1852982:

* server/core.c (reset_config): Rename from reset_config_defines;
  tie core_state_dir to pconf lifetime in this cleanup.
  (core_pre_config): Adjust accordingly.

* modules/md/mod_md_config.c (md_config_post_config): Pick up base_dir
  from statedir in post-config phase so StateDir can influence it.

* modules/dav/fs/mod_dav_fs.c (dav_fs_create_server_config): Don't
  init lockdb_path here.  (dav_fs_post_config): New function; set
  lockdb_path based on configured statedir.

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

5 years agoTransforms.
Joe Orton [Tue, 16 Apr 2019 08:13:46 +0000 (08:13 +0000)]
Transforms.

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

5 years agoAdd security note on CoreDumpDirectory for Linux.
Joe Orton [Tue, 16 Apr 2019 07:54:27 +0000 (07:54 +0000)]
Add security note on CoreDumpDirectory for Linux.

Reviewed by: icing, elukey

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

5 years agoFix wrong use of ap_rputs with formats.
Rainer Jung [Sun, 14 Apr 2019 13:21:08 +0000 (13:21 +0000)]
Fix wrong use of ap_rputs with formats.
Use ap_rprintf instead.
It seems noone has PIPE_BUF defined.

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

5 years agoFollow up to r1857129: CHANGES entry.
Yann Ylavic [Mon, 8 Apr 2019 18:52:00 +0000 (18:52 +0000)]
Follow up to r1857129: CHANGES entry.

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

5 years agomod_reqtimeout: fix default_[stage]_rate_factor initializations.
Yann Ylavic [Mon, 8 Apr 2019 18:46:12 +0000 (18:46 +0000)]
mod_reqtimeout: fix default_[stage]_rate_factor initializations.

r1853901 lowercased the [stage] for MRT_DEFAULT_[stage]_* macros but missed
to change the ones used in reqtimeout_hooks() to initialize the default rate
factors, leading to no default rate in 2.4.39. Fix that now. PR 63325.

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

5 years agoRemoving no longer existing h2 source file from cmake.
Stefan Eissing [Thu, 4 Apr 2019 10:04:52 +0000 (10:04 +0000)]
Removing no longer existing h2 source file from cmake.

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

5 years agoWell, our build with latest APR trunk seems to insist on updating apr_common.m4
Yann Ylavic [Tue, 2 Apr 2019 21:37:27 +0000 (21:37 +0000)]
Well, our build with latest APR trunk seems to insist on updating apr_common.m4

So be it.

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

5 years agoFix for: [Bug 62372] Load balancer byrequests required when bytraffic chosen
Jim Jagielski [Tue, 2 Apr 2019 15:00:43 +0000 (15:00 +0000)]
Fix for: [Bug 62372] Load balancer byrequests required when bytraffic chosen

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

5 years agoPR63305: fix graceful restart crashes in LDAP
Eric Covener [Mon, 1 Apr 2019 14:29:14 +0000 (14:29 +0000)]
PR63305: fix graceful restart crashes in LDAP

The cache destruction was not protected by the lock used by other
cache callers.

Pull the static cleanup function into util_ldap.c so it's convenient to
use the existing locking.

Submitted By: Martin FĂșsek <mfusek newps.cz>
Commited By: covener

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

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

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

5 years agoXML files fr doc updates.
Lucien Gentis [Sat, 30 Mar 2019 15:33:49 +0000 (15:33 +0000)]
XML files fr doc updates.

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

5 years agoRevert r1856560: was not the latest apr_common.m4 version anyway...
Yann Ylavic [Fri, 29 Mar 2019 17:37:38 +0000 (17:37 +0000)]
Revert r1856560: was not the latest apr_common.m4 version anyway...

How does that change came in my local workspace in the first place??

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

5 years agoUpdate apr_common.m4 to latest (trunk).
Yann Ylavic [Fri, 29 Mar 2019 17:33:23 +0000 (17:33 +0000)]
Update apr_common.m4 to latest (trunk).

Note: why is that file in the httpd repo??

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

5 years agomod_cache: follow up to r1856493: cache_strqtok() to reject quoted tokens.
Yann Ylavic [Thu, 28 Mar 2019 22:39:31 +0000 (22:39 +0000)]
mod_cache: follow up to r1856493: cache_strqtok() to reject quoted tokens.

Use a real state machine to track where quotes are allowed, and for
better clarity too...

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

5 years agomod_cache: follow up to r1856493: always terminate cache_strqtok() returns.
Yann Ylavic [Thu, 28 Mar 2019 18:22:23 +0000 (18:22 +0000)]
mod_cache: follow up to r1856493: always terminate cache_strqtok() returns.

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

5 years agomod_cache: Fix parsing of quoted Cache-Control token arguments. PR 63288.
Yann Ylavic [Thu, 28 Mar 2019 16:39:39 +0000 (16:39 +0000)]
mod_cache: Fix parsing of quoted Cache-Control token arguments. PR 63288.

Make cache_strqtok() return both the token and its unquoted argument (if any),
or an error if the parsing fails.

Cache-Control integer values (max-age, max-stale, ...) can then be parsed w/o
taking care of the (optional) quoting.

Suggested by: fielding

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

5 years agoFollow up to r1856490: missing one mod_log_forensic test_char_table case.
Yann Ylavic [Thu, 28 Mar 2019 16:27:26 +0000 (16:27 +0000)]
Follow up to r1856490: missing one mod_log_forensic test_char_table case.

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

5 years agoProvide TEST_CHAR marco in test_char.h
Yann Ylavic [Thu, 28 Mar 2019 16:24:30 +0000 (16:24 +0000)]
Provide TEST_CHAR marco in test_char.h

For (internal) usage outside server/util.c, mod_log_forensic for now
and mod_cache (T_HTTP_TOKEN_STOP) in a few...

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

5 years agoadd loadmodule line to sochache_redis to httpd.conf in Windows
Gregg Lewis Smith [Tue, 26 Mar 2019 15:52:28 +0000 (15:52 +0000)]
add loadmodule line to sochache_redis to httpd.conf in Windows

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

5 years ago *) mod_md: Store permissions are enforced on file creation, enforcing restrictions in
Stefan Eissing [Tue, 26 Mar 2019 10:57:51 +0000 (10:57 +0000)]
  *) mod_md: Store permissions are enforced on file creation, enforcing restrictions in
     spite of umask. Fixes <https://github.com/icing/mod_md/issues/117>. [Stefan Eissing]

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

5 years agomod_proxy: follow up to r1836588: configurable Proxy100Continue.
Yann Ylavic [Fri, 22 Mar 2019 09:53:29 +0000 (09:53 +0000)]
mod_proxy: follow up to r1836588: configurable Proxy100Continue.

Add Proxy100Continue directive to allow for 100-continue forwarding opt-out.

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

5 years ago* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access_modern): Correctly
Joe Orton [Tue, 19 Mar 2019 17:26:38 +0000 (17:26 +0000)]
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access_modern): Correctly
  restore SSL verify state after PHA failure in TLSv1.3.

Submitted by: Michael Kaufmann <mail michael-kaufmann.ch>

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

5 years ago *) mod_md: Explicitly setting file permissions to break out of umasks. We want our
Stefan Eissing [Mon, 18 Mar 2019 16:05:04 +0000 (16:05 +0000)]
  *) mod_md: Explicitly setting file permissions to break out of umasks. We want our
     non-privilegded apache user to be able to read them. See github issue
     <https://github.com/icing/mod_md/issues/117>. [Stefan Eissing]

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

5 years agorephrase MimeOptions description
Eric Covener [Mon, 18 Mar 2019 13:45:36 +0000 (13:45 +0000)]
rephrase MimeOptions description

rephrase to account for e.g. AddHandler which isn't about response metadata.

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

5 years agoremove null check
Eric Covener [Mon, 18 Mar 2019 12:25:48 +0000 (12:25 +0000)]
remove null check

fails in maintainer mode w/ __attribute__(nonnull))

util.c:576:10: error: nonnull parameter 'name' will evaluate to 'true'
on first encounter [-Werror,-Wpointer-bool-conversion]

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

5 years ago* Solve a chicken and egg problem here:
Ruediger Pluem [Mon, 18 Mar 2019 10:18:55 +0000 (10:18 +0000)]
* Solve a chicken and egg problem here:
  We need to have sslconn->dc set correctly when we want to
  init sslconn, but we need to allocate memory for it first.

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

5 years ago* r->parsed_uri.path can be NULL in case of the CONNECT method.
Ruediger Pluem [Mon, 18 Mar 2019 09:21:26 +0000 (09:21 +0000)]
* r->parsed_uri.path can be NULL in case of the CONNECT method.

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

5 years ago* Play safe in case we get no name
Ruediger Pluem [Mon, 18 Mar 2019 09:19:54 +0000 (09:19 +0000)]
* Play safe in case we get no name

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

5 years ago* Revert r1855741 which committed other stuff as well.
Ruediger Pluem [Mon, 18 Mar 2019 09:17:50 +0000 (09:17 +0000)]
* Revert r1855741 which committed other stuff as well.

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

5 years ago* Play safe in case we get no name
Ruediger Pluem [Mon, 18 Mar 2019 09:16:06 +0000 (09:16 +0000)]
* Play safe in case we get no name

Reverted by r1855742.

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

5 years agoMerge consecutive slashes in the URL by default
Eric Covener [Sun, 17 Mar 2019 14:41:10 +0000 (14:41 +0000)]
Merge consecutive slashes in the URL by default

opt-out w/ `MergeSlashes OFF`.

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