]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
2 years ago* For retriggering a DNS lookup worker->cp->addr should be set to NULL and thus
Ruediger Pluem [Tue, 25 Apr 2023 11:52:17 +0000 (11:52 +0000)] 
* For retriggering a DNS lookup worker->cp->addr should be set to NULL and thus
  we need to avoid a race that worker->cp->addr switches to NULL after we
  checked it to be non NULL but before we assign it to conn->addr in an else
  tree which would leave conn->addr to NULL and likely cause a segfault later.

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

2 years agoRebuild docs.
Graham Leggett [Tue, 25 Apr 2023 08:43:04 +0000 (08:43 +0000)] 
Rebuild docs.

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

2 years agoci: Upgrade to latest apr-1.7.4.
Yann Ylavic [Sun, 23 Apr 2023 20:53:20 +0000 (20:53 +0000)] 
ci: Upgrade to latest apr-1.7.4.

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

2 years agoFollow up to r1909356: c89/style fix.
Yann Ylavic [Sun, 23 Apr 2023 20:44:21 +0000 (20:44 +0000)] 
Follow up to r1909356: c89/style fix.

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

2 years agocore: Restore original regex value when nesting Location,
Graham Leggett [Sat, 22 Apr 2023 18:10:30 +0000 (18:10 +0000)] 
core: Restore original regex value when nesting Location,
Directory and File directives.

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

2 years agoUpdate ci docs for move to GHA. [skip ci]
Joe Orton [Fri, 21 Apr 2023 14:31:30 +0000 (14:31 +0000)] 
Update ci docs for move to GHA. [skip ci]

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

2 years agoCI tests are failing (since r1909135), set a lower timeout since
Joe Orton [Wed, 19 Apr 2023 13:58:53 +0000 (13:58 +0000)] 
CI tests are failing (since r1909135), set a lower timeout since
the default is a rather extreme 6hrs. Worst cases seem to be
around 10 minutes currently. [skip ci]

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

2 years ago* Add server directory to include path as mod_rewrite requires test_char.h.
Ruediger Pluem [Wed, 19 Apr 2023 10:39:19 +0000 (10:39 +0000)] 
* Add server directory to include path as mod_rewrite requires test_char.h.

PR: 66571
Submitted by: Valeria Petrov <valeria.petrov@spinetix.com>
Reviewed by: rpluem

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

2 years agofr doc rebuild.
Lucien Gentis [Tue, 18 Apr 2023 11:30:11 +0000 (11:30 +0000)] 
fr doc rebuild.

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

2 years agofr doc XML file update.
Lucien Gentis [Tue, 18 Apr 2023 11:29:05 +0000 (11:29 +0000)] 
fr doc XML file update.

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

2 years ago *) cmake support
Stefan Eissing [Tue, 18 Apr 2023 08:55:44 +0000 (08:55 +0000)] 
  *) cmake support
     PR #356 from github to fix linking libcurl used by mod_md
     [@tumatanquang at github]

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

2 years agofr doc rebuild.
Lucien Gentis [Sat, 15 Apr 2023 14:25:18 +0000 (14:25 +0000)] 
fr doc rebuild.

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

2 years agofr doc XML files updates.
Lucien Gentis [Sat, 15 Apr 2023 14:24:11 +0000 (14:24 +0000)] 
fr doc XML files updates.

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

2 years agomod_alias: When an alias is declared inside a Location, make sure
Graham Leggett [Fri, 14 Apr 2023 14:07:49 +0000 (14:07 +0000)] 
mod_alias: When an alias is declared inside a Location, make sure
the balance of the URL is preserved to match the alias declared
outside a location. Fixes an error where all requests are mapped
to the root of the location.

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

2 years agoInclude header file for the explicit regex.
Graham Leggett [Fri, 14 Apr 2023 14:03:03 +0000 (14:03 +0000)] 
Include header file for the explicit regex.

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

2 years agocore: Be explicit if an enclosing directive contains a path or a
Graham Leggett [Fri, 14 Apr 2023 14:02:11 +0000 (14:02 +0000)] 
core: Be explicit if an enclosing directive contains a path or a
regex.

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

2 years agojust request_uri
Eric Covener [Wed, 12 Apr 2023 11:56:23 +0000 (11:56 +0000)] 
just request_uri

[skip ci]

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

2 years agoxforms
Eric Covener [Tue, 11 Apr 2023 21:37:10 +0000 (21:37 +0000)] 
xforms

[skip ci]

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

