Commit Graph

32738 Commits

Author SHA1 Message Date
83fc00b481 undo r1915782.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915783 13f79535-47bb-0310-9956-ffa450edef68
2024-02-14 11:25:01 +00:00
9843db0d03 Merge r1915400 from trunk:
* mod_slotmem_shm: Use ap_os_is_path_absolute() to make it portable.

Reviewed by: jfclere, jorton, covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915782 13f79535-47bb-0310-9956-ffa450edef68
2024-02-14 11:18:17 +00:00
f690016752 Add new PR number for the libxml2 fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915741 13f79535-47bb-0310-9956-ffa450edef68
2024-02-12 08:41:26 +00:00
d02cfc9f8b Merge r1825120 from trunk:
* modules/ssl/ssl_engine_init.c (ssl_init_PushCAList): Remove function.
  (ssl_init_ca_cert_path): Use SSL_add_file_cert_subjects_to_stack()
  instead.

[Edit: This does change behaviour: the acceptable client CA list is now 
 always be sent in sorted order rather than configured/file order.
 In the case of SSLCACertificatePath and SSLCADNRequestPath, the
 order will be stable rather than non-determistic as previously.]

PR: 61574
Github: closes #406
Reviewed by: jorton, jfclere, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915740 13f79535-47bb-0310-9956-ffa450edef68
2024-02-12 08:37:35 +00:00
7e3634baa8 a few quick votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915719 13f79535-47bb-0310-9956-ffa450edef68
2024-02-11 01:14:13 +00:00
24ba577a8f fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915716 13f79535-47bb-0310-9956-ffa450edef68
2024-02-10 14:33:37 +00:00
d1321f7e7f XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915715 13f79535-47bb-0310-9956-ffa450edef68
2024-02-10 14:32:44 +00:00
aca50678c5 Change my vote the actual proposal refers code that is NOT in trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915694 13f79535-47bb-0310-9956-ffa450edef68
2024-02-09 16:30:49 +00:00
e839856f65 Promote 2, done 1, propose 1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915682 13f79535-47bb-0310-9956-ffa450edef68
2024-02-09 09:18:54 +00:00
6ec2422602 Merge r1915680 from trunk:
Update SSLProxyMachineCertificateFile compat note after r1915679.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915681 13f79535-47bb-0310-9956-ffa450edef68
2024-02-09 09:15:01 +00:00
4e29445936 Merge r1884552 from trunk:
Treat non-leaf certificates present in SSLProxyMachineCertificateFile
the same was as non-leaf certs are in SSLCertificateFile - use them to
build the trusted cert chain for the end-entity (client) cert.

* modules/ssl/ssl_engine_init.c (ssl_init_proxy_certs):
  For any non-leaf certificate present in the configured, trust as
  if used in SSLProxyMachineCertificateChainFile.

Github: closes #403
Reviewed by: jorton, gbechis, jfclere


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915679 13f79535-47bb-0310-9956-ffa450edef68
2024-02-09 09:12:02 +00:00
f96805f66b Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915677 13f79535-47bb-0310-9956-ffa450edef68
2024-02-09 07:58:24 +00:00
167adc6419 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915569 13f79535-47bb-0310-9956-ffa450edef68
2024-02-03 15:44:10 +00:00
86c23640df fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915568 13f79535-47bb-0310-9956-ffa450edef68
2024-02-03 15:42:45 +00:00
554a9a05f8 Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915550 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 16:38:31 +00:00
612b3bda75 Done/propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915548 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 16:08:40 +00:00
008e6afcfd Merge r1879591 from trunk:
Check for and use gettid() directly if available; glibc 2.30 and later
provides a wrapper for the system call:

* configure.in: Check for gettid() and define HAVE_SYS_GETTID if
  gettid() is only usable via syscall().

* server/log.c (log_tid): Use gettid() directly if available.

Submitted by: jorton
Reviewed by: jorton, jfclere, gbechis
Github: closes #404


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915544 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 14:53:34 +00:00
acc9787783 vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915542 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 14:19:28 +00:00
ee95ec1c02 Done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915540 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 11:56:09 +00:00
e3ca3e4829 Merge r1874101, r1913838 from trunk:
fix build with LibreSSL 2.0.7+

PR: 64047

Follow up to r1874101: Axe useless LIBRESSL_VERSION_NUMBER check.

Since the fix to MODSSL_USE_OPENSSL_PRE_1_1_API in r1908537, we are sure that
  !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL
in this block.

Submitted by: gbechis, ylavic
Reviewed by: ylavic, minfrin, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915539 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 11:55:30 +00:00
ea7227f9ec Vote, done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915535 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 11:51:48 +00:00
45cfbb36ce Merge r1909450 from trunk:
Make sources build with latest clang version

Submitted by: icing
Reviewed by: minfrin, ylavic, jfclere


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915534 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 11:50:07 +00:00
756532292c Done/vote/propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915533 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 11:48:27 +00:00
a66324cbe2 Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915530 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 09:02:15 +00:00
3928bbf8b3 Merge r1861793, r1862612, r1862724, r1877251, r1907672 from trunk:
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.

Update transform.

* support/htpasswd.c (usage): More usage fixes for SHA-2; describe
  as "secure", leave bcrypt only algorithm described as "very secure".


