Merge remote-tracking branch 'origin/6.2.2' into 7.2.0

Conflicts:
	src/Umbraco.Core/Models/DeepCloneHelper.cs
This commit is contained in:
Shannon
2014-08-25 16:42:19 +10:00
2 changed files with 15 additions and 1 deletions

View File

@@ -51,6 +51,7 @@ namespace Umbraco.Web
{
// the keepalive service will use that url
ApplicationContext.Current.OriginalRequestUrl = string.Format("{0}:{1}{2}", httpContext.Request.ServerVariables["SERVER_NAME"], httpContext.Request.ServerVariables["SERVER_PORT"], IOHelper.ResolveUrl(SystemDirectories.Umbraco));
LogHelper.Info<UmbracoModule>("Setting OriginalRequestUrl: " + ApplicationContext.Current.OriginalRequestUrl);
}
// do not process if client-side request