Skip to content
Snippets Groups Projects
Commit 6de672f7 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Use server name instead of Socket.IO's IP address for /socket/url to fix

certificate errors with SSL.
parent f20e9fc6
Branches
Tags
No related merge requests found
......@@ -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();
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment