diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc index 717367edc..3089ebc67 100644 --- a/Documentation/SOGoInstallationGuide.asciidoc +++ b/Documentation/SOGoInstallationGuide.asciidoc @@ -1351,7 +1351,7 @@ otherwise the CAS server will complain: ---- ERROR [org.jasig.cas.CentralAuthenticationServiceImpl] - ServiceTicket [ST-31740-hoV1brhhwMNfnBkSMVUw-ocas] with service [imap://myimapserver -does not match supplied service [sieve://mysieveserver:2000] +does not match supplied service [sieve://mysieveserver:4190] ---- Finally, when using imapproxy to speed up the imap accesses, the @@ -1895,8 +1895,8 @@ URL, such as: [options="compact"] * `sieve://127.0.0.1` -* `sieve://127.0.0.1:2000` -* `sieve://127.0.0.1:2000/?tls=YES` +* `sieve://127.0.0.1:4190` +* `sieve://127.0.0.1:4190/?tls=YES` Note that TLS is supported but SSL is not. @@ -3073,6 +3073,10 @@ current version of SOGo from the previous release. [cols="100a"] |======================================================================= +h|4.1.0 +|The default port for the SOGoSieveServer default is now 4190 (previously +2000). You need to explicitly set the port if you use a different port. + h|4.0.0 |Run the shell script `sql-update-3.2.10_to_4.0.0.sh` or `sql-update-3.2.10_to_4.0.0-mysql.sh` (if you are using MySQL). diff --git a/NEWS b/NEWS index b1e961469..2e7a813be 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -4.0.9 (2019-XX-XX) +4.1.0 (2019-XX-XX) ------------------ New features @@ -13,9 +13,10 @@ Enhancements - [web] improve constrat of text in toolbar with input fields - [web] updated Angular Material to version 1.1.20 - [core] now dynamically detect and use the IMAP separator (#1490) + - [core] default Sieve port is now 4190 (#4826) Bug fixes - - [web] properly handle Windows-1256 charaset (#4781) + - [web] properly handle Windows-1256 charset (#4781) - [web] fixed saving value of receipt action for main IMAP account - [web] fixed search results in Calendar module when targeting all events - [web] properly encode URL of cards from exteral sources diff --git a/SoObjects/SOGo/SOGoSieveManager.m b/SoObjects/SOGo/SOGoSieveManager.m index d917a20fb..799a49dda 100644 --- a/SoObjects/SOGo/SOGoSieveManager.m +++ b/SoObjects/SOGo/SOGoSieveManager.m @@ -1,6 +1,6 @@ /* SOGoSieveManager.m - this file is part of SOGo * - * Copyright (C) 2010-2016 Inverse inc. + * Copyright (C) 2010-2019 Inverse inc. * * Author: Inverse * @@ -673,10 +673,10 @@ static NSString *sieveScriptName = @"sogo"; // sieveServer might have the following format: // // sieve://localhost - // sieve://localhost:2000 - // sieve://localhost:2000/?tls=YES + // sieve://localhost:4190 + // sieve://localhost:4190/?tls=YES // - // Values such as "localhost" or "localhost:2000" are NOT supported. + // Values such as "localhost" or "localhost:4190" are NOT supported. // // We first try to get the user's preferred Sieve server sieveServer = [[[user mailAccounts] objectAtIndex: 0] objectForKey: @"sieveServerName"]; @@ -710,7 +710,7 @@ static NSString *sieveScriptName = @"sogo"; if ([url port]) sievePort = [[url port] intValue]; else - sievePort = 2000; + sievePort = 4190; sieveQuery = [cUrl query] ? [cUrl query] : [url query]; if (sieveQuery)