]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
2 years agomod_ssl: Fix deprecation warnings with openssl-3.
Yann Ylavic [Sun, 19 Mar 2023 21:30:47 +0000 (21:30 +0000)] 
mod_ssl: Fix deprecation warnings with openssl-3.

* mod_ssl_openssl.h:
  Make it the first openssl to be included openssl header, selecting the
  OpenSSL api based on OPENSSL_API_COMPAT eventually.

* ssl_private.h;
  Define OPENSSL_API_COMPAT to version 1.1.1 (last one supporting EGINE_ API)
  before including mod_ssl_openssl.h to enable the ENGINE_ api (TODO: switch to
  new "providers" api before the ENGINE_ api is abandonned..).
  mod_ssl.h is now implicitely included from there.
  Fix preprocessor "#define FOO (COND)" to "#if COND #define FOO 1 #else #define FOO 0".
  Define MODSSL_HAVE_ENGINE_API iff OPENSSL_API_COMPAT < 3.0 (otherwise all the
  engine features are disabled, only "builtin" is accepted).
  Define HAVE_SRP iff OPENSSL_API_COMPAT < 3.0 (no replacement for this api
  above, so it might not be implemenentedain httpd anymore at some point..).
  Define X509_get_not{Before,After} if missing to the non deprecated version.
  New modssl_set_io_callbacks() to factorize compat code for io callbacks.
  ssl_dh_GetParamFromFile() becomes modssl_dh_from_file() for openssl < 3.0 and
  modssl_dh_pkey_from_file() for openssl >= 3.0.

* mod_ssl.c, mod_ssl_ct.c, ssl_util_stapling:
  Including "ssl_private.h" only is suited/enough now.

* mod_ssl_ct.c, ssl_ct_log_config:
  Use EVP api with openssl >= 3 instead of the deprecated SHA256 one.

* ssl_engine_config.c(ssl_cmd_SSLCryptoDevice):
  Disabled engines (besides NULL/"builtin"/NULL) unless MODSSL_HAVE_ENGINE_API.

