From f275d80e2f7e9107a0a650f7a419c9d8d9f42cec Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Thu, 26 Jan 2023 16:20:57 +0100 Subject: [PATCH 1/2] Fixes issue with nucache slow on linux, when cold-booting (#13719) * Fixes issue with nucache slow on linux, when cold-booting https://github.com/umbraco/Umbraco-CMS/issues/12159 --- src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs | 4 ---- .../Umbraco.PublishedCache.NuCache.csproj | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs index 03859a97e7..14976717be 100644 --- a/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs +++ b/src/Umbraco.PublishedCache.NuCache/DataSource/BTree.cs @@ -22,10 +22,6 @@ public class BTree // default is 4096, min 2^9 = 512, max 2^16 = 64K FileBlockSize = GetBlockSize(settings), - // HACK: Forces FileOptions to be WriteThrough here: https://github.com/mamift/CSharpTest.Net.Collections/blob/9f93733b3af7ee0e2de353e822ff54d908209b0b/src/CSharpTest.Net.Collections/IO/TransactedCompoundFile.cs#L316-L327, - // as the reflection uses otherwise will failed in .NET Core as the "_handle" field in FileStream is renamed to "_fileHandle". - StoragePerformance = StoragePerformance.CommitToDisk, - // other options? }; diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj index eeccf49cf2..f0e07283fa 100644 --- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj +++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj @@ -7,7 +7,7 @@ - + From 417f31fba592116674080e5270ce336e39fec70c Mon Sep 17 00:00:00 2001 From: Fjellvang Date: Tue, 31 Jan 2023 09:04:26 +0100 Subject: [PATCH 2/2] Send email notification on password reset (#13757) Co-authored-by: Aleksander --- .../Controllers/AuthenticationController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs index 7704344d4e..97aa5bd118 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/AuthenticationController.cs @@ -423,7 +423,7 @@ public class AuthenticationController : UmbracoApiControllerBase var mailMessage = new EmailMessage(from, user.Email, subject, message, true); - await _emailSender.SendAsync(mailMessage, Constants.Web.EmailTypes.PasswordReset); + await _emailSender.SendAsync(mailMessage, Constants.Web.EmailTypes.PasswordReset, true); _userManager.NotifyForgotPasswordRequested(User, user.Id.ToString()); }