Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added commend for [#344]

  • Loading branch information...
commit 3b8862024dfd439d467776eeb1ab9dae9df91028 1 parent 08f63f5
@pepite pepite authored
View
4 framework/src/play/mvc/Router.java
@@ -395,8 +395,10 @@ public static ActionDefinition reverse(String action, Map<String, Object> args)
inPathArgs.add(arg.name);
Object value = args.get(arg.name);
if (value == null) {
+ // This is a hack for reverting on hostname that are a regex expression.
+ // See [#344] for more into. This is not optimal and should retough. However,
+ // it allows us to do things like {(.*}}.domain.com
String host = route.host.replaceAll("\\{", "").replaceAll("\\}", "");
- Logger.trace("arg.name " + arg.name + " host " + host);
if (host.equals(arg.name) || host.matches(arg.name)) {
args.remove(arg.name);
route.host = Http.Request.current().domain;
View
2  framework/src/play/server/ssl/SslHttpServerContextFactory.java
@@ -55,8 +55,10 @@
// Set up key manager factory to use our key store
KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
+ kmf.init(ks, certificatePassword);
TrustManagerFactory tmf = TrustManagerFactory.getInstance(algorithm);
+
tmf.init(ks);
// Initialize the SSLContext to work with our key managers.
Please sign in to comment.
Something went wrong with that request. Please try again.