* ssl_engine_init:
  New compat modssl_runtime_lib_version() to address deprecated SSLeay().
  ssl_init_Engine() does nothing unless MODSSL_HAVE_ENGINE_API.
  Simplify ssl_init_server_certs() (less #ifdef-ery) with scoped local vars.
  Compat loading DH parameters and EC curve from cert.

* ssl_engine_io.c, ssl_engine_kernel.c:
  Implement common modssl_set_io_callbacks() and use it.

* ssl_engine_pphrase(modssl_load_engine_keypair):
  Depend on MODSSL_HAVE_ENGINE_API, or return ENOTIMPL.

* ssl_util.c(modssl_is_engine_id):
  No engine supported unless MODSSL_HAVE_ENGINE_API.

* ssl_util_ssl.c(modssl_dh_pkey_from_file, modssl_ec_group_from_file):
  Compat with openssl >= 3.0.

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

2 years agorerun failing tests with -v
Eric Covener [Sun, 19 Mar 2023 21:04:00 +0000 (21:04 +0000)] 
rerun failing tests with -v

Submitted by: covener

Github: closes #349

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

2 years agomod_http2: Fix memory leak in calc_sha256_hash().
Yann Ylavic [Sat, 18 Mar 2023 15:28:33 +0000 (15:28 +0000)] 
mod_http2: Fix memory leak in calc_sha256_hash().

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

2 years agofr doc rebuild.
Lucien Gentis [Sat, 18 Mar 2023 14:55:53 +0000 (14:55 +0000)] 
fr doc rebuild.

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

2 years agofr doc XML files updates.
Lucien Gentis [Sat, 18 Mar 2023 14:54:47 +0000 (14:54 +0000)] 
fr doc XML files updates.

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

2 years agoTypo.
Lucien Gentis [Sat, 18 Mar 2023 14:52:15 +0000 (14:52 +0000)] 
Typo.

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

2 years agoab: Use new openssl-3 API when available.
Yann Ylavic [Thu, 16 Mar 2023 14:36:01 +0000 (14:36 +0000)] 
ab: Use new openssl-3 API when available.

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

2 years agono longer correct
Eric Covener [Wed, 15 Mar 2023 20:34:09 +0000 (20:34 +0000)] 
no longer correct

[skip ci]

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

2 years agoRepurpose test for apr-1.8.x (1.7.x being tested elsewhere already).
Yann Ylavic [Wed, 15 Mar 2023 14:13:09 +0000 (14:13 +0000)] 
Repurpose test for apr-1.8.x (1.7.x being tested elsewhere already).

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

2 years agoUpdate ErrorLogFormat CHANGES entry for the full story.
Yann Ylavic [Wed, 15 Mar 2023 10:55:17 +0000 (10:55 +0000)] 
Update ErrorLogFormat CHANGES entry for the full story.

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

2 years agocore: Follow up to r1908393: comment about where ap_server_conf is set.
Yann Ylavic [Wed, 15 Mar 2023 10:42:57 +0000 (10:42 +0000)] 
core: Follow up to r1908393: comment about where ap_server_conf is set.

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

2 years agocore: Follow up to r1908393: ap_server_conf to NULL before ap_read_config().
Yann Ylavic [Tue, 14 Mar 2023 16:01:14 +0000 (16:01 +0000)] 
core: Follow up to r1908393: ap_server_conf to NULL before ap_read_config().

Just to be sure..

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

2 years agocore: Set ap_server_conf ASAP.
Yann Ylavic [Tue, 14 Mar 2023 15:48:41 +0000 (15:48 +0000)] 
core: Set ap_server_conf ASAP.

* server/config.c(ap_read_config):
  Set ap_server_conf as soon as it exists (with defaults).

* server/main.c(main):
  Now that ap_server_conf is set by ap_read_config(), just make
  sure it's not NULL afterward with an ap_assert()ion.

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

2 years agolog: Follow up to r1908388: ap_server_conf might be NULL.
Yann Ylavic [Tue, 14 Mar 2023 15:43:27 +0000 (15:43 +0000)] 
log: Follow up to r1908388: ap_server_conf might be NULL.

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

2 years agoutil_time: Follow up to r1908380: Avoid apr_snprintf() like others.
Yann Ylavic [Tue, 14 Mar 2023 15:41:42 +0000 (15:41 +0000)] 
util_time: Follow up to r1908380: Avoid apr_snprintf() like others.

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

2 years agocore: Use the main ErrorLogFormat for ap_log_perror() and while loading vhosts.
Yann Ylavic [Tue, 14 Mar 2023 14:37:00 +0000 (14:37 +0000)] 
core: Use the main ErrorLogFormat for ap_log_perror() and while loading vhosts.

* server/core.c(create_core_server_config):
  Init sconf->error_log_format early so that it applies while the vhost
  is loading.

* server/log.c(log_error_core):
  Get the core_server_config from the main server if no server/config is
  provided.

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

2 years agoutil_time: Follow up to r1908383: ap_recent_ctime_ex() docx about trailing NUL.
Yann Ylavic [Tue, 14 Mar 2023 12:24:37 +0000 (12:24 +0000)] 
util_time: Follow up to r1908383: ap_recent_ctime_ex() docx about trailing NUL.

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

2 years agoutil_time: Note/comments about ap_recent_ctime_ex() correctness wrt trailing \0
Yann Ylavic [Tue, 14 Mar 2023 12:19:34 +0000 (12:19 +0000)] 
util_time: Note/comments about ap_recent_ctime_ex() correctness wrt trailing \0

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

2 years agocore: Add formats %{z} and %{strftime-format} to ErrorLogFormat. PR 62161.
Yann Ylavic [Tue, 14 Mar 2023 11:11:24 +0000 (11:11 +0000)] 
core: Add formats %{z} and %{strftime-format} to ErrorLogFormat.  PR 62161.

%{z} prints the timezone offset (i.e. "[+-]nnnn") and %{strftime-format} allows
any %-format handled by [apr_]strftime().

* include/util_time.h():
  Define new AP_CTIME_OPTION_GMTOFF option for ap_recent_ctime_ex().

* server/util_time.c(ap_recent_ctime_ex):
  Handle AP_CTIME_OPTION_GMTOFF to print "[+-]nnnn" timezone.

* server/log.c(log_ctime):
  If the format contains a '%' it's for strftime(), otherwise it's builtin
  with new 'z' as AP_CTIME_OPTION_GMTOFF.

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

2 years agomod_rewrite's BNEG now replaced by BNE=
Yann Ylavic [Mon, 13 Mar 2023 21:22:09 +0000 (21:22 +0000)] 
mod_rewrite's BNEG now replaced by BNE=

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

2 years agomod_rewrite: Follow up to r1908347: Use [B, BNE=...] rather than [B=...,BNEG].
Yann Ylavic [Mon, 13 Mar 2023 21:17:52 +0000 (21:17 +0000)] 
mod_rewrite: Follow up to r1908347: Use [B, BNE=...] rather than [B=...,BNEG].

Replaces BNEG with BNE= for a more flexible syntax.

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

2 years agoclarify relationship
Eric Covener [Mon, 13 Mar 2023 17:51:39 +0000 (17:51 +0000)] 
clarify relationship

[skip ci]

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

2 years agodoc BNEG, improve related
Eric Covener [Mon, 13 Mar 2023 15:52:49 +0000 (15:52 +0000)] 
doc BNEG, improve related

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

2 years agounclosed
Eric Covener [Mon, 13 Mar 2023 15:40:58 +0000 (15:40 +0000)] 
unclosed

[skip ci]

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

2 years agomod_rewrite: New BNEG flag to negate B=, BCTLS and B= not mutually exclusive.
Yann Ylavic [Mon, 13 Mar 2023 13:49:13 +0000 (13:49 +0000)] 
mod_rewrite: New BNEG flag to negate B=, BCTLS and B= not mutually exclusive.

* modules/mappers/mod_rewrite.c(escape_backref):
  Handle [B=...,BNEG] to encode anthing not in B=, and [B=...,BCTLS] to
  encode both controls/space characters and anything set in B=.

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

2 years agoDo not double encode encoded slashes
Ruediger Pluem [Mon, 13 Mar 2023 10:24:30 +0000 (10:24 +0000)] 
Do not double encode encoded slashes

In case that AllowEncodedSlashes is set to NoDecode do not double encode
encoded slashes in the URL sent by the reverse proxy to the backend.

* include/ap_mmn.h: Document the addition of ap_proxy_canonenc_ex to the API.

* modules/proxy/mod_proxy.h: Declare ap_proxy_canonenc_ex and define flag
      values.

* modules/proxy/proxy_util.c: Implement ap_proxy_canonenc_ex by modifying
      ap_proxy_canonenc accordingly and reimplement ap_proxy_canonenc to
      use ap_proxy_canonenc_ex with the appropriate flag.

* modules/http2/mod_proxy_http2.c, modules/proxy/mod_proxy_*.c: Set the
      correct flag based on the AllowEncodedSlashes configuration and use
      ap_proxy_canonenc_ex instead of ap_proxy_canonenc.

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

2 years agoStop dumping error_log on failure, since is is now captured
Joe Orton [Mon, 13 Mar 2023 09:34:53 +0000 (09:34 +0000)] 
Stop dumping error_log on failure, since is is now captured
(at least in theory) as an artefact.

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

2 years ago* Favour HUGE_STRING_LEN * 2 over 1024 * 16
Ruediger Pluem [Mon, 13 Mar 2023 09:25:46 +0000 (09:25 +0000)] 
* Favour HUGE_STRING_LEN * 2 over 1024 * 16

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

2 years agomove B=xx example to the bottom
Eric Covener [Sat, 11 Mar 2023 22:40:11 +0000 (22:40 +0000)] 
move B=xx example to the bottom

show example with quoted flags and a space

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

2 years agoadd [BCTLS] alternative to [B] for 2.4.56 problems
Eric Covener [Sat, 11 Mar 2023 22:10:09 +0000 (22:10 +0000)] 
add [BCTLS] alternative to [B] for 2.4.56 problems

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

2 years agofollowup to r1908296: only for redirects
Eric Covener [Sat, 11 Mar 2023 21:29:11 +0000 (21:29 +0000)] 
followup to r1908296: only for redirects

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

2 years agoallow decoded chars when they will be escaped
Eric Covener [Sat, 11 Mar 2023 20:57:52 +0000 (20:57 +0000)] 
allow decoded chars when they will be escaped

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

2 years agofr doc rebuild.
Lucien Gentis [Sat, 11 Mar 2023 16:15:57 +0000 (16:15 +0000)] 
fr doc rebuild.

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

2 years agofr doc XML files updates.
Lucien Gentis [Sat, 11 Mar 2023 16:14:27 +0000 (16:14 +0000)] 
fr doc XML files updates.

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

2 years agomod_proxy: Check the query-string for proxy-noencode too.
Yann Ylavic [Fri, 10 Mar 2023 21:02:31 +0000 (21:02 +0000)] 
mod_proxy: Check the query-string for proxy-noencode too.

Follow up to r1907972 and r1908095.

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

2 years agoiFix proxy backend connection reuse tests.
Rainer Jung [Thu, 9 Mar 2023 23:13:42 +0000 (23:13 +0000)] 
iFix proxy backend connection reuse tests.
Use one curl exec with multiple URLs instead of separate
curl calls, so that we make sure we use the same
connection to the web server ending up in the same
httpd child process.

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

2 years agoSupport splitting mutiple outputs when using curl with
Rainer Jung [Thu, 9 Mar 2023 23:02:32 +0000 (23:02 +0000)] 
Support splitting mutiple outputs when using curl with
multiple URLs. E.g. provide a JSON array with the
individual JSON responses as items.

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

2 years agoMake test more robust, log might have a short delay.
Rainer Jung [Thu, 9 Mar 2023 22:59:20 +0000 (22:59 +0000)] 
Make test more robust, log might have a short delay.

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

2 years agoFix tests test_202_trailer.py::TestTrailers::test_h2_202_03b
Rainer Jung [Thu, 9 Mar 2023 10:52:14 +0000 (10:52 +0000)] 
Fix tests test_202_trailer.py::TestTrailers::test_h2_202_03b
and test_202_trailer.py::TestTrailers::test_h2_202_04 by adding
an explicit Content-Type header to the nghttp call.

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

2 years ago* Add CHANGES entry for r1907505 [skip ci]
Ruediger Pluem [Wed, 8 Mar 2023 09:55:07 +0000 (09:55 +0000)] 
* Add CHANGES entry for r1907505 [skip ci]

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

2 years ago* Fix 'warning: suggest parentheses around assignment used as truth value'
Ruediger Pluem [Tue, 7 Mar 2023 08:07:05 +0000 (08:07 +0000)] 
* Fix 'warning: suggest parentheses around assignment used as truth value'

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

2 years ago* Add a 'be' [skip ci]
Ruediger Pluem [Tue, 7 Mar 2023 07:34:08 +0000 (07:34 +0000)] 
* Add a 'be' [skip ci]

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

2 years agoUse ap_parse_strict_length() to parse client-supplied Content-Length
manu [Tue, 7 Mar 2023 01:51:02 +0000 (01:51 +0000)] 
Use ap_parse_strict_length() to parse client-supplied Content-Length

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

2 years agoRemove usuless double check of APR_FINFO_NAME neing set
manu [Tue, 7 Mar 2023 01:28:59 +0000 (01:28 +0000)] 
Remove usuless double check of APR_FINFO_NAME neing set

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

2 years agoAdd SSL_SHARED_CIPHER environment variable
Dirk-Willem van Gulik [Mon, 6 Mar 2023 17:46:04 +0000 (17:46 +0000)] 
Add SSL_SHARED_CIPHER environment variable

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

2 years ago* modules/http2/mod_proxy_http2.c: Fix missing APLOGNO.
Joe Orton [Mon, 6 Mar 2023 09:24:44 +0000 (09:24 +0000)] 
* modules/http2/mod_proxy_http2.c: Fix missing APLOGNO.

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

2 years agoavoid delimiting the query with a backreference
Eric Covener [Sun, 5 Mar 2023 20:31:40 +0000 (20:31 +0000)] 
avoid delimiting the query with a backreference

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

2 years agodon't forward invalid query strings
Eric Covener [Sun, 5 Mar 2023 20:27:11 +0000 (20:27 +0000)] 
don't forward invalid query strings

Submitted by: rpluem

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

2 years ago *) mod_md:
Stefan Eissing [Sun, 5 Mar 2023 09:59:34 +0000 (09:59 +0000)] 
  *) mod_md:
     - Enabling ED25519 support and certificate transparency information when
       building with libressl v3.5.0 and newer. Thanks to Giovanni Bechis.
     - MDChallengeDns01 can now be configured for individual domains.
       Thanks to Jérôme Billiras (@bilhackmac) for the initial PR.
     - Fixed a bug found by Jérôme Billiras (@bilhackmac) that caused the challenge
       teardown not being invoked as it should.

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

