From: Forrest Voight <forrest@forre.st>
Date: Sun, 30 Sep 2012 20:13:27 +0000 (-0400)
Subject: fixed DeferredResource using an attribute on twisted.web.http.Request not present... 
X-Git-Tag: 8.0~21
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=f3d2330783ef76d89870256c02a187a26752135e;hp=10d85be481a144a5a2d7a3adf1a755b3a2dd941c;p=p2pool.git

fixed DeferredResource using an attribute on twisted.web.http.Request not present in older versions of Twisted
---

diff --git a/p2pool/util/deferred_resource.py b/p2pool/util/deferred_resource.py
index c5c45ec..a5537b8 100644
--- a/p2pool/util/deferred_resource.py
+++ b/p2pool/util/deferred_resource.py
@@ -7,14 +7,14 @@ from twisted.python import log
 class DeferredResource(resource.Resource):
     def render(self, request):
         def finish(x):
-            if request._disconnected:
+            if request.channel is None: # disconnected
                 return
             if x is not None:
                 request.write(x)
             request.finish()
         
         def finish_error(fail):
-            if request._disconnected:
+            if request.channel is None: # disconnected
                 return
             request.setResponseCode(500) # won't do anything if already written to
             request.write('---ERROR---')