G
YouTube TikTok Games
Skip to content

[pull] master from nextcloud:master - #2

Open
pull[bot] wants to merge 413 commits into
ppker:masterfrom
nextcloud:master
Open

pull[bot] wants to merge 413 commits into
ppker:masterfrom
nextcloud:master

Conversation

@pull

@pull pull Bot commented Apr 26, 2022 •

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull Bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Apr 26, 2022
pathob and others added 28 commits January 16, 2024 00:04
The AWS S3 storage class can now be set using the environment variable
`OBJECTSTORE_S3_STORAGE_CLASS`.

The order of the AWS S3 environment variables in the `README.md` has
also been adjusted to be more "logical".

Signed-off-by: Patrick Hobusch <patrick@hobusch.net>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
The AWS S3 SSE-C key for server side encryption can now be set using
the environment variable `OBJECTSTORE_S3_SSE_C_KEY`.

Signed-off-by: Patrick Hobusch <patrick@hobusch.net>
Signed-off-by: Simon L <szaimen@e.mail.de>
Signed-off-by: Simon L <szaimen@e.mail.de>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
J0WI and others added 30 commits April 30, 2026 22:52
Bump stable to 33.0.3

Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
fix #2590

Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Nextcloud server PR nextcloud/server#57623 added sse_kms_enabled and
sse_kms_key_id objectstore arguments for AWS SSE-KMS encryption.
Expose them via OBJECTSTORE_S3_SSE_KMS_ENABLED and
OBJECTSTORE_S3_SSE_KMS_KEY_ID env vars, mirroring the existing SSE-C
support.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Signed-off-by: Stephen Cuppett <steve@cuppett.com>
Add S3 SSE-KMS environment variable support
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Assisted-by: ClaudeCode:claude-sonnet-5-5

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Apply recommend mitigation for the upcoming CVE-2026-115560.

We use session.serialize_handler=igbinary which is not explicitly
mentioned in the advisory but igbinary is also just an extension and not
part of the PHP core. So better safe than sorry.

https://www.php.net/archive/2026.php#2026-10-23-1

Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Development

Successfully merging this pull request may close these issues.