From c1d175d15c3ccafe6f6142ba1fd87ad16472ba1c Mon Sep 17 00:00:00 2001 From: askmeaboutloom Date: Thu, 21 Nov 2024 21:49:02 +0100 Subject: [PATCH] Don't reload certificats if they didn't change The modified check had the wrong comparison. --- ChangeLog | 1 + src/libserver/sslserver.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7475d78449..e19585aa78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ Unreleased Version 2.2.2-pre * Fix: Work around a crash on Android that sometimes occurs when putting your palm on the screen, which somehow leads to touch events with zero contact points. Thanks Mav for reporting. * Fix: Uncap aspect ratio on older Android versions. Thanks Molderche for reporting. * Fix: Work around modifier keys not registering when using a tablet on Wayland. Thanks Absolute Goober for reporting. + * Server Fix: Don't pointlessly reload server certificates if they didn't change. Thanks Liz for reporting. 2024-11-06 Version 2.2.2-beta.4 * Fix: Solve rendering glitches with selection outlines that happen on some systems. Thanks xxxx for reporting. diff --git a/src/libserver/sslserver.cpp b/src/libserver/sslserver.cpp index 23f2471fbb..96c4bda061 100644 --- a/src/libserver/sslserver.cpp +++ b/src/libserver/sslserver.cpp @@ -34,7 +34,7 @@ bool SslServer::reloadCertChain() return false; } - if(!m_certLastMod.isNull() && fi.lastModified() < m_certLastMod) { + if(!m_certLastMod.isNull() && fi.lastModified() <= m_certLastMod) { // Certificate file hasn't been modified return true; }