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

18 Commits

Author SHA1 Message Date
Joe Orton
e04e3a16cc Merge r1929706, r1930012 from trunk: [docs CTR]
feat: add vnd.sqlite3 mime type and extensions

Submitted by: Alexandru Mărășteanu <hello alexei.ro>
Github: closes #563

feat: add HEIC, HEIF and related mime types

See https://en.wikipedia.org/wiki/High_Efficiency_Image_File_Format

Submitted by: Alexandru Mărășteanu <hello alexei.ro>
Github: closes #580



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1930714 13f79535-47bb-0310-9956-ffa450edef68
2025-12-18 16:07:35 +00:00
Joe Orton
c732147095 Merge r1915651, r1916381, r1920589, r1923133 from trunk: [under CTR for docs]
mod_dav: Update redirect-carefully example BrowserMatch config to
match more recent client versions.

PR: 66148, 67039
Submitted by: Michal Maloszewski <michal.maloszewski canonical.com>

Fix BrowserMatch for gvfs.

PR: 66148
Submitted by: Romain Tartière <romain blogreen.org>

Add jxl mime type

Submitted by: printfn <printfn users.noreply.github.com>
Github: closes #478

Fix typo in charset.conv

\"Croation\" is a misspelling. It should be \"Croatian\".

Submitted by: Michael Hospedales <hospedales me.com>
Github: closes #508



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923263 13f79535-47bb-0310-9956-ffa450edef68
2025-01-20 12:53:06 +00:00
Stefan Eissing
c2fb699b8f Merge /httpd/httpd/trunk:r1920747,1920751
*) mod_md: update to version 2.4.28
     - When the server starts, it looks for new, staged certificates to
       activate. If the staged set of files in 'md/staging/<domain>' is messed
       up, this could prevent further renewals to happen. Now, when the staging
       set is present, but could not be activated due to an error, purge the
       whole directory. [icing]
     - Fix certificate retrieval on ACME renewal to not require a 'Location:'
       header returned by the ACME CA. This was the way it was done in ACME
       before it became an IETF standard. Let's Encrypt still supports this,
       but other CAs do not. [icing]
     - Restore compatibility with OpenSSL < 1.1. [ylavic]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1920753 13f79535-47bb-0310-9956-ffa450edef68
2024-09-17 12:10:23 +00:00
Stefan Eissing
2792b81272 the big pytest test suite sync with trunk
all the good stuff collected over the aeons now
also in the 2.4.x maintenance branch



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1919126 13f79535-47bb-0310-9956-ffa450edef68
2024-07-11 08:18:12 +00:00
Rainer Jung
2b62fb9824 pytest: fix asset list extraction from nghttp output
Provided by rpluem.

Backport of r1918576 from trunk.
CTR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1918577 13f79535-47bb-0310-9956-ffa450edef68
2024-06-25 09:24:48 +00:00
Rainer Jung
8fdace4758 Fix failing pytest modules/http2/test_712_buffering.py:48.
Do not count lines like "00:12:26.578220 <= Recv data, 0 bytes (0x0)"
(which happen before the final close) as receiving a real chunk.

Backport of r1918606 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916807 13f79535-47bb-0310-9956-ffa450edef68
2024-04-04 22:20:31 +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
Ruediger Pluem
2deffcb6b0 Merge r1910668 from trunk:
pyhttpd: Generate core dumps on crash and show them in the ci eventually.


