diff --git a/source/org/otherone/vhostproxy/vertx/config.ceylon b/source/org/otherone/vhostproxy/vertx/config.ceylon index ccc72f9..10fe4ba 100644 --- a/source/org/otherone/vhostproxy/vertx/config.ceylon +++ b/source/org/otherone/vhostproxy/vertx/config.ceylon @@ -1,3 +1,9 @@ +import ceylon.buffer.base { + base64StringStandard +} +import ceylon.buffer.charset { + iso_8859_1 +} import ceylon.collection { HashMap, HashSet @@ -6,12 +12,6 @@ import ceylon.file { parsePath, File } -import ceylon.io.base64 { - decode -} -import ceylon.io.buffer { - newByteBufferWithData -} import io.netty.handler.codec.http { HttpHeaders { @@ -85,7 +85,7 @@ Null reject(HttpServerRequest sreq, Integer status, String statusMsg) { } String decodeBase64(String s) { - return String(decode(newByteBufferWithData(*(s.map((ch) => ch.integer.byte)))).map((Byte b) => b.unsigned.character)); + return iso_8859_1.decode(base64StringStandard.decode(s)); } String extractHosname(String hostHeader) { diff --git a/source/org/otherone/vhostproxy/vertx/module.ceylon b/source/org/otherone/vhostproxy/vertx/module.ceylon index 13ab032..69ae903 100644 --- a/source/org/otherone/vhostproxy/vertx/module.ceylon +++ b/source/org/otherone/vhostproxy/vertx/module.ceylon @@ -1,9 +1,12 @@ native("jvm") module org.otherone.vhostproxy.vertx "4" { - shared import io.vertx.ceylon.core "3.2.0"; - import ceylon.regex "1.2.0"; - import ceylon.logging "1.2.0"; - //import ceylon.time "1.2.0"; + shared import io.vertx.ceylon.core "3.3.2"; + //shared import "io.vertx:vertx-lang-ceylon" "3.3.0-SNAPSHOT"; + //shared import "io.vertx.lang.ceylon" "3.3.0-SNAPSHOT"; + import ceylon.regex "1.2.2"; + import ceylon.logging "1.2.2"; + //import ceylon.time "1.2.1"; import java.base "7"; - import ceylon.file "1.2.0"; - import ceylon.io "1.2.0"; + //import "it.zero11:acme-client" "0.1.2"; + import ceylon.file "1.2.2"; + import ceylon.buffer "1.2.2"; }