From 18a7bebb7e1ebbf77af7b2106af5c387fabe27bb Mon Sep 17 00:00:00 2001 From: "kenneth.skovhede@gmail.com" Date: Sat, 24 Sep 2011 07:37:08 +0000 Subject: Created the 1.2.2 branch with changes from r907 git-svn-id: https://duplicati.googlecode.com/svn/tags/1.2.2 Final@909 59da171f-624f-0410-aa54-27559c288bec --- Duplicati/Library/Modules/Builtin/HttpOptions.cs | 14 ++++---------- Duplicati/Library/Utility/SslCertificateValidator.cs | 4 +--- Duplicati/License/VersionNumbers.cs | 2 ++ 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Duplicati/Library/Modules/Builtin/HttpOptions.cs b/Duplicati/Library/Modules/Builtin/HttpOptions.cs index 98c415617..2280acb93 100644 --- a/Duplicati/Library/Modules/Builtin/HttpOptions.cs +++ b/Duplicati/Library/Modules/Builtin/HttpOptions.cs @@ -73,21 +73,15 @@ namespace Duplicati.Library.Modules.Builtin { m_dispose = true; - string opt; - commandlineOptions.TryGetValue(OPTION_ACCEPT_ANY_CERTIFICATE, out opt); + bool accepAllCertificates = commandlineOptions.ContainsKey(OPTION_ACCEPT_ANY_CERTIFICATE) && Utility.Utility.ParseBool(commandlineOptions[OPTION_ACCEPT_ANY_CERTIFICATE], true); - bool accepAllCertificates = Utility.Utility.ParseBool(opt, false); string certHash; commandlineOptions.TryGetValue(OPTION_ACCEPT_SPECIFIED_CERTIFICATE, out certHash); - if (accepAllCertificates || !string.IsNullOrEmpty(certHash)) - m_certificateValidator = new Library.Utility.SslCertificateValidator(accepAllCertificates, certHash); - - commandlineOptions.TryGetValue(OPTION_DISABLE_NAGLING, out opt); - bool disableNagle = Utility.Utility.ParseBool(opt, false); + m_certificateValidator = new Library.Utility.SslCertificateValidator(accepAllCertificates, certHash); - commandlineOptions.TryGetValue(OPTION_DISABLE_EXPECT100, out opt); - bool disableExpect100 = Utility.Utility.ParseBool(opt, false); + bool disableNagle = commandlineOptions.ContainsKey(OPTION_DISABLE_NAGLING) && Utility.Utility.ParseBool(commandlineOptions[OPTION_DISABLE_NAGLING], true); + bool disableExpect100 = commandlineOptions.ContainsKey(OPTION_DISABLE_EXPECT100) && Utility.Utility.ParseBool(commandlineOptions[OPTION_DISABLE_EXPECT100], true); m_useNagle = System.Net.ServicePointManager.UseNagleAlgorithm; m_useExpect = System.Net.ServicePointManager.Expect100Continue; diff --git a/Duplicati/Library/Utility/SslCertificateValidator.cs b/Duplicati/Library/Utility/SslCertificateValidator.cs index 83814a8ac..41498da76 100644 --- a/Duplicati/Library/Utility/SslCertificateValidator.cs +++ b/Duplicati/Library/Utility/SslCertificateValidator.cs @@ -89,10 +89,8 @@ namespace Duplicati.Library.Utility try { certHash = Utility.ByteArrayAsHexString(cert.GetCertHash()); - if (certHash != null && certHash.Equals(m_validHash, StringComparison.InvariantCultureIgnoreCase)) + if (certHash != null && !string.IsNullOrEmpty(m_validHash) && certHash.Equals(m_validHash, StringComparison.InvariantCultureIgnoreCase)) return true; - - Console.WriteLine(string.Format(Strings.SslCertificateValidator.VerifyCertificateException, sslPolicyErrors, certHash)); } catch (Exception ex) { diff --git a/Duplicati/License/VersionNumbers.cs b/Duplicati/License/VersionNumbers.cs index a836529d9..92d6e3026 100644 --- a/Duplicati/License/VersionNumbers.cs +++ b/Duplicati/License/VersionNumbers.cs @@ -58,6 +58,8 @@ namespace Duplicati.License return "1.2 Final"; else if (v == new Version(1, 2, 1, 856)) return "1.2.1 Final"; + else if (v == new Version(1, 2, 2, 909)) + return "1.2.2 Final"; else return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(); } -- cgit v1.2.3