X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=python3%2Fscgi-wsgi3;h=1f5495dda630de1bfc97d18dd50e3dd4d1b32447;hb=c9aa6b2889e6de7f82e5f44ab5bbcd0ef90099bd;hp=4242d10fbadb46a241ebd2102ca7059837975ef4;hpb=78c8462c86c6043c7326bee7ebdf754e01d641c9;p=ashd.git

diff --git a/python3/scgi-wsgi3 b/python3/scgi-wsgi3
index 4242d10..1f5495d 100755
--- a/python3/scgi-wsgi3
+++ b/python3/scgi-wsgi3
@@ -1,16 +1,20 @@
 #!/usr/bin/python3
 
-import sys, os, getopt, logging
+import sys, os, getopt, logging, collections
 import socket
-import ashd.scgi
+import ashd.scgi, ashd.perf, ashd.serve
+try:
+    import pdm.srv
+except:
+    pdm = None
 
 def usage(out):
-    out.write("usage: scgi-wsgi3 [-hAL] [-p MODPATH] [-T [HOST:]PORT] HANDLER-MODULE [ARGS...]\n")
+    out.write("usage: scgi-wsgi3 [-hAL] [-m PDM-SPEC] [-p MODPATH] [-T [HOST:]PORT] HANDLER-MODULE [ARGS...]\n")
 
 sk = None
 modwsgi_compat = False
 setlog = True
-opts, args = getopt.getopt(sys.argv[1:], "+hALp:T:")
+opts, args = getopt.getopt(sys.argv[1:], "+hALp:T:m:")
 for o, a in opts:
     if o == "-h":
         usage(sys.stdout)
@@ -33,11 +37,14 @@ for o, a in opts:
         sk.listen(32)
     elif o == "-A":
         modwsgi_compat = True
+    elif o == "-m":
+        if pdm is not None:
+            pdm.srv.listen(a)
 if len(args) < 1:
     usage(sys.stderr)
     sys.exit(1)
 if setlog:
-    logging.basicConfig(format="ashd-wsgi(%(name)s): %(levelname)s: %(message)s")
+    logging.basicConfig(format="scgi-wsgi3(%(name)s): %(levelname)s: %(message)s")
 
 if sk is None:
     # This is suboptimal, since the socket on stdin is not necessarily
@@ -61,4 +68,73 @@ else:
         sys.exit(1)
     handler = handlermod.application
 
-ashd.scgi.servescgi(sk, ashd.scgi.wrapwsgi(handler))
+def mkenv(head, sk):
+    try:
+        env = ashd.scgi.decodehead(head, "utf-8")
+        env["wsgi.uri_encoding"] = "utf-8"
+    except UnicodeError:
+        env = ashd.scgi.decodehead(head, "latin-1")
+        env["wsgi.uri_encoding"] = "latin-1"
+    env["wsgi.version"] = 1, 0
+    if "HTTP_X_ASH_PROTOCOL" in env:
+        env["wsgi.url_scheme"] = env["HTTP_X_ASH_PROTOCOL"]
+    elif "HTTPS" in env:
+        env["wsgi.url_scheme"] = "https"
+    else:
+        env["wsgi.url_scheme"] = "http"
+    env["wsgi.input"] = sk
+    env["wsgi.errors"] = sys.stderr
+    env["wsgi.multithread"] = True
+    env["wsgi.multiprocess"] = False
+    env["wsgi.run_once"] = False
+    return env
+
+def recode(thing):
+    if isinstance(thing, collections.ByteString):
+        return thing
+    else:
+        return str(thing).encode("latin-1")
+
+reqhandler = ashd.serve.freethread()
+
+class request(ashd.serve.wsgirequest):
+    def __init__(self, *, sk, **kw):
+        super().__init__(**kw)
+        self.sk = sk.dup()
+
+    def mkenv(self):
+        fsk = self.sk.dup().makefile("rwb")
+        try:
+            return mkenv(ashd.scgi.readhead(fsk), fsk)
+        finally:
+            fsk.close()
+
+    def handlewsgi(self, env, startreq):
+        return handler(env, startreq)
+
+    def fileno(self):
+        return self.sk.fileno()
+
+    def writehead(self, status, headers):
+        w = self.buffer.extend
+        w(b"Status: " + recode(status) + b"\n")
+        for nm, val in headers:
+            w(recode(nm) + b": " + recode(val) + b"\n")
+        w(b"\n")
+
+    def flush(self):
+        try:
+            ret = self.sk.send(self.buffer, socket.MSG_DONTWAIT)
+            self.buffer[:ret] = b""
+        except IOError:
+            raise ashd.serve.closed()
+
+    def close(self):
+        self.sk.close()
+
+while True:
+    nsk, addr = sk.accept()
+    try:
+        reqhandler.handle(request(sk=nsk, handler=reqhandler))
+    finally:
+        nsk.close()