Added event-driven server.

[jagi.git] / src / jagi / scgi / Jagi.java

diff --git a/src/jagi/scgi/Jagi.java b/src/jagi/scgi/Jagi.java
index 758afdc..7337f97 100644 (file)
--- a/src/jagi/scgi/Jagi.java
+++ b/src/jagi/scgi/Jagi.java
@@ -13,8 +13,7 @@ public class Jagi {
            into.put(coding.newDecoder().decode(h.getKey()).toString(), coding.decode(h.getValue()).toString());
     }
 
-    public static Map<Object, Object> mkenv(ReadableByteChannel sk) throws IOException {
-       Map<ByteBuffer, ByteBuffer> rawhead = Scgi.readhead(sk);
+    public static Map<Object, Object> mkenv(Map<ByteBuffer, ByteBuffer> rawhead, ReadableByteChannel input) throws IOException {
        Map<Object, Object> env;
        try {
            env = new HashMap<>();
@@ -33,7 +32,7 @@ public class Jagi {
            env.put("jagi.url_scheme", "https");
        else
            env.put("jagi.url_scheme", "http");
-       env.put("jagi.input", sk);
+       env.put("jagi.input", input);
        env.put("jagi.errors", System.err);
        env.put("jagi.multithread", true);
        env.put("jagi.multiprocess", false);
@@ -41,4 +40,8 @@ public class Jagi {
        env.put("jagi.cleanup", new HashSet<>());
        return(env);
     }
+
+    public static Map<Object, Object> mkenv(ReadableByteChannel sk) throws IOException {
+       return(mkenv(Scgi.readhead(sk), sk));
+    }
 }