From 1a821b407319e3726affdf6cd01ae219afc3ab95 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 1 Jul 2014 17:41:22 +1000
Subject: [PATCH 1/4] super quick performance win in the case where people
 don't pass in distinct values

---
 src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs    | 3 +++
 src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs  | 3 +++
 .../Persistence/Repositories/StylesheetRepository.cs           | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
index e29413aa52..541690e9ea 100644
--- a/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
@@ -130,6 +130,9 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <returns></returns>
         public IEnumerable<TEntity> GetAll(params TId[] ids)
         {
+            //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
+            ids = ids.Distinct().ToArray();
+
             if (ids.Any())
             {
                 var entities = _cache.GetByIds(
diff --git a/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs
index f6af195b94..b09930ae3f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs
@@ -64,6 +64,9 @@ namespace Umbraco.Core.Persistence.Repositories
 
         public override IEnumerable<Script> GetAll(params string[] ids)
         {
+            //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
+            ids = ids.Distinct().ToArray();
+
             if (ids.Any())
             {
                 foreach (var id in ids)
diff --git a/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs b/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs
index 893fce373c..18ff41c4b5 100644
--- a/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs
@@ -85,6 +85,9 @@ namespace Umbraco.Core.Persistence.Repositories
 
         public override IEnumerable<Stylesheet> GetAll(params string[] ids)
         {
+            //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
+            ids = ids.Distinct().ToArray();
+
             if (ids.Any())
             {
                 foreach (var id in ids)

From 431e93000e7bf77398d9680c290a11761dc64547 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 8 Jul 2014 19:04:38 +1000
Subject: [PATCH 2/4] Fixes: U4-5157 Membership.GetUser() causes 13 SQL
 queries, including duplicates

---
 .../Membership/DynamicMemberContentTests.cs   | 105 +++++++------
 .../PublishedCache/MemberPublishedContent.cs  |  20 +--
 src/Umbraco.Web/Security/MembershipHelper.cs  | 144 +++++++++++++-----
 3 files changed, 168 insertions(+), 101 deletions(-)

diff --git a/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs b/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs
index 203477da8b..88b4ab5346 100644
--- a/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs
+++ b/src/Umbraco.Tests/Membership/DynamicMemberContentTests.cs
@@ -51,24 +51,20 @@ namespace Umbraco.Tests.Membership
         {
             var date = DateTime.Now;
 
-            var m = Mock.Of<MembershipUser>(
-                user => user.UserName == "test username" 
-                    && user.Comment == "test comment"
-                    && user.IsApproved == true
-                    && user.IsLockedOut == false
-                    && user.CreationDate == date
-                    && user.Email == "test@email.com"
-                    && user.LastActivityDate == date.AddMinutes(1)
-                    && user.LastLockoutDate == date.AddMinutes(2)
-                    && user.LastLoginDate == date.AddMinutes(3)
-                    && user.LastPasswordChangedDate == date.AddMinutes(4)
-                    && user.PasswordQuestion == "test question");
+            var member = new Member("test name", "test@email.com", "test username", "test password",
+                GetMemberType());
+            member.Comments = "test comment";
+            member.IsApproved = true;
+            member.IsLockedOut = false;
+            member.CreateDate = date;
+            member.LastLoginDate = date.AddMinutes(1);
+            member.LastLockoutDate = date.AddMinutes(2);
+            //NOTE: Last activity date is always the same as last login date since we don't have a place to store that data
+            //member.LastLoginDate = date.AddMinutes(3);
+            member.LastPasswordChangeDate = date.AddMinutes(4);
+            member.PasswordQuestion = "test question";
 
-
-            var mpc = new MemberPublishedContent(
-                new Member("test name", "test@email.com", "test username", "test password",
-                    Mock.Of<IMemberType>(type => type.Alias == "Member")),
-                m);                
+            var mpc = new MemberPublishedContent(member);                
 
             var d = mpc.AsDynamic();
 
@@ -79,7 +75,7 @@ namespace Umbraco.Tests.Membership
             Assert.AreEqual(false, d.IsLockedOut);
             Assert.AreEqual(date.AddMinutes(1), d.LastActivityDate);
             Assert.AreEqual(date.AddMinutes(2), d.LastLockoutDate);
-            Assert.AreEqual(date.AddMinutes(3), d.LastLoginDate);
+            Assert.AreEqual(date.AddMinutes(1), d.LastLoginDate);
             Assert.AreEqual(date.AddMinutes(4), d.LastPasswordChangedDate);
             Assert.AreEqual("test name", d.Name);
             Assert.AreEqual("test question", d.PasswordQuestion);
@@ -92,24 +88,20 @@ namespace Umbraco.Tests.Membership
         {
             var date = DateTime.Now;
 
-            var m = Mock.Of<MembershipUser>(
-                user => user.UserName == "test username"
-                    && user.Comment == "test comment"
-                    && user.IsApproved == true
-                    && user.IsLockedOut == false
-                    && user.CreationDate == date
-                    && user.Email == "test@email.com"
-                    && user.LastActivityDate == date.AddMinutes(1)
-                    && user.LastLockoutDate == date.AddMinutes(2)
-                    && user.LastLoginDate == date.AddMinutes(3)
-                    && user.LastPasswordChangedDate == date.AddMinutes(4)
-                    && user.PasswordQuestion == "test question");
+            var member = new Member("test name", "test@email.com", "test username", "test password",
+               GetMemberType());
+            member.Comments = "test comment";
+            member.IsApproved = true;
+            member.IsLockedOut = false;
+            member.CreateDate = date;
+            member.LastLoginDate = date.AddMinutes(1);
+            member.LastLockoutDate = date.AddMinutes(2);
+            //NOTE: Last activity date is always the same as last login date since we don't have a place to store that data
+            //member.LastLoginDate = date.AddMinutes(3);
+            member.LastPasswordChangeDate = date.AddMinutes(4);
+            member.PasswordQuestion = "test question";
 
-
-            var mpc = new MemberPublishedContent(
-                new Member("test name", "test@email.com", "test username", "test password",
-                    Mock.Of<IMemberType>(type => type.Alias == "Member")) ,
-                m);
+            var mpc = new MemberPublishedContent(member);
 
             var d = mpc.AsDynamic();
 
@@ -120,7 +112,7 @@ namespace Umbraco.Tests.Membership
             Assert.AreEqual(false, d.isLockedOut);
             Assert.AreEqual(date.AddMinutes(1), d.lastActivityDate);
             Assert.AreEqual(date.AddMinutes(2), d.lastLockoutDate);
-            Assert.AreEqual(date.AddMinutes(3), d.lastLoginDate);
+            Assert.AreEqual(date.AddMinutes(1), d.lastLoginDate);
             Assert.AreEqual(date.AddMinutes(4), d.lastPasswordChangedDate);
             Assert.AreEqual("test name", d.name);
             Assert.AreEqual("test question", d.passwordQuestion);
@@ -133,25 +125,23 @@ namespace Umbraco.Tests.Membership
         {
             var date = DateTime.Now;
 
-            var m = Mock.Of<MembershipUser>(
-                user => user.UserName == "test username"
-                    && user.Comment == "test comment"
-                    && user.IsApproved == true
-                    && user.IsLockedOut == false
-                    && user.CreationDate == date
-                    && user.Email == "test@email.com"
-                    && user.LastActivityDate == date.AddMinutes(1)
-                    && user.LastLockoutDate == date.AddMinutes(2)
-                    && user.LastLoginDate == date.AddMinutes(3)
-                    && user.LastPasswordChangedDate == date.AddMinutes(4)
-                    && user.PasswordQuestion == "test question");
-
             var memberType = MockedContentTypes.CreateSimpleMemberType("Member", "Member");
             var member = MockedMember.CreateSimpleMember(memberType, "test name", "test@email.com", "test password", "test username");
+            member.Comments = "test comment";
+            member.IsApproved = true;
+            member.IsLockedOut = false;
+            member.CreateDate = date;
+            member.LastLoginDate = date.AddMinutes(1);
+            member.LastLockoutDate = date.AddMinutes(2);
+            //NOTE: Last activity date is always the same as last login date since we don't have a place to store that data
+            //member.LastLoginDate = date.AddMinutes(3);
+            member.LastPasswordChangeDate = date.AddMinutes(4);
+            member.PasswordQuestion = "test question";
+
             member.Properties["title"].Value = "Test Value 1";
             member.Properties["bodyText"].Value = "Test Value 2";
             member.Properties["author"].Value = "Test Value 3";
-            var mpc = new MemberPublishedContent(member, m);
+            var mpc = new MemberPublishedContent(member);
 
             var d = mpc.AsDynamic();
 
@@ -165,6 +155,21 @@ namespace Umbraco.Tests.Membership
 
         }
 
+        private IMemberType GetMemberType()
+        {
+            var entity = new MemberType(-1)
+            {
+                Alias = "Member"
+            };
+
+            entity.AddPropertyGroup(Umbraco.Core.Constants.Conventions.Member.StandardPropertiesGroupName);
+            var standardPropertyTypes = Umbraco.Core.Constants.Conventions.Member.GetStandardPropertyTypeStubs();
+            foreach (var standardPropertyType in standardPropertyTypes)
+            {
+                entity.AddPropertyType(standardPropertyType.Value, Umbraco.Core.Constants.Conventions.Member.StandardPropertiesGroupName);
+            }
+            return entity;
+        }
 
     }
 }
diff --git a/src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs b/src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
index 4e5d0efa39..d21828cc78 100644
--- a/src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Web.Security;
 using Umbraco.Core;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web.Models;
 
@@ -17,17 +18,16 @@ namespace Umbraco.Web.PublishedCache
     {
 
         private readonly IMember _member;
-        private readonly MembershipUser _membershipUser;
+        private readonly IMembershipUser _membershipUser;
         private readonly IPublishedContentProperty[] _properties;
         private readonly PublishedContentType _publishedMemberType;
 
-        public MemberPublishedContent(IMember member, MembershipUser membershipUser)
+        public MemberPublishedContent(IMember member)
         {
-            if (member == null) throw new ArgumentNullException("member");
-            if (membershipUser == null) throw new ArgumentNullException("membershipUser");
+            if (member == null) throw new ArgumentNullException("member");            
 
             _member = member;
-            _membershipUser = membershipUser;
+            _membershipUser = member;
             _publishedMemberType = PublishedContentType.Get(PublishedItemType.Member, _member.ContentTypeAlias);
             if (_publishedMemberType == null)
             {
@@ -45,7 +45,7 @@ namespace Umbraco.Web.PublishedCache
         }
         public string UserName
         {
-            get { return _membershipUser.UserName; }
+            get { return _membershipUser.Username; }
         }
         public string PasswordQuestion
         {
@@ -53,7 +53,7 @@ namespace Umbraco.Web.PublishedCache
         }
         public string Comments
         {
-            get { return _membershipUser.Comment; }
+            get { return _membershipUser.Comments; }
         }
         public bool IsApproved
         {
@@ -69,7 +69,7 @@ namespace Umbraco.Web.PublishedCache
         }
         public DateTime CreationDate
         {
-            get { return _membershipUser.CreationDate; }
+            get { return _membershipUser.CreateDate; }
         }
         public DateTime LastLoginDate
         {
@@ -77,11 +77,11 @@ namespace Umbraco.Web.PublishedCache
         }
         public DateTime LastActivityDate
         {
-            get { return _membershipUser.LastActivityDate; }
+            get { return _membershipUser.LastLoginDate; }
         }
         public DateTime LastPasswordChangedDate
         {
-            get { return _membershipUser.LastPasswordChangedDate; }
+            get { return _membershipUser.LastPasswordChangeDate; }
         } 
         #endregion
 
diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index fa3332d70d..56422db660 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -11,6 +11,8 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Security;
 using Umbraco.Web.Models;
 using Umbraco.Web.PublishedCache;
+using Umbraco.Core.Cache;
+using MPE = global::Umbraco.Core.Security.MembershipProviderExtensions;
 
 namespace Umbraco.Web.Security
 {
@@ -30,7 +32,7 @@ namespace Umbraco.Web.Security
             if (httpContext == null) throw new ArgumentNullException("httpContext");
             _applicationContext = applicationContext;
             _httpContext = httpContext;
-        }
+        }   
 
         public MembershipHelper(UmbracoContext umbracoContext)
         {
@@ -86,7 +88,7 @@ namespace Umbraco.Web.Security
                 return Attempt<MembershipUser>.Fail(ex);
             }
             
-            var member = GetCurrentMember();
+            var member = GetCurrentPersistedMember();
 
             //NOTE: If changing the username is a requirement, than that needs to be done via the IMember directly since MembershipProvider's natively do 
             // not support changing a username! 
@@ -209,50 +211,95 @@ namespace Umbraco.Web.Security
 
         public IPublishedContent GetByProviderKey(object key)
         {
-            var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
-            if (provider.IsUmbracoMembershipProvider() == false)
-            {
-                throw new NotSupportedException("Cannot access this method unless the Umbraco membership provider is active");
-            }
+            return _applicationContext.ApplicationCache.RequestCache.GetCacheItem<IPublishedContent>(
+                GetCacheKey("GetByProviderKey", key), () =>
+                {
+                    var provider = MPE.GetMembersMembershipProvider();
+                    if (provider.IsUmbracoMembershipProvider() == false)
+                    {
+                        throw new NotSupportedException("Cannot access this method unless the Umbraco membership provider is active");
+                    }
 
-            var result = _applicationContext.Services.MemberService.GetByProviderKey(key);
-            return result == null ? null : new MemberPublishedContent(result, provider.GetUser(result.Username, false));
+                    var result = _applicationContext.Services.MemberService.GetByProviderKey(key);
+                    return result == null ? null : new MemberPublishedContent(result);
+                });
         }
 
         public IPublishedContent GetById(int memberId)
         {
-            var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
-            if (provider.IsUmbracoMembershipProvider() == false)
-            {
-                throw new NotSupportedException("Cannot access this method unless the Umbraco membership provider is active");
-            }
+            return _applicationContext.ApplicationCache.RequestCache.GetCacheItem<IPublishedContent>(
+                GetCacheKey("GetById", memberId), () =>
+                {
+                    var provider = MPE.GetMembersMembershipProvider();
+                    if (provider.IsUmbracoMembershipProvider() == false)
+                    {
+                        throw new NotSupportedException("Cannot access this method unless the Umbraco membership provider is active");
+                    }
 
-            var result = _applicationContext.Services.MemberService.GetById(memberId);
-            return result == null ? null : new MemberPublishedContent(result, provider.GetUser(result.Username, false));
+                    var result = _applicationContext.Services.MemberService.GetById(memberId);
+                    return result == null ? null : new MemberPublishedContent(result);
+                });
         }
 
         public IPublishedContent GetByUsername(string username)
         {
-            var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
-            if (provider.IsUmbracoMembershipProvider() == false)
-            {
-                throw new NotSupportedException("Cannot access this method unless the Umbraco membership provider is active");
-            }
+            return _applicationContext.ApplicationCache.RequestCache.GetCacheItem<IPublishedContent>(
+                GetCacheKey("GetByUsername", username), () =>
+                {
+                    var provider = MPE.GetMembersMembershipProvider();
+                    if (provider.IsUmbracoMembershipProvider() == false)
+                    {
+                        throw new NotSupportedException("Cannot access this method unless the Umbraco membership provider is active");
+                    }
 
-            var result = _applicationContext.Services.MemberService.GetByUsername(username);
-            return result == null ? null : new MemberPublishedContent(result, provider.GetUser(result.Username, false));
+                    var result = _applicationContext.Services.MemberService.GetByUsername(username);
+                    return result == null ? null : new MemberPublishedContent(result);
+                });
         }
 
         public IPublishedContent GetByEmail(string email)
         {
-            var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
-            if (provider.IsUmbracoMembershipProvider() == false)
-            {
-                throw new NotSupportedException("Cannot access this method unless the Umbraco membership provider is active");
-            }
+            return _applicationContext.ApplicationCache.RequestCache.GetCacheItem<IPublishedContent>(
+                GetCacheKey("GetByEmail", email), () =>
+                {
+                    var provider = MPE.GetMembersMembershipProvider();
+                    if (provider.IsUmbracoMembershipProvider() == false)
+                    {
+                        throw new NotSupportedException("Cannot access this method unless the Umbraco membership provider is active");
+                    }
 
-            var result = _applicationContext.Services.MemberService.GetByEmail(email);
-            return result == null ? null : new MemberPublishedContent(result, provider.GetUser(result.Username, false));
+                    var result = _applicationContext.Services.MemberService.GetByEmail(email);
+                    return result == null ? null : new MemberPublishedContent(result);
+                });
+        }
+
+        /// <summary>
+        /// Returns the currently logged in member as IPublishedContent
+        /// </summary>
+        /// <returns></returns>
+        public IPublishedContent GetCurrentMember()
+        {
+            if (IsLoggedIn() == false)
+            {
+                return null;
+            }
+            var result = GetCurrentPersistedMember();
+            var provider = MPE.GetMembersMembershipProvider();
+            return result == null ? null : new MemberPublishedContent(result);
+        }
+
+        /// <summary>
+        /// Returns the currently logged in member id, -1 if they are not logged in
+        /// </summary>
+        /// <returns></returns>
+        public int GetCurrentMemberId()
+        {
+            if (IsLoggedIn() == false)
+            {
+                return -1;
+            }
+            var result = GetCurrentMember();
+            return result == null ? -1 : result.Id;
         }
         
         #endregion
@@ -275,7 +322,7 @@ namespace Umbraco.Web.Security
             if (provider.IsUmbracoMembershipProvider())
             {                
                 var membershipUser = provider.GetCurrentUserOnline();
-                var member = GetCurrentMember();
+                var member = GetCurrentPersistedMember();
                 //this shouldn't happen but will if the member is deleted in the back office while the member is trying
                 // to use the front-end!
                 if (member == null)
@@ -422,7 +469,7 @@ namespace Umbraco.Web.Security
 
             if (provider.IsUmbracoMembershipProvider())
             {
-                var member = GetCurrentMember();
+                var member = GetCurrentPersistedMember();
                 //this shouldn't happen but will if the member is deleted in the back office while the member is trying
                 // to use the front-end!
                 if (member == null)
@@ -505,7 +552,7 @@ namespace Umbraco.Web.Security
                 string username;
                 if (provider.IsUmbracoMembershipProvider())
                 {
-                    var member = GetCurrentMember();
+                    var member = GetCurrentPersistedMember();
                     username = member.Username;
                     // If types defined, check member is of one of those types
                     var allowTypesList = allowTypes as IList<string> ?? allowTypes.ToList();
@@ -750,22 +797,37 @@ namespace Umbraco.Web.Security
 
             return Attempt<MembershipUser>.Fail(member);
         }
-
+        
         /// <summary>
         /// Returns the currently logged in IMember object - this should never be exposed to the front-end since it's returning a business logic entity!
         /// </summary>
         /// <returns></returns>
-        private IMember GetCurrentMember()
+        private IMember GetCurrentPersistedMember()
         {
-            var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
+            return _applicationContext.ApplicationCache.RequestCache.GetCacheItem<IMember>(
+                GetCacheKey("GetCurrentPersistedMember"), () =>
+                {
+                    var provider = MPE.GetMembersMembershipProvider();
 
-            if (provider.IsUmbracoMembershipProvider() == false)
+                    if (provider.IsUmbracoMembershipProvider() == false)
+                    {
+                        throw new NotSupportedException("An IMember model can only be retreived when using the built-in Umbraco membership providers");
+                    }
+                    var username = provider.GetCurrentUserName();
+                    var member = _applicationContext.Services.MemberService.GetByUsername(username);
+                    return member;
+                });
+        }
+
+        private string GetCacheKey(string key, params object[] additional)
+        {
+            var sb = new StringBuilder(string.Format("{0}-{1}", typeof (MembershipHelper).Name, key));
+            foreach (var s in additional)
             {
-                throw new NotSupportedException("An IMember model can only be retreived when using the built-in Umbraco membership providers");
+                sb.Append("-");
+                sb.Append(s);
             }
-            var username = provider.GetCurrentUserName();
-            var member = _applicationContext.Services.MemberService.GetByUsername(username);
-            return member;
+            return sb.ToString();
         }
 
     }

From a88637910f04d0072da93f364c197bd2ca7b7bb3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 10 Jul 2014 10:45:26 +1000
Subject: [PATCH 3/4] updates content xml bits so if it's called outside a web
 req it still executes.

Conflicts:
	src/Umbraco.Web/umbraco.presentation/content.cs
---
 .../umbraco.presentation/content.cs           | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs
index 78a5fe7023..6b3cd50a9f 100644
--- a/src/Umbraco.Web/umbraco.presentation/content.cs
+++ b/src/Umbraco.Web/umbraco.presentation/content.cs
@@ -309,11 +309,12 @@ namespace umbraco
                 XmlContentInternal = xmlDoc;
 
                 // It is correct to manually call PersistXmlToFile here event though the setter of XmlContentInternal
-                // queues this up, because this delegate is executing on a different thread and may complete
-                // after the request which invoked it (which would normally persist the file on completion)
-                // So we are responsible for ensuring the content is persisted in this case.
+                // queues this up, because it is possible that this method gets called outside of a web context and in that
+                // case the queue is not going to be executed by the UmbracoModule. So we'll process inline on this thread
+                // and clear the queue in case is this a web request, we don't want it reprocessing.
                         if (!UmbracoSettings.isXmlContentCacheDisabled && UmbracoSettings.continouslyUpdateXmlDiskCache)
                 {
+                    RemoveXmlFilePersistenceQueue();
                     PersistXmlToFile(xmlDoc);
                 }
             }
@@ -1189,7 +1190,7 @@ order by umbracoNode.level, umbracoNode.sortOrder";
         /// </summary>
         private void QueueXmlForPersistence()
         {
-            //if this is called outside a web request we cannot queue it.
+            //if this is called outside a web request we cannot queue it it will run in the current thread.
             
             if (HttpContext.Current != null)
             {
@@ -1206,7 +1207,20 @@ order by umbracoNode.level, umbracoNode.sortOrder";
                 {
                     HttpContext.Current.Application.UnLock();    
                 }
-            }           
+            }          
+            else
+            {
+                // Save copy of content
+                if (UmbracoSettings.CloneXmlCacheOnPublish)
+                {
+                    XmlDocument xmlContentCopy = CloneXmlDoc(_xmlContent);
+                    PersistXmlToFile(xmlContentCopy);
+                }
+                else
+                {
+                    PersistXmlToFile();
+                }
+            }    
         }
 
         internal DateTime GetCacheFileUpdateTime()

From b3c41e051fe49c948ca709da401b8efff4857899 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 10 Jul 2014 11:10:49 +1000
Subject: [PATCH 4/4] Fixes: U4-5199 Appending certain query strings to URLs
 cause InvalidOperationException (The UmbracoContext.Current is null)

---
 src/Umbraco.Core/UriExtensions.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs
index 430ba4b6d1..ff8419b796 100644
--- a/src/Umbraco.Core/UriExtensions.cs
+++ b/src/Umbraco.Core/UriExtensions.cs
@@ -134,7 +134,7 @@ namespace Umbraco.Core
         }
 
         /// <summary>
-        /// This is a performance tweak to check if this is a .css, .js or .ico, .jpg, .jpeg, .png, .gif file request since
+        /// This is a performance tweak to check if this not an ASP.Net server file
         /// .Net will pass these requests through to the module when in integrated mode.
         /// We want to ignore all of these requests immediately.
         /// </summary>
@@ -142,10 +142,10 @@ namespace Umbraco.Core
         /// <returns></returns>
         internal static bool IsClientSideRequest(this Uri url)
         {
-            // fixme - IsClientSideRequest should not use an hard-coded list of extensions
-            // a client-side request is anything that has an extension that is not .aspx?
-            var toIgnore = new[] { ".js", ".css", ".ico", ".png", ".jpg", ".jpeg", ".gif", ".html", ".svg" };
-            return toIgnore.Any(x => Path.GetExtension(url.LocalPath).InvariantEquals(x));
+            var ext = Path.GetExtension(url.LocalPath);
+            if (ext.IsNullOrWhiteSpace()) return false;
+            var toInclude = new[] { ".aspx", ".ashx", ".asmx", ".axd", ".svc" };
+            return toInclude.Any(ext.InvariantEquals) == false;
         }
 
         /// <summary>