2 years ago *) mod_htt2: recent small improvements from the github/icing/mod_h2
Stefan Eissing [Sun, 5 Mar 2023 09:42:53 +0000 (09:42 +0000)] 
  *) mod_htt2: recent small improvements from the github/icing/mod_h2
     - conditional use of ap_thread* to allow compilation on older versions
     - fixed checks on CONNECT requests

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

2 years agoTest case updates related to macOS ventura changes:
Stefan Eissing [Sat, 4 Mar 2023 13:40:38 +0000 (13:40 +0000)] 
Test case updates related to macOS ventura changes:

- python 3.11 deprecates the `cg` module, replacing
  url query and multipart form-data handling with new code
- adaptions to changes in openssl/curl behaviours
- all mod_tls test cases now have prefix `test_tls_` for
  easier scoping.

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

2 years agos/to to/to/
Christophe Jaillet [Thu, 2 Mar 2023 19:50:12 +0000 (19:50 +0000)] 
s/to to/to/

[skip ci]

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

2 years agoAdd RFC4331 quotas for mod_dav_fs
manu [Thu, 2 Mar 2023 16:09:50 +0000 (16:09 +0000)] 
Add RFC4331 quotas for mod_dav_fs

Fix warnings

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

2 years agoAdd RFC4331 quotas for mod_dav_fs
manu [Thu, 2 Mar 2023 15:46:12 +0000 (15:46 +0000)] 
Add RFC4331 quotas for mod_dav_fs

