summaryrefslogtreecommitdiff
path: root/cask/src/cask/model/Response.scala
diff options
context:
space:
mode:
Diffstat (limited to 'cask/src/cask/model/Response.scala')
-rw-r--r--cask/src/cask/model/Response.scala9
1 files changed, 4 insertions, 5 deletions
diff --git a/cask/src/cask/model/Response.scala b/cask/src/cask/model/Response.scala
index e9ca672..07e8ecf 100644
--- a/cask/src/cask/model/Response.scala
+++ b/cask/src/cask/model/Response.scala
@@ -75,7 +75,7 @@ object Abort{
def apply(code: Int) = Response("", code, Nil, Nil)
}
object StaticFile{
- def apply(path: String) = {
+ def apply(path: String, headers: Seq[(String, String)]) = {
val relPath = java.nio.file.Paths.get(path)
val (data0, statusCode0) =
if (java.nio.file.Files.exists(relPath) && java.nio.file.Files.isRegularFile(relPath)){
@@ -83,17 +83,16 @@ object StaticFile{
}else{
("": Response.Data, 404)
}
- Response(data0, statusCode0, Nil, Nil)
+ Response(data0, statusCode0, headers, Nil)
}
}
object StaticResource{
- def apply(path: String, resourceRoot: ClassLoader) = {
- val relPath = java.nio.file.Paths.get(path)
+ def apply(path: String, resourceRoot: ClassLoader, headers: Seq[(String, String)]) = {
val (data0, statusCode0) = resourceRoot.getResourceAsStream(path) match{
case null => ("": Response.Data, 404)
case res => (res: Response.Data, 200)
}
- Response(data0, statusCode0, Nil, Nil)
+ Response(data0, statusCode0, headers, Nil)
}
}