From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 23 Oct 2010 06:17:11 +0000 (+0200)
Subject: python: Fixed WSGI wrapper to handle empty responses.
X-Git-Tag: 0.4~14
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=699754de7dc11275d9d94eb521111609a6d73ed7

python: Fixed WSGI wrapper to handle empty responses.
---

diff --git a/python/ashd-wsgi b/python/ashd-wsgi
index d334765..dc3bc91 100755
--- a/python/ashd-wsgi
+++ b/python/ashd-wsgi
@@ -74,9 +74,7 @@ def dowsgi(req):
     resp = []
     respsent = []
 
-    def write(data):
-        if not data:
-            return
+    def flushreq():
         if not respsent:
             if not resp:
                 raise Exception, "Trying to write data before starting response."
@@ -86,6 +84,11 @@ def dowsgi(req):
             for nm, val in headers:
                 req.sk.write("%s: %s\n" % (nm, val))
             req.sk.write("\n")
+
+    def write(data):
+        if not data:
+            return
+        flushreq()
         req.sk.write(data)
         req.sk.flush()
 
@@ -106,7 +109,8 @@ def dowsgi(req):
     try:
         for data in respiter:
             write(data)
-        write("")
+        if resp:
+            flushreq()
     finally:
         if hasattr(respiter, "close"):
             respiter.close()
diff --git a/python/ashd/scgi.py b/python/ashd/scgi.py
index 9357e9d..a4342d0 100644
--- a/python/ashd/scgi.py
+++ b/python/ashd/scgi.py
@@ -74,9 +74,7 @@ def wrapwsgi(handler):
         resp = []
         respsent = []
 
-        def write(data):
-            if not data:
-                return
+        def flushreq():
             if not respsent:
                 if not resp:
                     raise Exception, "Trying to write data before starting response."
@@ -86,6 +84,11 @@ def wrapwsgi(handler):
                 for nm, val in headers:
                     sk.write("%s: %s\n" % (nm, val))
                 sk.write("\n")
+
+        def write(data):
+            if not data:
+                return
+            flushreq()
             sk.write(data)
             sk.flush()
 
@@ -106,7 +109,8 @@ def wrapwsgi(handler):
         try:
             for data in respiter:
                 write(data)
-            write("")
+            if resp:
+                flushresp()
         finally:
             if hasattr(respiter, "close"):
                 respiter.close()