2 years agoPR66563: escaping of url releated server vars
Eric Covener [Tue, 11 Apr 2023 21:36:55 +0000 (21:36 +0000)] 
PR66563: escaping of url releated server vars

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

2 years ago* Silence 'may be used uninitialized' warning
Ruediger Pluem [Tue, 11 Apr 2023 13:31:27 +0000 (13:31 +0000)] 
* Silence 'may be used uninitialized' warning

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

2 years ago* Xforms [skip ci]
Ruediger Pluem [Tue, 11 Apr 2023 12:05:00 +0000 (12:05 +0000)] 
* Xforms [skip ci]

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

2 years ago* Clarify performance topic
Ruediger Pluem [Tue, 11 Apr 2023 12:04:01 +0000 (12:04 +0000)] 
* Clarify performance topic

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

2 years agofr doc rebuild.
Lucien Gentis [Sat, 8 Apr 2023 13:05:39 +0000 (13:05 +0000)] 
fr doc rebuild.

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

2 years agofr doc XML file update.
Lucien Gentis [Sat, 8 Apr 2023 13:03:15 +0000 (13:03 +0000)] 
fr doc XML file update.

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

2 years agouse anchors
Eric Covener [Fri, 7 Apr 2023 12:52:47 +0000 (12:52 +0000)] 
use anchors

[skip ci]

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

2 years agolog an error when ap_runtime_dir_relative fails.
Giovanni Bechis [Wed, 5 Apr 2023 09:05:24 +0000 (09:05 +0000)] 
log an error when ap_runtime_dir_relative fails.
spotted by rpluem@

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

2 years agoFix possible NULL pointer dereference casued by apreq_param_make()
Giovanni Bechis [Wed, 5 Apr 2023 06:38:18 +0000 (06:38 +0000)] 
Fix possible NULL pointer dereference casued by apreq_param_make()

The function apreq_param_make() will return NULL on failure. However
NULL check are forgetten before derenference, which could lead to
NULL pointer dereference.

Adding NULL check to all use of apreq_param_make().

Submitted by: Zhou Qingyang <zhou1615@umn.edu>

Github: closes #303

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

2 years agoFix a possible NULL pointer dereference of ap_runtime_dir_relative()
Giovanni Bechis [Tue, 4 Apr 2023 21:43:46 +0000 (21:43 +0000)] 
Fix a possible NULL pointer dereference of ap_runtime_dir_relative()

ap_runtime_dir_relative() will return NULL on failure. However cgid_init()
does not check the return value of ap_runtime_dir_relative() and use it
directly.

Fix this bug by adding a NULL check.

Submitted by: Zhou Qingyang <zhou1615@umn.edu>

Github: closes #304

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

2 years agoadd SSL_CTX_set_session_id_context(3) checks
Giovanni Bechis [Tue, 4 Apr 2023 21:34:57 +0000 (21:34 +0000)] 
add SSL_CTX_set_session_id_context(3) checks
bz #66226

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

2 years agocheck SSL_do_handshake(3) return value
Giovanni Bechis [Tue, 4 Apr 2023 16:46:05 +0000 (16:46 +0000)] 
check SSL_do_handshake(3) return value

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

2 years agoSSL_do_handshake can fail with 0 or <0 status codes.
Giovanni Bechis [Mon, 3 Apr 2023 09:03:51 +0000 (09:03 +0000)] 
SSL_do_handshake can fail with 0 or <0 status codes.
spotted and fixed by rpluem@

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

2 years ago* Use latest released versions of APR and APR-UTIL for building
Ruediger Pluem [Mon, 3 Apr 2023 07:38:34 +0000 (07:38 +0000)] 
* Use latest released versions of APR and APR-UTIL for building

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

2 years agofr doc rebuild.
Lucien Gentis [Sat, 1 Apr 2023 14:39:03 +0000 (14:39 +0000)] 
fr doc rebuild.

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

2 years agofr doc XML file update.
Lucien Gentis [Sat, 1 Apr 2023 14:36:16 +0000 (14:36 +0000)] 
fr doc XML file update.

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

2 years agofr doc XML files updates.
Lucien Gentis [Sat, 1 Apr 2023 14:33:49 +0000 (14:33 +0000)] 
fr doc XML files updates.

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

2 years agoMisplaced tag.
Lucien Gentis [Sat, 1 Apr 2023 14:31:50 +0000 (14:31 +0000)] 
Misplaced tag.

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

