X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=python%2Fashd%2Fscgi.py;h=a06267f530a37b295489d91269f05262c6cfa70b;hb=55fa3f634594cedabf75182bd6404463c091ff63;hp=9357e9d1b317e829bacc7d77f12884b5a0e18e50;hpb=c06db49a3a4bfbf14b1661b667e1ed1cbab2bcd0;p=ashd.git

diff --git a/python/ashd/scgi.py b/python/ashd/scgi.py
index 9357e9d..a06267f 100644
--- a/python/ashd/scgi.py
+++ b/python/ashd/scgi.py
@@ -1,28 +1,32 @@
-import sys
+import sys, collections
 import threading
 
 class protoerr(Exception):
     pass
 
+class closed(IOError):
+    def __init__(self):
+        super(closed, self).__init__("The client has closed the connection.")
+
 def readns(sk):
     hln = 0
     while True:
         c = sk.read(1)
-        if c == ':':
+        if c == b':':
             break
-        elif c >= '0' or c <= '9':
-            hln = (hln * 10) + (ord(c) - ord('0'))
+        elif c >= b'0' or c <= b'9':
+            hln = (hln * 10) + (ord(c) - ord(b'0'))
         else:
-            raise protoerr, "Invalid netstring length byte: " + c
+            raise protoerr("Invalid netstring length byte: " + c)
     ret = sk.read(hln)
-    if sk.read(1) != ',':
-        raise protoerr, "Non-terminated netstring"
+    if sk.read(1) != b',':
+        raise protoerr("Non-terminated netstring")
     return ret
 
 def readhead(sk):
-    parts = readns(sk).split('\0')[:-1]
+    parts = readns(sk).split(b'\0')[:-1]
     if len(parts) % 2 != 0:
-        raise protoerr, "Malformed headers"
+        raise protoerr("Malformed headers")
     ret = {}
     i = 0
     while i < len(parts):
@@ -33,7 +37,7 @@ def readhead(sk):
 class reqthread(threading.Thread):
     def __init__(self, sk, handler):
         super(reqthread, self).__init__(name = "SCGI request handler")
-        self.sk = sk.dup().makefile("r+")
+        self.sk = sk.dup().makefile("rwb")
         self.handler = handler
 
     def run(self):
@@ -55,9 +59,17 @@ def servescgi(socket, handler):
         finally:
             nsk.close()
 
+def decodehead(head, coding):
+    return {k.decode(coding): v.decode(coding) for k, v in head.items()}
+
 def wrapwsgi(handler):
     def handle(head, sk):
-        env = dict(head)
+        try:
+            env = decodehead(head, "utf-8")
+            env["wsgi.uri_encoding"] = "utf-8"
+        except UnicodeError:
+            env = 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"]
@@ -74,39 +86,60 @@ def wrapwsgi(handler):
         resp = []
         respsent = []
 
-        def write(data):
-            if not data:
-                return
+        def recode(thing):
+            if isinstance(thing, collections.ByteString):
+                return thing
+            else:
+                return str(thing).encode("latin-1")
+
+        def flushreq():
             if not respsent:
                 if not resp:
-                    raise Exception, "Trying to write data before starting response."
+                    raise Exception("Trying to write data before starting response.")
                 status, headers = resp
                 respsent[:] = [True]
-                sk.write("Status: %s\n" % status)
+                buf = bytearray()
+                buf += b"Status: " + recode(status) + b"\n"
                 for nm, val in headers:
-                    sk.write("%s: %s\n" % (nm, val))
-                sk.write("\n")
-            sk.write(data)
-            sk.flush()
+                    buf += recode(nm) + b": " + recode(val) + b"\n"
+                buf += b"\n"
+                try:
+                    sk.write(buf)
+                except IOError:
+                    raise closed()
+
+        def write(data):
+            if not data:
+                return
+            flushreq()
+            try:
+                sk.write(data)
+                sk.flush()
+            except IOError:
+                raise closed()
 
         def startreq(status, headers, exc_info = None):
             if resp:
                 if exc_info:                # Interesting, this...
                     try:
                         if respsent:
-                            raise exc_info[0], exc_info[1], exc_info[2]
+                            raise exc_info[1]
                     finally:
                         exc_info = None     # CPython GC bug?
                 else:
-                    raise Exception, "Can only start responding once."
+                    raise Exception("Can only start responding once.")
             resp[:] = status, headers
             return write
 
         respiter = handler(env, startreq)
         try:
-            for data in respiter:
-                write(data)
-            write("")
+            try:
+                for data in respiter:
+                    write(data)
+                if resp:
+                    flushreq()
+            except closed:
+                pass
         finally:
             if hasattr(respiter, "close"):
                 respiter.close()