Merge pull request playframework#1226 from sbeigel/secure-websocket-fix

playframework#1237 Use secure websocket protocol for secure pages
garpu-ku · May 25, 2018 · 7ac0146 · 7ac0146
2 parents 9308a98 + a3a010c
commit 7ac0146
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/framework/src/play/mvc/Router.java b/framework/src/play/mvc/Router.java
@@ -432,7 +432,7 @@ public static String getFullUrl(String action, Map<String, Object> args) {
         ActionDefinition actionDefinition = reverse(action, args);
         String base = getBaseUrl();
         if (actionDefinition.method.equals("WS")) {
-            return base.replaceFirst("https?", "ws") + actionDefinition;
+            return base.replaceFirst("http:", "ws:").replaceFirst("https:", "wss:") + actionDefinition;
         }
         return base + actionDefinition;
     }
@@ -790,7 +790,7 @@ public void absolute() {
                     url = (isSecure ? "https://" : "http://") + hostPart + url;
                 }
                 if (method.equals("WS")) {
-                    url = url.replaceFirst("https?", "ws");
+                    url = isSecure ? url.replaceFirst("https:", "wss:") : url.replaceFirst("http:", "ws:");
                 }
             }
         }