2 years agoMisplaced tag.
Lucien Gentis [Sat, 1 Apr 2023 14:12:29 +0000 (14:12 +0000)] 
Misplaced tag.

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

2 years agoTrigger ci.
Yann Ylavic [Sat, 1 Apr 2023 08:58:08 +0000 (08:58 +0000)] 
Trigger ci.

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

2 years agompm_event: useful APLOG_DEBUG messages.
Yann Ylavic [Sat, 1 Apr 2023 08:43:49 +0000 (08:43 +0000)] 
mpm_event: useful APLOG_DEBUG messages.

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

2 years agoSync CHANGES.
Yann Ylavic [Fri, 31 Mar 2023 15:11:00 +0000 (15:11 +0000)] 
Sync CHANGES.

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

2 years agoFollow up to r1908827: CHANGES entry.
Yann Ylavic [Fri, 31 Mar 2023 08:51:33 +0000 (08:51 +0000)] 
Follow up to r1908827: CHANGES entry.

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

2 years agoTry running CI for 2.* tags. [skip ci]
Joe Orton [Fri, 31 Mar 2023 07:21:37 +0000 (07:21 +0000)] 
Try running CI for 2.* tags. [skip ci]

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

2 years agomod_proxy: Check for space/ctrls in nocanon path/urls before forwarding.
Yann Ylavic [Fri, 31 Mar 2023 00:11:02 +0000 (00:11 +0000)] 
mod_proxy: Check for space/ctrls in nocanon path/urls before forwarding.

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

2 years agoSteal some APLOGNOs for next commit.
Yann Ylavic [Fri, 31 Mar 2023 00:08:40 +0000 (00:08 +0000)] 
Steal some APLOGNOs for next commit.

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

2 years agofix regression in 2.4.56
Eric Covener [Thu, 30 Mar 2023 20:32:19 +0000 (20:32 +0000)] 
fix regression in 2.4.56

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

2 years agocheck for more possible SSL failures
Giovanni Bechis [Thu, 30 Mar 2023 17:09:09 +0000 (17:09 +0000)] 
check for more possible SSL failures
bz #66225

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

2 years agoDocument DavQuota (english and french)
manu [Wed, 29 Mar 2023 15:19:19 +0000 (15:19 +0000)] 
Document DavQuota (english and french)

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

2 years agoDocument DavMSext (english and french)
manu [Wed, 29 Mar 2023 15:02:55 +0000 (15:02 +0000)] 
Document DavMSext (english and french)

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

2 years agoFix a possible null pointer dereference in ap_expr_parse()
Giovanni Bechis [Tue, 28 Mar 2023 21:12:47 +0000 (21:12 +0000)] 
Fix a possible null pointer dereference in ap_expr_parse()

In ap_expr_parse(), ap_expr_yylex_init() will return 1 on failure,
and ctx.scanner will remain NULL. However the return value of
ap_expr_yylex_init() is not checked, and there is a dereference of
ctx.scanner in following function ap_expr_yyset_extra(),
which may lead to NULL pointer dereference.

Fix this bug by adding return value check of ap_expr_yylex_init.

Submitted by: Zhou Qingyang <zhou1615@umn.edu>

Github: closes #308

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

2 years agofr doc rebuild.
Lucien Gentis [Sat, 25 Mar 2023 14:04:43 +0000 (14:04 +0000)] 
fr doc rebuild.

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

2 years agofr doc XML file update.
Lucien Gentis [Sat, 25 Mar 2023 14:01:24 +0000 (14:01 +0000)] 
fr doc XML file update.

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

2 years agofr doc XML file update.
Lucien Gentis [Sat, 25 Mar 2023 13:57:46 +0000 (13:57 +0000)] 
fr doc XML file update.

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

2 years ago *) mod_http2: fixed a crash during connection termination. See PR 66539.
Stefan Eissing [Fri, 24 Mar 2023 16:16:29 +0000 (16:16 +0000)] 
  *) mod_http2: fixed a crash during connection termination. See PR 66539.

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

2 years agoadd error message when storing data to temp file fails.
Giovanni Bechis [Fri, 24 Mar 2023 08:50:19 +0000 (08:50 +0000)] 
add error message when storing data to temp file fails.
Github: closes #182

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

2 years agocheck apreq_cookie_make return value
Giovanni Bechis [Thu, 23 Mar 2023 16:23:12 +0000 (16:23 +0000)] 
check apreq_cookie_make return value
Github: closes #302

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

