From c18661f44a94783ac21bfd93aafcacb506ffd8d3 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 19 Jun 2009 12:47:35 +0000 Subject: [PATCH] Revert a change that was made post 6.20.3 and that makes the IMAP gateway hang. Issue reported upstream. --- .../zarafa/patches/patch-gateway_IMAP_cpp | 22 +++++++++++++++++++ .../patches/patch-installer_linux_gateway_cfg | 11 +--------- 2 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 mail/zarafa/zarafa/patches/patch-gateway_IMAP_cpp diff --git a/mail/zarafa/zarafa/patches/patch-gateway_IMAP_cpp b/mail/zarafa/zarafa/patches/patch-gateway_IMAP_cpp new file mode 100644 index 00000000000..9deec6b5353 --- /dev/null +++ b/mail/zarafa/zarafa/patches/patch-gateway_IMAP_cpp @@ -0,0 +1,22 @@ +$OpenBSD: patch-gateway_IMAP_cpp,v 1.1 2009/06/19 12:47:35 ajacoutot Exp $ + +XXX bring back behaviour from 6.20.3 to prevent the IMAP gateway from hanging. + +--- gateway/IMAP.cpp.orig Thu May 14 16:49:02 2009 ++++ gateway/IMAP.cpp Fri Jun 19 12:23:43 2009 +@@ -3971,11 +3971,13 @@ HRESULT IMAP::HrParseSeqSet(string strSeqSet, list= lstFolderMailEIDs.size()+1) { ++ if (ulMailnr == 0) { + hr = MAPI_E_CALL_FAILED; + goto exit; + } +- lstMails.push_back(ulMailnr - 1); ++ if (ulMailnr <= lstFolderMailEIDs.size()) { ++ lstMails.push_back(ulMailnr - 1); ++ } + } + } else if (strSeqSet.substr(ulPos, 1) == ":") { + if (ulPos - ulBeginPos == 1 && strSeqSet.substr(ulBeginPos, 1) == "*") { diff --git a/mail/zarafa/zarafa/patches/patch-installer_linux_gateway_cfg b/mail/zarafa/zarafa/patches/patch-installer_linux_gateway_cfg index 6ce81f6ba1c..d05f9780cd7 100644 --- a/mail/zarafa/zarafa/patches/patch-installer_linux_gateway_cfg +++ b/mail/zarafa/zarafa/patches/patch-installer_linux_gateway_cfg @@ -1,4 +1,4 @@ -$OpenBSD: patch-installer_linux_gateway_cfg,v 1.2 2009/06/10 09:46:00 ajacoutot Exp $ +$OpenBSD: patch-installer_linux_gateway_cfg,v 1.3 2009/06/19 12:47:35 ajacoutot Exp $ --- installer/linux/gateway.cfg.orig Thu May 14 11:20:45 2009 +++ installer/linux/gateway.cfg Wed Jun 10 11:43:42 2009 @@ -6,16 +6,16 @@ server_bind = 0.0.0.0 @@ -35,12 +35,3 @@ $OpenBSD: patch-installer_linux_gateway_cfg,v 1.2 2009/06/10 09:46:00 ajacoutot # Verify client certificate ssl_verify_client = no -@@ -62,7 +62,7 @@ ssl_verify_path = - log_method = file - - # Loglevel (0=no logging, 5=full logging) --log_level = 2 -+log_level = 3 # XXX default log_level 2 hangs the connection - - # Logfile for log_method = file, use '-' for stderr - log_file = /var/log/zarafa/gateway.log