VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,738 Commits 62 Branches 304 Tags
83fc00b481eb3e9d20054682ea44caeb1293c13c
Commit Graph

32738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Eissing
e43b594c4b back port proposal 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912181 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-08 07:43:17 +00:00
Giovanni Bechis
8852c7a43a vote [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912096 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-05 08:32: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
1581f4c7ad Merged x1. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912082 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-04 12:01:12 +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
Rainer Jung
f2eb24be1d Add backport proposal [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912056 13f79535-47bb-0310-9956-ffa450edef68
 2023-09-02 16:42:06 +00:00
Eric Covener
4d52c2357f vote/promote 
[skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912014 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-30 12:45:38 +00:00
Eric Covener
22d1aa625f nit: 1861542,r1861569 were both mine 
URL: http://svn.apache.org/viewvc?rev=1911934&view=rev
Log:
Backport to v2.4:

  *) mod_alias: Add RedirectRelative to allow relative redirect targets to be
     issued as-is.
     Trunk version of patch:
        https://svn.apache.org/r1861542
        https://svn.apache.org/r1861569
     Backport version for 2.4.x of patch:
      Trunk version of patch works
       svn merge -c 1861542,r1861569 ^/httpd/httpd/trunk .
     +1: minfrin, covener, icing



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1912012 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-30 12:41:50 +00:00
Stefan Eissing
64c420f52a mod_http2: update version that has become v2.0.22 in github release 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911981 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-29 07:46:03 +00:00
Stefan Eissing
06211c92fd update after back port 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911980 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-29 07:23:42 +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
Giovanni Bechis
5dbf3a8959 vote [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911967 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-28 15:05:10 +00:00
Stefan Eissing
bad450e76c Backport proposal for mod_proxy_http2 error fix 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911965 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-28 13:44:29 +00:00
Ruediger Pluem
26f0168fa4 * Vote [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911959 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-28 07:00:19 +00:00
Ruediger Pluem
90b5cc9eb2 * Vote and promote [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911957 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-28 06:39:18 +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
Graham Leggett
4979af1817 Vote. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911941 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-26 21:11:16 +00:00
Graham Leggett
7c7c4a84fa Vote. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911940 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-26 20:59:48 +00:00
Graham Leggett
bd6996ef94 Update proposal. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911939 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-26 19:13:24 +00:00
Graham Leggett
f96f781fbb Patch re-applied. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911937 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-26 18:55:39 +00:00
Graham Leggett
1b9fcfeeb6 Backport to v2.4: 
*) mod_alias: Add RedirectRelative to allow relative redirect targets to be
     issued as-is.
     Trunk version of patch:
        https://svn.apache.org/r1861542
        https://svn.apache.org/r1861569
     Backport version for 2.4.x of patch:
      Trunk version of patch works
       svn merge -c 1861542,r1861569 ^/httpd/httpd/trunk .
     +1: minfrin, covener, icing



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911934 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-26 18:19:50 +00:00
Joe Orton
e0c8ce0661 Update and reset. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911908 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-25 07:52:31 +00:00
Rainer Jung
c8778ad887 Merge r1909429 and r1909606 from trunk: 
mod_status: Remove duplicate keys "BusyWorkers" and "IdleWorkers".

Resolve inconsistency between the previous two occurrences by
counting workers in state SERVER_GRACEFUL no longer as busy,
but instead in a new counter "GracefulWorkers" (or on HTML
view as "workers gracefully restarting"). Also add the graceful
counter as a new column to the existing HTML per process table
for async MPMs.

PR 63300
Submitted by: rjung
Reviewed by: rjung, jorton, icing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911892 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-24 10:09:45 +00:00
Stefan Eissing
0dba252f77 vote 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911888 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-24 07:31:18 +00:00
Stefan Eissing
07e1b36e38 vote and promote 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911887 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-24 07:29:38 +00:00
Joe Orton
604575aa6c Vote, propose. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911886 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-24 06:56:48 +00:00
Rainer Jung
7d79c98dbd Propose. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911880 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-23 22:53:37 +00:00
Christophe Jaillet
23ce42065e Fix an URL. 
PR 66630 [Samuel Joly <samueljoly0 gmail.com>]

r1911878 in trunk

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911879 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-23 21:41:15 +00:00
Christophe Jaillet
d83d9ac1cb Remove an extra word. 
Follow up to r1909084 (in trunk).

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911877 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-23 21:24:24 +00:00
Christophe Jaillet
7d8fc897f3 Add compatibility version, typo (s/hader/header and s/representatins/representations) and trailing spaces. 
Move the new directive at the correct place in the file. [Lucien Gentis]

Mostly r1911874 in trunk.

[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911875 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-23 21:16:14 +00:00
Stefan Eissing
8823bf0bff cleanup after merge 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911859 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-23 07:53:05 +00:00
Stefan Eissing
c973637478 Merge r1911291 from trunk: 
*) mod_http2: Fix reporting of `Total Accesses` in server-status to not count
     HTTP/2 requests twice. Fixes PR 66801.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911858 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-23 07:52:33 +00:00
Ruediger Pluem
07df2127a6 * Vote and promote [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911843 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-22 15:46:57 +00:00
Giovanni Bechis
28b2219f12 vote [skip ci] 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911823 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-21 10:05:50 +00:00
Lucien Gentis
f97c9ced39 fr doc rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911780 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-19 14:33:37 +00:00
Lucien Gentis
e0f83e044c fr doc XML file update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911779 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-19 14:32:33 +00:00
Stefan Eissing
44fd2ff7e8 Merge /httpd/httpd/trunk:r1910996,1911721 
* mod_md:
   - New directive `MDMatchNames all|servernames` to allow more control over how
     MDomains are matched to VirtualHosts.
   - New directive `MDChallengeDns01Version`. Setting this to `2` will provide
     the command also with the challenge value on `teardown` invocation. In version
     1, the default, only the `setup` invocation gets this parameter.
     Refs #312. Thanks to @domrim for the idea.
   - For Managed Domain in "manual" mode, the checks if all used ServerName and
     ServerAlias are part of the MDomain now reports a warning instead of an error
     (AH10040) when not all names are present.
   - MDChallengeDns01 can now be configured for individual domains.
     Using PR from Jérôme Billiras (@bilhackmac) and adding test case and fixing proper working
   - Fixed a bug found by Jérôme Billiras (@bilhackmac) that caused the challenge
     teardown not being invoked as it should.

 * mod_md: fixed passing of the server environment variables to programs
   started via MDMessageCmd and MDChallengeDns01 on *nix system.
   See <https://github.com/icing/mod_md/issues/319>.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911722 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-16 12:02:03 +00:00
Stefan Eissing
225b9366ca Merge of r1911718 from trunk 
Tests, workarounds for bugs in curl 8.1.x



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911719 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-16 10:49:41 +00:00
Stefan Eissing
f45681259b vote and promote 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911690 13f79535-47bb-0310-9956-ffa450edef68
 2023-08-15 07:41:45 +00:00
Stefan Eissing
aa72524016 propose backport of r1911291. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911292 13f79535-47bb-0310-9956-ffa450edef68
 2023-07-26 12:22:43 +00:00
Christophe Jaillet
e90d26d044 Remove a not that helpful backport summary on tiny things. 
Credit Yann who did most of the job in optimizing send_brigade_nonblocking()

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911274 13f79535-47bb-0310-9956-ffa450edef68
 2023-07-25 20:15:03 +00:00
Eric Covener
222b8a412e vote/comment 
[skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911252 13f79535-47bb-0310-9956-ffa450edef68
 2023-07-24 18:40:33 +00:00
Lucien Gentis
f8c304e465 fr doc XML file update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911200 13f79535-47bb-0310-9956-ffa450edef68
 2023-07-22 13:23:53 +00:00
Lucien Gentis
123b3743bf fr doc XML file update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911198 13f79535-47bb-0310-9956-ffa450edef68
 2023-07-22 13:16:11 +00:00
Graham Leggett
99ebeeab00 Backport to v2.4: 
*) core: Add formats %{z} and %{strftime-format} to ErrorLogFormat, and make
     sure that if the format is configured early enough it applies to every log
     line.  PR 62161.
     trunk patch: https://svn.apache.org/r1908380
                  https://svn.apache.org/r1908383
                  https://svn.apache.org/r1908384
                  https://svn.apache.org/r1908388
                  https://svn.apache.org/r1908389
                  https://svn.apache.org/r1908390
                  https://svn.apache.org/r1908393
                  https://svn.apache.org/r1908394
                  https://svn.apache.org/r1908406
                  https://svn.apache.org/r1908407
                  https://svn.apache.org/r1908556
                  https://svn.apache.org/r1908557
     2.4.x patch: svn merge -c 1908380,1908383-1908384,1908388-1908390,1908393-1908394,1908406-1908407,1908556-1908557 ^/httpd/httpd/trunk .
                  (merge works modulo MMN, or patch/PR below)
                  https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/350.diff
                  https://github.com/apache/httpd/pull/350
     +1: ylavic, rpluem, minfrin



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911079 13f79535-47bb-0310-9956-ffa450edef68
 2023-07-17 21:16:59 +00:00
Graham Leggett
5d0a1f2e76 Vote and promote. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911078 13f79535-47bb-0310-9956-ffa450edef68
 2023-07-17 21:14:57 +00:00
Graham Leggett
9984036296 Update proposal. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911077 13f79535-47bb-0310-9956-ffa450edef68
 2023-07-17 21:03:37 +00:00
Graham Leggett
1257f01577 Backport proposal already backported in r1911060. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911076 13f79535-47bb-0310-9956-ffa450edef68
 2023-07-17 20:46:09 +00:00
Graham Leggett
3ca0947ffe Backport to v2.4: 
*) mod_deflate: Add DeflateAlterETag to control how the ETag
     is modified. The 'NoChange' parameter mimics 2.2.x behavior.
     PR 45023, PR 39727.
     Trunk version of patch:
        https://svn.apache.org/r1586542
     Backport version for 2.4.x of patch:
      https://raw.githubusercontent.com/jfclere/patch/main/mod_deflate.patch
     +1: jfclere, rpluem, ylavic
     rpluem says: Does anyone know why we don't merge the server config?



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911075 13f79535-47bb-0310-9956-ffa450edef68
 2023-07-17 20:40:44 +00:00