Merge branch 'master' of github.com:nodemailer/wildduck into ZMS-181

zone-eu · Nov 1, 2024 · a45c36a · a45c36a
2 parents a963a07 + 686cd86
commit a45c36a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/imap-core/lib/imap-connection.js b/imap-core/lib/imap-connection.js
@@ -13,7 +13,9 @@ const EventEmitter = require('events').EventEmitter;
 const packageInfo = require('../../package');
 const errors = require('../../lib/errors.js');
 
-const SOCKET_TIMEOUT = 5 * 60 * 1000;
+// Shift timeout by 37 seconds (randomly selected by myself, no specific meaning) to
+// avoid race conditions where both the client and the server wait for 5 minutes
+const SOCKET_TIMEOUT = 5 * 60 * 1000 + 37 * 1000;
 
 /**
  * Creates a handler for new socket

diff --git a/setup/01_install_commits.sh b/setup/01_install_commits.sh
@@ -9,11 +9,11 @@ NODE_MAJOR="20"
 MONGODB="7.0"
 CODENAME=`lsb_release -c -s`
 
-WILDDUCK_COMMIT="9a61cff18689f773b01a77d00d6e309507fb5dd8"
-ZONEMTA_COMMIT="2ec1ba85a44c4665a6326271c8162ee76c4d6d02" # zone-mta-template
+WILDDUCK_COMMIT="783ee16b732afb93cc4d58514e946b01720070bb"
+ZONEMTA_COMMIT="0df73a3946eae0964a166b3015d3ed558d9d024f" # zone-mta-template
 WEBMAIL_COMMIT="40ee1ef973de33de5bdf3e6b7e877d156d87436a"
-WILDDUCK_ZONEMTA_COMMIT="f029b8d69aaa255b1c4f426848f994be21be8cd0"
-WILDDUCK_HARAKA_COMMIT="a209775ceac579b8ac1a4c04c052674eba763691"
-HARAKA_VERSION="3.0.3"
+WILDDUCK_ZONEMTA_COMMIT="1f4fad5ba771ce381ef0543e8c9c49ee25e4a6f2"
+WILDDUCK_HARAKA_COMMIT="bf20a732f25a416d700522fdce8c31952c6950f7"
+HARAKA_VERSION="3.0.5"
 
 echo -e "\n-- Executing ${ORANGE}${OURNAME}${NC} subscript --"