yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 7.2.7 into dev-v7

Browse Source 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.MacroEngines/packages.config
	src/umbraco.cms/packages.config
	src/umbraco.cms/umbraco.cms.csproj
	src/umbraco.controls/umbraco.controls.csproj
	src/umbraco.editorControls/umbraco.editorControls.csproj
This commit is contained in:
Stephan
2015-07-14 19:57:56 +02:00
parent effa632fab 3062eedb4f
commit db0cfad6b9
22 changed files with 78 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/UmbracoModule.cs
View File

@@ -51,9 +51,8 @@ namespace Umbraco.Web
// use ports from request
// otherwise,
// if non-standard ports used,
// user may need to set baseUrl manually per
// user may need to set umbracoApplicationUrl manually per
// http://our.umbraco.org/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks
// TODO update the doc, prefer web.routing/@appUrl to scheduledTasks/@baseUrl
var port = (request.IsSecureConnection == false && GlobalSettings.UseSSL == false)
|| (request.IsSecureConnection && GlobalSettings.UseSSL)
? ":" + request.ServerVariables["SERVER_PORT"]