From 6de672f7cee4777ed602786633887ec6be758add Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Tue, 12 Mar 2013 11:49:27 +0100
Subject: [PATCH] Use server name instead of Socket.IO's IP address for
/socket/url to fix certificate errors with SSL.
---
.../java/de/thm/arsnova/controller/SocketController.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/SocketController.java b/src/main/java/de/thm/arsnova/controller/SocketController.java
index c3bb5883..6b3b1170 100644
--- a/src/main/java/de/thm/arsnova/controller/SocketController.java
+++ b/src/main/java/de/thm/arsnova/controller/SocketController.java
@@ -20,6 +20,7 @@ package de.thm.arsnova.controller;
import java.util.UUID;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
@@ -66,11 +67,11 @@ public class SocketController extends AbstractController {
@RequestMapping(value = "/url", method = RequestMethod.GET)
@ResponseBody
- public final String getSocketUrl() {
+ public final String getSocketUrl(final HttpServletRequest request) {
StringBuilder url = new StringBuilder();
url.append(server.isUseSSL() ? "https://" : "http://");
- url.append(server.getHostIp() + ":" + server.getPortNumber());
+ url.append(request.getServerName() + ":" + server.getPortNumber());
return url.toString();
}
--
GitLab