From 3acfb2a9eacf0458d854d8f7d9895b1c80098fe7 Mon Sep 17 00:00:00 2001 From: hartvig Date: Thu, 9 Aug 2012 11:15:55 -0200 Subject: [PATCH] Updates to login cookies --- src/umbraco.businesslogic/BasePages/BasePage.cs | 6 ++++++ src/umbraco.businesslogic/StateHelper.cs | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/umbraco.businesslogic/BasePages/BasePage.cs b/src/umbraco.businesslogic/BasePages/BasePage.cs index b0e367ebe0..7964fbad22 100644 --- a/src/umbraco.businesslogic/BasePages/BasePage.cs +++ b/src/umbraco.businesslogic/BasePages/BasePage.cs @@ -234,6 +234,12 @@ namespace umbraco.BasePages { // we swallow this type of exception as it happens if a legacy (pre 4.8.1) cookie is set } + catch (ArgumentException ex) + { + // we swallow this one because it's 99.99% certaincy is legacy based. We'll still log it, though + Log.Instance.AddException(ex); + + } } return ""; diff --git a/src/umbraco.businesslogic/StateHelper.cs b/src/umbraco.businesslogic/StateHelper.cs index 10103cffdb..4d5ab3ff17 100644 --- a/src/umbraco.businesslogic/StateHelper.cs +++ b/src/umbraco.businesslogic/StateHelper.cs @@ -354,6 +354,8 @@ namespace umbraco.BusinessLogic public void SetValue(string value) { HttpCookie cookie = new HttpCookie(_key, value); + if (GlobalSettings.UseSSL) + cookie.Secure = true; if (!TimeSpan.Zero.Equals(_expires)) cookie.Expires = DateTime.Now + _expires; ResponseCookie = cookie; @@ -378,7 +380,9 @@ namespace umbraco.BusinessLogic public void SetValue(string value, DateTime expires) { HttpCookie cookie = new HttpCookie(_key, value); - cookie.Expires = expires; + if (GlobalSettings.UseSSL) + cookie.Secure = true; + cookie.Expires = expires; ResponseCookie = cookie; // original Umbraco code also does this