Address forgotten svn add in previous commit

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

2 years agoSync changes [skip ci]
Yann Ylavic [Thu, 2 Mar 2023 15:24:08 +0000 (15:24 +0000)] 
Sync changes [skip ci]

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

2 years agomod_proxy_uwsgi: Stricter backend HTTP response parsing/validation
Yann Ylavic [Thu, 2 Mar 2023 15:10:30 +0000 (15:10 +0000)] 
mod_proxy_uwsgi: Stricter backend HTTP response parsing/validation

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

2 years agoFollow up to r1907972: CHANGES entry.
Yann Ylavic [Thu, 2 Mar 2023 15:03:20 +0000 (15:03 +0000)] 
Follow up to r1907972: CHANGES entry.

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

2 years agomod_proxy_uwsgi: Honor "proxy-nocanon" and "proxy-noencode".
Yann Ylavic [Thu, 2 Mar 2023 14:40:38 +0000 (14:40 +0000)] 
mod_proxy_uwsgi: Honor "proxy-nocanon" and "proxy-noencode".

Just like the other proxy modules.

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

2 years agoA server layout for NetBSD's pkgsrc default settings
manu [Thu, 2 Mar 2023 14:37:20 +0000 (14:37 +0000)] 
A server layout for NetBSD's pkgsrc default settings

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

