From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 12 Apr 2011 07:26:19 +0000 (+0200)
Subject: python: Handle client-abortion properly when writing the response iterator as well.
X-Git-Tag: 0.8~22
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=8bb0e3c1a8831f79c263850d87c06195d85b9a0f

python: Handle client-abortion properly when writing the response iterator as well.
---

diff --git a/python/ashd-wsgi b/python/ashd-wsgi
index bfc4b42..79aad4f 100755
--- a/python/ashd-wsgi
+++ b/python/ashd-wsgi
@@ -126,16 +126,19 @@ def dowsgi(req):
                 raise Exception, "Trying to write data before starting response."
             status, headers = resp
             respsent[:] = [True]
-            req.sk.write("HTTP/1.1 %s\n" % status)
-            for nm, val in headers:
-                req.sk.write("%s: %s\n" % (nm, val))
-            req.sk.write("\n")
+            try:
+                req.sk.write("HTTP/1.1 %s\n" % status)
+                for nm, val in headers:
+                    req.sk.write("%s: %s\n" % (nm, val))
+                req.sk.write("\n")
+            except IOError:
+                raise closed()
 
     def write(data):
         if not data:
             return
+        flushreq()
         try:
-            flushreq()
             req.sk.write(data)
             req.sk.flush()
         except IOError:
@@ -156,10 +159,13 @@ def dowsgi(req):
 
     respiter = handler(env, startreq)
     try:
-        for data in respiter:
-            write(data)
-        if resp:
-            flushreq()
+        try:
+            for data in respiter:
+                write(data)
+            if resp:
+                flushreq()
+        except closed:
+            pass
     finally:
         if hasattr(respiter, "close"):
             respiter.close()
diff --git a/python/ashd/scgi.py b/python/ashd/scgi.py
index 4583fa7..95325f2 100644
--- a/python/ashd/scgi.py
+++ b/python/ashd/scgi.py
@@ -84,16 +84,19 @@ def wrapwsgi(handler):
                     raise Exception, "Trying to write data before starting response."
                 status, headers = resp
                 respsent[:] = [True]
-                sk.write("Status: %s\n" % status)
-                for nm, val in headers:
-                    sk.write("%s: %s\n" % (nm, val))
-                sk.write("\n")
+                try:
+                    sk.write("Status: %s\n" % status)
+                    for nm, val in headers:
+                        sk.write("%s: %s\n" % (nm, val))
+                    sk.write("\n")
+                except IOError:
+                    raise closed()
 
         def write(data):
             if not data:
                 return
+            flushreq()
             try:
-                flushreq()
                 sk.write(data)
                 sk.flush()
             except IOError:
@@ -114,10 +117,13 @@ def wrapwsgi(handler):
 
         respiter = handler(env, startreq)
         try:
-            for data in respiter:
-                write(data)
-            if resp:
-                flushreq()
+            try:
+                for data in respiter:
+                    write(data)
+                if resp:
+                    flushreq()
+            except closed:
+                pass
         finally:
             if hasattr(respiter, "close"):
                 respiter.close()