Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 21:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #327)Fix baseURL and host in Context

Browse Source
This commit is contained in:
takezoe
2014-04-18 07:53:09 +09:00
parent 644701d995
commit d558476cd2
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/app/ControllerBase.scala
View File

@@ -140,11 +140,9 @@ abstract class ControllerBase extends ScalatraFilter
case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){ case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
lazy val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath) lazy val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath)
lazy val currentPath = request.getRequestURI.substring(request.getContextPath.length) lazy val currentPath = request.getRequestURI.substring(request.getContextPath.length)
lazy val baseURL = settings.baseUrl.getOrElse(request.getRequestURL.substring(0, request.getRequestURL.length - request.getRequestURI.length))
lazy val baseURL = request.getRequestURL.substring(0, request.getRequestURL.length - request.getRequestURI.length) + path lazy val host = new java.net.URL(baseURL).getHost
lazy val host = request.getServerName
/** /**
* Get object from cache. * Get object from cache.