2 years agoAdd RFC4331 quotas for mod_dav_fs
manu [Thu, 2 Mar 2023 14:36:31 +0000 (14:36 +0000)] 
Add RFC4331 quotas for mod_dav_fs

This is enabled by a new directive: DavQuota (Off|None|#bytes)
Off (default): feature disabled
None: no quota enforced, but used and available bytes are reported
#bytes: an numerical value in bytes as the quota to enforce

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

2 years agoFix NULL derefernece for anonymous users
manu [Thu, 2 Mar 2023 14:31:20 +0000 (14:31 +0000)] 
Fix NULL derefernece for anonymous users

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

2 years agomod_proxy: Don't decode r->uri and reencode in r->filename for mapping=encoded.
Yann Ylavic [Thu, 2 Mar 2023 14:30:20 +0000 (14:30 +0000)] 
mod_proxy: Don't decode r->uri and reencode in r->filename for mapping=encoded.

Decoding was not done for mapping=servlet only (a subset), but overlooked for
mapping=encoded. To avoid double-encoding in the canon_handler hook, use a new
"proxy-noencode" (similarly to "proxy-nocanon") entry in r->notes.

* proxy/mod_proxy.c(ap_proxy_trans_match):
  Set "proxy-noencode" in r->notes for PROXYPASS_MAP_ENCODED, and return DONE
  to avoid decoding in ap_process_request_internal().

* proxy/mod_proxy_http.c, proxy/mod_proxy_ajp.c, proxy/mod_proxy_wstunnel.c,
  proxy/mod_proxy_fcgi.c, proxy/mod_proxy_ajp.c, http2/mod_proxy_http2.c:
  Don't process the url through ap_proxy_canonenc() in canon_handler if
  "proxy-noencode" is set.

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

2 years agoAlso run CI for PRs against 2.4.x. [skip ci]
Joe Orton [Thu, 2 Mar 2023 09:56:50 +0000 (09:56 +0000)] 
Also run CI for PRs against 2.4.x. [skip ci]

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

2 years agofr doc rebuild.
Lucien Gentis [Sat, 25 Feb 2023 13:55:44 +0000 (13:55 +0000)] 
fr doc rebuild.

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

2 years agofr doc XML files updates.
Lucien Gentis [Sat, 25 Feb 2023 13:54:29 +0000 (13:54 +0000)] 
fr doc XML files updates.

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

2 years agofixups vs. early in check_authn
Eric Covener [Sun, 19 Feb 2023 18:59:44 +0000 (18:59 +0000)] 
fixups vs. early in check_authn

[skip ci]

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

2 years agoRe-order the fields of 'struct h2_session_props' to avoid a hole and some padding.
Christophe Jaillet [Sun, 19 Feb 2023 15:15:03 +0000 (15:15 +0000)] 
Re-order the fields of 'struct h2_session_props' to avoid a hole and some padding.

On x86_64, this shrinks the size of the struct from 40 to 32 bytes.

Before the patch, pahole states that:

struct h2_session_props {
int                        accepted_max;         /*     0     4 */
int                        completed_max;        /*     4     4 */
int                        emitted_count;        /*     8     4 */
int                        emitted_max;          /*    12     4 */
int                        error;                /*    16     4 */

/* XXX 4 bytes hole, try to pack */

const char  *              error_msg;            /*    24     8 */
unsigned int               accepting:1;          /*    32: 0  4 */
unsigned int               shutdown:1;           /*    32: 1  4 */

/* size: 40, cachelines: 1, members: 8 */
/* sum members: 28, holes: 1, sum holes: 4 */
/* sum bitfield members: 2 bits (0 bytes) */
/* padding: 4 */
/* bit_padding: 30 bits */
/* last cacheline: 40 bytes */
};

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

2 years agofr doc rebuild.
Lucien Gentis [Sat, 18 Feb 2023 14:22:35 +0000 (14:22 +0000)] 
fr doc rebuild.

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

2 years agofr doc XML file update.
Lucien Gentis [Sat, 18 Feb 2023 14:21:29 +0000 (14:21 +0000)] 
fr doc XML file update.

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

2 years agos/http/https/
Christophe Jaillet [Thu, 16 Feb 2023 19:20:46 +0000 (19:20 +0000)] 
s/http/https/

These links are visible from the root of the github page. (https://github.com/apache/httpd)
So, https is better than plain http.

[skip ci]

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

2 years ago *) mod_http2: new directive 'H2MaxDataFrameLen n' to limit the maximum
Stefan Eissing [Thu, 16 Feb 2023 11:58:45 +0000 (11:58 +0000)] 
  *) mod_http2: new directive 'H2MaxDataFrameLen n' to limit the maximum
     amount of response body bytes put into a single HTTP/2 DATA frame.
     Setting this to 0 places no limit (but the max size allowed by the
     protocol is observed).
     The module, by default, tries to use the maximum size possible, which is
     somewhat around 16KB. This sets the maximum. When less response data is
     available, smaller frames will be sent.

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

