Merge pull request #76 from intersystems-community/fix-serverurl

fix server url

Author: nsolov

src/cls/ZPM/Package.cls

@@ -112,9 +112,15 @@ ClassMethod ServerURL() As %String
       Set host = host_":"_port
     }    
   }
-  #; If not behind the proxy where it have to be hidden redirect from / to /registry
-  if %request.GetCgiEnv("HTTP_X_FORWARDED_HOST")="" {
-    Set host = host _ $p(%request.Application, "/" ,1,*-1)
+  If (%request.GetCgiEnv("HTTP_X_ORIGINAL_URI")'="") {
+    Set path = $REPLACE(%request.URL, %request.Application,"",1,1)
+    Set urlpart = $EXTRACT(%request.GetCgiEnv("HTTP_X_ORIGINAL_URI"),1,$FIND(%request.GetCgiEnv("HTTP_X_ORIGINAL_URI"), path) - $Length(path)-1)
+    Set host = host _ $p(urlpart, "/" ,1,*-1)
+  } Else {
+    #; If not behind the proxy where it have to be hidden redirect from / to /registry
+    If %request.GetCgiEnv("HTTP_X_FORWARDED_HOST")="" {
+      Set host = host _ $p(%request.Application, "/" ,1,*-1)
+    }
   }
   Return host
 }