* support/passwd_common.c (mkhash): Fix salt buffer size for SHA2
  (caught by gcc 10).


configure: Assume crypt() does not support SHA-2 when cross-compiling.

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

* configure.in:
  Give AC_RUN_IFELSE a cross-compiling action, otherwise it fails with:
    configure: error: cannot run test program while cross compiling

Submitted by: jorton, ylavic
Reviewed by: minfrin, ylavic, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915516 13f79535-47bb-0310-9956-ffa450edef68
2024-02-01 16:54:40 +00:00
239d5e2b6a Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915515 13f79535-47bb-0310-9956-ffa450edef68
2024-02-01 16:48:40 +00:00
375a7e3539 Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915510 13f79535-47bb-0310-9956-ffa450edef68
2024-02-01 12:24:00 +00:00
37311123b0 Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915509 13f79535-47bb-0310-9956-ffa450edef68
2024-02-01 11:00:22 +00:00
d84edc5e7b Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915498 13f79535-47bb-0310-9956-ffa450edef68
2024-01-31 16:40:33 +00:00
b747009d93 Merged x1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915497 13f79535-47bb-0310-9956-ffa450edef68
2024-01-31 15:42:06 +00:00
b51a8364f2 Merge r1811831 from trunk:
* server/util_script.c (ap_add_common_vars): Allow mod_env to override
  all system path environment variables, not just PATH.  (The
  behaviour for PATH alone was changed in r965679 for PR 43906.)

Submitted by: jorton
Reviewed by: minfrin, ylavic, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915496 13f79535-47bb-0310-9956-ffa450edef68
2024-01-31 15:41:38 +00:00
432774cb14 Vote, propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915495 13f79535-47bb-0310-9956-ffa450edef68
2024-01-31 15:37:13 +00:00
fca47475db Merge r1915423 from trunk:
fill in empty descriptions from command_rec

[skip ci]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915424 13f79535-47bb-0310-9956-ffa450edef68
2024-01-27 14:25:50 +00:00
58303ee3c1 Updated typo NWGNUmakefile
dependencies was spelled dependancies.

Submitted by: StevenSedwick <133059415+StevenSedwick@users.noreply.github.com>

(Also applied to trunk)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915381 13f79535-47bb-0310-9956-ffa450edef68
2024-01-24 14:46:36 +00:00
3f40276ae2 * Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915288 13f79535-47bb-0310-9956-ffa450edef68
2024-01-17 12:53:02 +00:00
4f3cf728fa propose r1915281 for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915282 13f79535-47bb-0310-9956-ffa450edef68
2024-01-17 08:41:32 +00:00
c928152fc6 Tweak formatting, remove a non-user-visible change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915069 13f79535-47bb-0310-9956-ffa450edef68
2024-01-03 15:12:46 +00:00
11ccc32be5 Updated after merged backports.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915068 13f79535-47bb-0310-9956-ffa450edef68
2024-01-03 15:11:51 +00:00
43f7bc4508 Merge r1914318 from trunk:
mod_ssl: Follow up to r1908537: Fix typo s/MODSSL_USE_ENGINE_API/MODSSL_HAVE_ENGINE_API/

Submitted by: ylavic
Reviewed by: ylavic, minfrin, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915067 13f79535-47bb-0310-9956-ffa450edef68
2024-01-03 15:03:35 +00:00
a10ceb162d Merge r1914013 from trunk:
mod_xml2enc: remove dependency on xmlstring header

Submitted by: ttachi <tachihara hotmail.com>
Github: closes #393
Reviewed by: covener, minfrin, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915066 13f79535-47bb-0310-9956-ffa450edef68
2024-01-03 15:02:30 +00:00
6435f22f56 Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915065 13f79535-47bb-0310-9956-ffa450edef68
2024-01-03 15:00:51 +00:00
029fc1601c Fix a typo (missing "t")
s/redisribution/redistribution/

PR 67018 [<hanskrentel yahoo.de>]

r1914884 on trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914885 13f79535-47bb-0310-9956-ffa450edef68
2023-12-23 10:31:02 +00:00
b3634841f4 Fix the authorization types that support expressions.
r1914881 in trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914882 13f79535-47bb-0310-9956-ffa450edef68
2023-12-23 09:43:42 +00:00
d36d845536 fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914826 13f79535-47bb-0310-9956-ffa450edef68
2023-12-21 15:19:52 +00:00
34865dab4a Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914782 13f79535-47bb-0310-9956-ffa450edef68
2023-12-19 15:45:40 +00:00
b55e5f08e8 Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914538 13f79535-47bb-0310-9956-ffa450edef68
2023-12-11 14:38:05 +00:00
64ecce74ff Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914333 13f79535-47bb-0310-9956-ffa450edef68
2023-12-04 17:50:12 +00:00
b1e6025225 Late fix for r1913912, plus comment about new proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914323 13f79535-47bb-0310-9956-ffa450edef68
2023-12-04 16:35:58 +00:00
103e6da4d6 Update proposal to include r1914281.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914283 13f79535-47bb-0310-9956-ffa450edef68
2023-12-02 09:54:18 +00:00
d327b302f7 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914116 13f79535-47bb-0310-9956-ffa450edef68
2023-11-25 16:06:47 +00:00