2 years ago *) mod_http2: deny protocol upgrade if the request has a chunked-encoded body.
Stefan Eissing [Thu, 16 Feb 2023 10:21:23 +0000 (10:21 +0000)] 
 *) mod_http2: deny protocol upgrade if the request has a chunked-encoded body.

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

2 years agoFix signedness formatting check in mod_dav code.
Stefan Eissing [Thu, 16 Feb 2023 10:09:02 +0000 (10:09 +0000)] 
Fix signedness formatting check in mod_dav code.

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

2 years agoFix warning for NULL pointer
manu [Wed, 15 Feb 2023 16:27:55 +0000 (16:27 +0000)] 
Fix warning for NULL pointer

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

2 years agoFix warnings
manu [Wed, 15 Feb 2023 14:07:14 +0000 (14:07 +0000)] 
Fix warnings

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

2 years agoconfigure: Assume crypt() does not support SHA-2 when cross-compiling.
Yann Ylavic [Wed, 15 Feb 2023 11:43:44 +0000 (11:43 +0000)] 
configure: Assume crypt() does not support SHA-2 when cross-compiling.

Can be forced with "./configure ap_cv_crypt_sha2=yes ..." still.

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

2 years agoRemove Travis configuration, it's no longer supported by the ASF. [skip ci]
Joe Orton [Wed, 15 Feb 2023 10:24:36 +0000 (10:24 +0000)] 
Remove Travis configuration, it's no longer supported by the ASF. [skip ci]

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