2 years ago* modules/lua: Use https: URLs for httpd.a.o in docs. [skip ci]
Joe Orton [Thu, 23 Mar 2023 15:14:04 +0000 (15:14 +0000)] 
* modules/lua: Use https: URLs for httpd.a.o in docs. [skip ci]

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

2 years agomod_wombat => mod_lua
Joe Orton [Thu, 23 Mar 2023 15:11:59 +0000 (15:11 +0000)] 
mod_wombat => mod_lua
Fix SVN URL

Submitted by: Sebb <sebb@apache.org>
Github: closes #352

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

2 years agofix separator parsing, PR #333
Giovanni Bechis [Thu, 23 Mar 2023 08:02:47 +0000 (08:02 +0000)] 
fix separator parsing, PR #333

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

2 years agotypo, PR #344 [skip ci]
Giovanni Bechis [Thu, 23 Mar 2023 07:49:47 +0000 (07:49 +0000)] 
typo, PR #344 [skip ci]

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

2 years ago* Fix typo
Ruediger Pluem [Wed, 22 Mar 2023 08:21:42 +0000 (08:21 +0000)] 
* Fix typo

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

2 years ago* Whitespace fixes. No functional change.
Ruediger Pluem [Wed, 22 Mar 2023 08:01:31 +0000 (08:01 +0000)] 
* Whitespace fixes. No functional change.

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

2 years agoFix new flag name in docs
Rainer Jung [Tue, 21 Mar 2023 12:42:57 +0000 (12:42 +0000)] 
Fix new flag name in docs

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

2 years agoci: Restore MOD_TLS test suite with the python3-multipart package.
Yann Ylavic [Mon, 20 Mar 2023 15:23:04 +0000 (15:23 +0000)] 
ci: Restore MOD_TLS test suite with the python3-multipart package.

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

2 years agopytests: test_tls_04_double_get does not want stdout separator for multiple responses.
Yann Ylavic [Mon, 20 Mar 2023 15:21:48 +0000 (15:21 +0000)] 
pytests: test_tls_04_double_get does not want stdout separator for multiple responses.

Add no_stdout_list parameter to env.tls_get() thus to curl_raw() too.

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

2 years agopytests: test_tls_05_proto_1_3: Don't rely on TlsTestEnv.curl_supports_tls_1_3()...
Yann Ylavic [Mon, 20 Mar 2023 15:03:44 +0000 (15:03 +0000)] 
pytests: test_tls_05_proto_1_3: Don't rely on TlsTestEnv.curl_supports_tls_1_3() (always False).

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

2 years agopytests: Use python3-multipart lib.
Yann Ylavic [Mon, 20 Mar 2023 15:02:13 +0000 (15:02 +0000)] 
pytests: Use python3-multipart lib.

Use the API of https://github.com/andrew-d/python-multipart, available as
package python3-multipart on Debian/Ubuntu.

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

2 years agoci: Disable MOD_TLS test suite for now (never passing).
Yann Ylavic [Mon, 20 Mar 2023 11:22:21 +0000 (11:22 +0000)] 
ci: Disable MOD_TLS test suite for now (never passing).

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

2 years agoFollow up to r1908380: MMN minor bump for AP_CTIME_OPTION_GMTOFF.
Yann Ylavic [Mon, 20 Mar 2023 10:48:07 +0000 (10:48 +0000)] 
Follow up to r1908380: MMN minor bump for AP_CTIME_OPTION_GMTOFF.

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

2 years agoutil_time: Follow up to r1908380 and r1908389: apr_strings.h not needed anymore.
Yann Ylavic [Mon, 20 Mar 2023 10:47:05 +0000 (10:47 +0000)] 
util_time: Follow up to r1908380 and r1908389: apr_strings.h not needed anymore.

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

2 years agoci: -Werror does not need -Wno-deprecated-declarations anymore for openssl >= 3
Yann Ylavic [Sun, 19 Mar 2023 22:01:03 +0000 (22:01 +0000)] 
ci: -Werror does not need -Wno-deprecated-declarations anymore for openssl >= 3

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

2 years agomod_md: Fix compat warnings with OpenSSL 3.0.
Yann Ylavic [Sun, 19 Mar 2023 21:33:51 +0000 (21:33 +0000)] 
mod_md: Fix compat warnings with OpenSSL 3.0.

* md/md_crypt.c(md_pkey_get_rsa_e64, md_pkey_get_rsa_n64):
  Replace deprecated RSA api with EVP_PKEY_get_bn_param on openssl >= 3.0.

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

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