1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00

10642 Commits

Author SHA1 Message Date
Joe Orton
64f4cefc63 Regenerate docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916750 13f79535-47bb-0310-9956-ffa450edef68
2024-04-02 14:39:42 +00:00
Joe Orton
b07aa54007 Merge r1916129 from trunk (htpasswd docs):
Document SHA-2 support.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916749 13f79535-47bb-0310-9956-ffa450edef68
2024-04-02 14:33:45 +00:00
Christophe Jaillet
0ff1366c22 r1881790 has also added the 3rd argument to "ProxyRemoteMatch".
(r1916708 in trunk)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916709 13f79535-47bb-0310-9956-ffa450edef68
2024-04-01 08:40:50 +00:00
Christophe Jaillet
99794d6029 Fix a release version in <compatibility> tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916706 13f79535-47bb-0310-9956-ffa450edef68
2024-04-01 08:27:10 +00:00
Christophe Jaillet
1dd5ef85bf Add <compatibility> note for CGIScriptTimeout.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916705 13f79535-47bb-0310-9956-ffa450edef68
2024-04-01 08:22:21 +00:00
Christophe Jaillet
444288ced2 Fix some release versions in <compatibility> tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916703 13f79535-47bb-0310-9956-ffa450edef68
2024-04-01 07:38:02 +00:00
Christophe Jaillet
59c67f2bdb Fix some release versions in <compatibility> tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916702 13f79535-47bb-0310-9956-ffa450edef68
2024-04-01 07:36:31 +00:00
Rainer Jung
dda765ddc8 Update copyright year
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916670 13f79535-47bb-0310-9956-ffa450edef68
2024-03-30 21:12:26 +00:00
Lucien Gentis
a4a539fe05 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916201 13f79535-47bb-0310-9956-ffa450edef68
2024-03-09 16:20:15 +00:00
Lucien Gentis
5897f17e71 fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916200 13f79535-47bb-0310-9956-ffa450edef68
2024-03-09 16:19:14 +00:00
Joe Orton
72bef51a8d Merge r1862611, r1877693, r1878703, r1884207 from trunk:
* support/htpasswd.c (usage): Document SHA-256/512 support.

Windows : do not include ap_config_auto.h 

* support/htpasswd.c (usage): Fix typo. 

Fix misleading crypt vs hash terminology in ht* and dbmmanage tools.

What the htpasswd, htdbm and dbmmanage tools do is hashing passwords, not
encrypting them, so fix the terminology in manpages, docs, --help, comments
and function names.

Submitted by: Michele Preziuso <mpreziuso kaosdynamics.com>, jorton, steffenal, ylavic
Github: closes #408
Reviewed by: jorton, ylavic, jfclere


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916129 13f79535-47bb-0310-9956-ffa450edef68
2024-03-05 13:10:50 +00:00
Lucien Gentis
37ea9f9b5d fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916077 13f79535-47bb-0310-9956-ffa450edef68
2024-03-02 14:08:51 +00:00
Lucien Gentis
8e103fddac fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916076 13f79535-47bb-0310-9956-ffa450edef68
2024-03-02 14:07:29 +00:00
Yann Ylavic
f688ac31c4 PR62229: add CGIScriptTimeout to mod_cgi
add CGIScriptTimeout to mod_cgi, like mod_cgid's CGIDScriptTimeout.

Not addressed: making CGIScriptTimeout name work for either module.


Merges r1828172 from https://svn.apache.org/repos/asf/httpd/httpd/trunk.