2 years agoClear cache for mod_tls test.
Joe Orton [Wed, 15 Feb 2023 10:14:19 +0000 (10:14 +0000)] 
Clear cache for mod_tls test.

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

2 years agoTurn msext_opts into a bitfield
manu [Tue, 14 Feb 2023 13:58:51 +0000 (13:58 +0000)] 
Turn msext_opts into a bitfield

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

2 years agoFIx typo
manu [Tue, 14 Feb 2023 13:56:45 +0000 (13:56 +0000)] 
FIx typo

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

2 years agoAdd MS-WDV support
manu [Mon, 13 Feb 2023 16:48:35 +0000 (16:48 +0000)] 
Add MS-WDV support

MS-WDV specification:
https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-wdv

The changes introduces the DAVMSext directive, which is used to
enable MS-WDV: DAVMSext +WDV

dav_get_timeout_string() is introduced as a variant of dav_get_timeout().
The former parses a string, the later parse the Timeout HTTP header.

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

2 years ago* Optimize code: We know that we already have a valid encoding string,
Ruediger Pluem [Fri, 10 Feb 2023 16:17:54 +0000 (16:17 +0000)] 
* Optimize code: We know that we already have a valid encoding string,
  because we just decoded it. Hence just copy what we have instead of
  redoing it.

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