Reviewed by: ruediger (CI stuff is CTR)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1913435 13f79535-47bb-0310-9956-ffa450edef68
2023-10-30 12:32: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
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
4fbffa24a7 tests, sync tests from trunk with skips for features/fixes awaiting backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910167 13f79535-47bb-0310-9956-ffa450edef68
2023-06-01 14:01:51 +00:00
Stefan Eissing
cb6fbeb6db *) tests: backport changes to make pytest tests work
again, fixing mainly cgi vs. multipart issues.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1909564 13f79535-47bb-0310-9956-ffa450edef68
2023-05-02 10:05:52 +00:00
Rainer Jung
9e1ac6d4a2 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/branches/2.4.x@1908245 13f79535-47bb-0310-9956-ffa450edef68
2023-03-10 09:13:36 +00:00
Rainer Jung
ba2532798d 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/branches/2.4.x@1908221 13f79535-47bb-0310-9956-ffa450edef68
2023-03-09 10:56:42 +00:00
Stefan Eissing
9767274b88 *) mod_http2: version 2.0.10 of the module, synchronizing changes
with the gitgub version. This is a partial rewrite of how connections
     and streams are handled.
     - an APR pollset and pipes (where supported) are used to monitor
       the main connection and react to IO for request/response handling.
       This replaces the stuttered timed waits of earlier versions.
     - H2SerializeHeaders directive still exists, but has no longer an effect.
     - Clients that seemingly misbehave still get less resources allocated,
       but ongoing requests are no longer disrupted.
     - Fixed an issue since 1.15.24 that "Server" headers in proxied requests
       were overwritten instead of preserved. [PR by @daum3ns]
     - A regression in v1.15.24 was fixed that could lead to httpd child
       processes not being terminated on a graceful reload or when reaching
       MaxConnectionsPerChild. When unprocessed h2 requests were queued at
       the time, these could stall. See #212.
     - Improved information displayed in 'server-status' for H2 connections when
       Extended Status is enabled. Now one can see the last request that IO
       operations happened on and transferred IO stats are updated as well.
     - When reaching server limits, such as MaxRequestsPerChild, the HTTP/2 connection
       send a GOAWAY frame much too early on new connections, leading to invalid
       protocol state and a client failing the request. See PR65731 at
       <https://bz.apache.org/bugzilla/show_bug.cgi?id=65731>.
       The module now initializes the HTTP/2 protocol correctly and allows the
       client to submit one request before the shutdown via a GOAWAY frame
       is being announced.
     - :scheme pseudo-header values, not matching the
       connection scheme, are forwarded via absolute uris to the
       http protocol processing to preserve semantics of the request.
       Checks on combinations of pseudo-headers values/absence
       have been added as described in RFC 7540. Fixes #230.
     - A bug that prevented trailers (e.g. HEADER frame at the end) to be
       generated in certain cases was fixed. See #233 where it prevented
       gRPC responses to be properly generated.
     - Request and response header values are automatically stripped of leading
       and trialing space/tab characters. This is equivalent behaviour to what
       Apache httpd's http/1.1 parser does.
       The checks for this in nghttp2 v1.50.0+ are disabled.
     - Extensive testing in production done by Alessandro Bianchi (@alexskynet)
       on the v2.0.x versions for stability. Many thanks!

  *) mod_proxy_http2: fixed #235 by no longer forwarding 'Host:' header when
     request ':authority' is known. Improved test case that did not catch that
     the previous 'fix' was incorrect.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1906475 13f79535-47bb-0310-9956-ffa450edef68
2023-01-09 07:35:18 +00:00
Stefan Eissing
43adaacf52 *) test: backporting improved nghttp output parsing.
test/modules/http2 adding trailer tests.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1902714 13f79535-47bb-0310-9956-ffa450edef68
2022-07-14 09:37:43 +00:00
Stefan Eissing
1512e21dee Merge r1898068 from trunk:
*) test: capture and parse output from nghttp more reliably.
    add repeat param to certain proxy tests.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898069 13f79535-47bb-0310-9956-ffa450edef68
2022-02-14 13:55:59 +00:00
Stefan Eissing
9c5eb28450 * test: updated pytest test/modules/http2 suite from trunk
with skips for cases where backports have not been done.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1895945 13f79535-47bb-0310-9956-ffa450edef68
2021-12-14 11:26:52 +00:00