Submitted By: Hank Ibell <hwibell gmail.com>
Committed By: covener
Reviewed by: minfrin, ylavic, jfclere


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915950 13f79535-47bb-0310-9956-ffa450edef68
2024-02-22 14:12:18 +00:00
Lucien Gentis
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
Lucien Gentis
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
Joe Orton
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
Joe Orton
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
Lucien Gentis
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
Lucien Gentis
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
Joe Orton
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
Eric Covener
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
Christophe Jaillet
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
Christophe Jaillet
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
Lucien Gentis
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
Lucien Gentis
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
Lucien Gentis
8858a33cb7 fr doc XML file ipdate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914115 13f79535-47bb-0310-9956-ffa450edef68
2023-11-25 16:05:35 +00:00
Eric Covener
0b31e15858 xforms
[skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914042 13f79535-47bb-0310-9956-ffa450edef68
2023-11-22 14:07:45 +00:00
Eric Covener
0f565d9c64 Merge r1914039, r1914040 from trunk:
remove apachehaus

I've read in two places they are no longer providing builds,
and the website is currently down.

[skip ci]



mention httpd.conf and install root dependency



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1914041 13f79535-47bb-0310-9956-ffa450edef68
2023-11-22 14:05:03 +00:00
Lucien Gentis
0e8daa071d fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913933 13f79535-47bb-0310-9956-ffa450edef68
2023-11-18 13:55:20 +00:00
Lucien Gentis
f6c82a19b8 fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913932 13f79535-47bb-0310-9956-ffa450edef68
2023-11-18 13:53:43 +00:00
Lucien Gentis
e077174322 Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913931 13f79535-47bb-0310-9956-ffa450edef68
2023-11-18 13:50:58 +00:00
Graham Leggett
fd4338eca8 Backport to v2.4:
*) mod_proxy: Allow to set a TTL for how long DNS resolutions to backend
     systems are cached.
     In order to solve merge conflicts this proposal also backports:

     mod_proxy: Add optional third argument for ProxyRemote, which
     configures Basic authentication credentials to pass to the remote
     proxy.  PR 37355. (r1881790)

     mod_proxy: Ignore (and warn about) enablereuse=on for ProxyPassMatch when
     some dollar substitution (backreference) happens in the hostname or port
     part of the URL. (r1904513)

     Trunk version of patch:
        https://svn.apache.org/r1881790
        https://svn.apache.org/r1904513
        https://svn.apache.org/r1909400
        https://svn.apache.org/r1909401
        https://svn.apache.org/r1909402
        https://svn.apache.org/r1909451
        https://svn.apache.org/r1912459
        https://svn.apache.org/r1913432
        https://svn.apache.org/r1913534
     Backport version for 2.4.x of patch:
       https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/390.diff
     Can be applied via apply_backport_pr.sh 390
     +1: rpluem, ylavic, minfrin




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913907 13f79535-47bb-0310-9956-ffa450edef68
2023-11-18 11:08:42 +00:00
Lucien Gentis
4f41594099 fr doc small corrections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913500 13f79535-47bb-0310-9956-ffa450edef68
2023-11-01 16:08:19 +00:00
Lucien Gentis
7134bd2a24 fr doc small corrections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913389 13f79535-47bb-0310-9956-ffa450edef68
2023-10-27 14:07:47 +00:00
Lucien Gentis
ddfdff5741 fr doc small corrections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913324 13f79535-47bb-0310-9956-ffa450edef68
2023-10-25 13:33:55 +00:00
Lucien Gentis
2f109f31e2 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913235 13f79535-47bb-0310-9956-ffa450edef68
2023-10-23 15:31:07 +00:00
Lucien Gentis
3864810749 fr doc small corrections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913234 13f79535-47bb-0310-9956-ffa450edef68
2023-10-23 15:30:29 +00:00
Lucien Gentis
c0c21e7a39 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913166 13f79535-47bb-0310-9956-ffa450edef68
2023-10-21 09:12:03 +00:00
Lucien Gentis
44dbdbd9b4 fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913165 13f79535-47bb-0310-9956-ffa450edef68
2023-10-21 09:10:44 +00:00
Stefan Eissing
9d8a3a2090 publishing release httpd-2.4.58
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913112 13f79535-47bb-0310-9956-ffa450edef68
2023-10-19 09:27:09 +00:00
Ruediger Pluem
3f02e37d1a Merge r1909137, r1911067 from trunk:
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.


mod_alias: Add AliasPreservePath directive to map the full
path after the alias in a location.

Submitted by: minfrin
Reviewed by: minfrin, rpluem, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913009 13f79535-47bb-0310-9956-ffa450edef68
2023-10-16 11:42:54 +00:00
Lucien Gentis
c30cf8aa7b fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912217 13f79535-47bb-0310-9956-ffa450edef68
2023-09-09 15:19:30 +00:00
Lucien Gentis
5b7a6b4511 fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912216 13f79535-47bb-0310-9956-ffa450edef68
2023-09-09 15:18:08 +00:00
Lucien Gentis
5093073d0d misplaced "contextlist" tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912215 13f79535-47bb-0310-9956-ffa450edef68
2023-09-09 15:14:49 +00:00
Joe Orton
a88666cc62 Merge r1912085 from trunk:
Update DavBasePath availability.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912086 13f79535-47bb-0310-9956-ffa450edef68
2023-09-04 13:11:45 +00:00
Joe Orton
79e3b4e68a Regenerate docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912083 13f79535-47bb-0310-9956-ffa450edef68
2023-09-04 12:01:40 +00:00
Joe Orton
ddd173bc63 Merge r1911651, r1911906 from trunk:
Add DAVBasePath directive to allow users to configure the real repos
root path, useful where the DAV repos is configured with a regex match.

* modules/dav/main/mod_dav.c
  (dav_get_resource): If available, pass the configured base path
  as the repos root to repos provider.
  On the error path for fetching a resource, detect and warn
  specifically when the location is configured via a regex.
  (dav_cmd_davbasepath): New function.

PR: 35077
Github: closes #377
Reviewed by: jorton, minfrin, rpluem

Merge r1911715, r1911907 from trunk:

Add docs for DavBasePath
Fix documented default for DavBasePath to match code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912081 13f79535-47bb-0310-9956-ffa450edef68
2023-09-04 12:00:01 +00:00
Stefan Eissing
0d1d79b020 Merge from trunk:
*) mod_http2: added support for bootstrapping WebSockets via HTTP/2, as
     described in RFC 8441. A new directive 'H2WebSockets on|off' has been
     added. The feature is by default not enabled.
     As also discussed in the manual, this feature should work for setups
     using "ProxyPass backend-url upgrade=websocket" without further changes.
     Special server modules for WebSockets will have to be adapted,
     most likely, as the handling if IO events is different with HTTP/2.
     HTTP/2 WebSockets are supported on platforms with native pipes. This
     excludes Windows.
     New directive `H2ProxyRequests on|off` to enable handling
     of HTTP/2 requests in a forward proxy configuration.
     General forward proxying is enabled via `ProxyRequests`. If the
     HTTP/2 protocol is also enabled for such a server/host, this new
     directive is needed in addition.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911979 13f79535-47bb-0310-9956-ffa450edef68
2023-08-29 07:23:10 +00:00
Christophe Jaillet
607189b055 Add an hyper-link.
Fix a typo (s/a an/an/)
Be less agressive (s/ON/On/) and reorder "On|Off".
(r1911948 intrunk)

Fix <compatibility> version

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911949 13f79535-47bb-0310-9956-ffa450edef68
2023-08-27 06:39:44 +00:00