2 years agoFurther migration of tests to GHA, though HTTP/2, ACME and
Joe Orton [Tue, 7 Feb 2023 16:15:05 +0000 (16:15 +0000)] 
Further migration of tests to GHA, though HTTP/2, ACME and
i386 build testing are all failing so currently disabled.
Caching needs adjusting to use a different model to Travis.

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

2 years ago* In the reverse proxy case r->filename might contain a query string if
Ruediger Pluem [Tue, 7 Feb 2023 14:20:37 +0000 (14:20 +0000)] 
* In the reverse proxy case r->filename might contain a query string if
  the nocanon option was used with ProxyPass.
  If this is the case cut off the query string as the last parameter in
  this query string might end up on an extension we take care about, but
  we only want to match against path components not against query
  parameters.

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

2 years agofr doc rebuild.
Lucien Gentis [Sat, 4 Feb 2023 16:21:16 +0000 (16:21 +0000)] 
fr doc rebuild.

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

2 years agofr doc XML files update.
Lucien Gentis [Sat, 4 Feb 2023 16:19:31 +0000 (16:19 +0000)] 
fr doc XML files update.

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

2 years agoAdd todo list for GHA migration. [skip ci]
Joe Orton [Fri, 3 Feb 2023 12:00:07 +0000 (12:00 +0000)] 
Add todo list for GHA migration. [skip ci]

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

2 years agoTravis RIP, WIP. [skip ci]
Joe Orton [Fri, 3 Feb 2023 11:59:02 +0000 (11:59 +0000)] 
Travis RIP, WIP. [skip ci]

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

2 years agoMigrate more tests to Github Actions.
Joe Orton [Fri, 3 Feb 2023 11:28:51 +0000 (11:28 +0000)] 
Migrate more tests to Github Actions.

Github: fixes #340, fixes #339

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

2 years agoSomeone updated the copyright year. :)
Rich Bowen [Tue, 31 Jan 2023 15:04:05 +0000 (15:04 +0000)] 
Someone updated the copyright year. :)

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

2 years agoFixes the inverted labels in this example log format string, as per bz65060
Rich Bowen [Tue, 31 Jan 2023 14:33:15 +0000 (14:33 +0000)] 
Fixes the inverted labels in this example log format string, as per bz65060

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

2 years agoClarify accepted values for driver names used with 'dbacquire'.
Christophe Jaillet [Sun, 29 Jan 2023 15:38:55 +0000 (15:38 +0000)] 
Clarify accepted values for driver names used with 'dbacquire'.

PR 66334

[skip ci]

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

2 years agofr doc rebuild.
Lucien Gentis [Sat, 28 Jan 2023 16:51:28 +0000 (16:51 +0000)] 
fr doc rebuild.

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

2 years agofr doc XML file update.
Lucien Gentis [Sat, 28 Jan 2023 16:48:09 +0000 (16:48 +0000)] 
fr doc XML file update.

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

2 years agofr doc XML files updates.
Lucien Gentis [Sat, 28 Jan 2023 16:41:58 +0000 (16:41 +0000)] 
fr doc XML files updates.

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

2 years agoxforms [skip ci]
Yann Ylavic [Fri, 27 Jan 2023 18:41:44 +0000 (18:41 +0000)] 
xforms [skip ci]

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

2 years agodocs: no default value for mod_proxy upgrade= parameter. [skip ci]
Yann Ylavic [Fri, 27 Jan 2023 18:41:30 +0000 (18:41 +0000)] 
docs: no default value for mod_proxy upgrade= parameter. [skip ci]

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

2 years agoUpdate copyright year for doc in trunk
Christophe Jaillet [Fri, 27 Jan 2023 18:36:28 +0000 (18:36 +0000)] 
Update copyright year for doc in trunk

[skip ci]

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

2 years agodocs xforms [skip ci]
Yann Ylavic [Fri, 27 Jan 2023 17:55:03 +0000 (17:55 +0000)] 
docs xforms [skip ci]

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

2 years agodocs: fix typos. [skip ci]
Yann Ylavic [Fri, 27 Jan 2023 17:54:55 +0000 (17:54 +0000)] 
docs: fix typos. [skip ci]

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