fix relative sessionURL resolution problems

Author: Koen Deforche

src/web/WebRenderer.C

@@ -34,6 +34,12 @@
 //#define DEBUG_JS
 //#define DEBUG_RENDER
 
+namespace {
+  bool isAbsoluteUrl(const std::string& url) {
+    return url.find("://") != std::string::npos;
+  }
+}
+
 namespace skeletons {
   extern const char *Boot_html1;
   extern const char *Plain_html1;
@@ -466,6 +472,17 @@ void WebRenderer::renderSetServerPush(std::ostream& out)
   }
 }
 
+std::string WebRenderer::sessionUrl() const
+{
+  std::string result = session_.applicationUrl();
+  if (isAbsoluteUrl(result))
+    return result;
+  else {
+    // Wt.js will prepand the correct deployment path
+    return session_.appendSessionQuery(".").substr(1);
+  }
+}
+
 void WebRenderer::serveJavaScriptUpdate(WebResponse& response)
 {
   setCaching(response, false);
@@ -474,8 +491,7 @@ void WebRenderer::serveJavaScriptUpdate(WebResponse& response)
   if (session_.sessionIdChanged_) {
     collectedJS1_ << session_.app()->javaScriptClass()
 		  << "._p_.setSessionUrl("
-		  << WWebWidget::jsStringLiteral
-      (session_.bootstrapUrl(response, WebSession::ClearInternalPath))
+		  << WWebWidget::jsStringLiteral(sessionUrl())
 		  << ");";
     session_.sessionIdChanged_ = false;
   }
@@ -710,9 +726,7 @@ void WebRenderer::serveMainscript(WebResponse& response)
     script.setCondition("WEB_SOCKETS", conf.webSockets());
     script.setVar("INNER_HTML", innerHtml);
     script.setVar("ACK_UPDATE_ID", expectedAckId_);
-    script.setVar("RELATIVE_URL", WWebWidget::jsStringLiteral
-		  (session_.bootstrapUrl(response,
-					 WebSession::ClearInternalPath)));
+    script.setVar("SESSION_URL", WWebWidget::jsStringLiteral(sessionUrl()));
     script.setVar("DEPLOY_PATH", WWebWidget::jsStringLiteral
 		  (session_.deploymentPath()));
     script.setVar("PATH_INFO", WWebWidget::jsStringLiteral

src/web/WebRenderer.h

@@ -133,6 +133,7 @@ class WT_API WebRenderer : public Wt::SlotLearnerInterface
 
   std::string headDeclarations() const;
   std::string bodyClassRtl() const;
+  std::string sessionUrl() const;
 
   typedef std::set<WWidget *> UpdateMap;
   UpdateMap updateMap_;

src/web/skeleton/Wt.js

@@ -2132,7 +2132,7 @@ function encodePendingEvents() {
   return { feedback: feedback, result: result };
 }
 
-var sessionUrl = _$_RELATIVE_URL_$_,
+var sessionUrl,
   quited = false,
   norestart = false,
   loaded = false,
@@ -2323,13 +2323,20 @@ _$_$endif_$_();
   }
 };
 
-var comm = WT.initAjaxComm(sessionUrl, handleResponse);
-
 function setSessionUrl(url) {
-  sessionUrl = url;
-  comm.setUrl(url);
+  if (url.indexOf("://") != -1 || url[0] == '/')
+    sessionUrl = url;
+  else
+    sessionUrl = WT.deployUrl + url;
+
+  if (comm)
+    comm.setUrl(url);
 }
 
+setSessionUrl(_$_SESSION_URL_$_);
+
+var comm = WT.initAjaxComm(sessionUrl, handleResponse);
+
 function doPollTimeout() {
   responsePending.abort();
   responsePending = null;