summaryrefslogtreecommitdiffstats
path: root/src/lib/SSLServer.py
diff options
context:
space:
mode:
authorspartanem <em@msu.edu>2010-03-13 14:23:40 -0500
committerspartanem <em@msu.edu>2010-03-13 14:23:40 -0500
commit7f55cfcd4c503b6b7dc77f7730fffd8c81cb83ef (patch)
tree4c298d53debaa15f41e6ed1688acc94991b2093a /src/lib/SSLServer.py
parent55de1ebdf9bbac6dd03cdb7765ffa5e408a27d16 (diff)
parent41858f6c26343684a827e4bf2ddae3d0dd58a1eb (diff)
downloadbcfg2-7f55cfcd4c503b6b7dc77f7730fffd8c81cb83ef.tar.gz
bcfg2-7f55cfcd4c503b6b7dc77f7730fffd8c81cb83ef.tar.bz2
bcfg2-7f55cfcd4c503b6b7dc77f7730fffd8c81cb83ef.zip
Merge branch 'master' of github.com:solj/bcfg2
Diffstat (limited to 'src/lib/SSLServer.py')
-rw-r--r--src/lib/SSLServer.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/SSLServer.py b/src/lib/SSLServer.py
index c3ecbdea5..fac332f14 100644
--- a/src/lib/SSLServer.py
+++ b/src/lib/SSLServer.py
@@ -203,6 +203,11 @@ class XMLRPCRequestHandler (SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
size_remaining = int(self.headers["content-length"])
L = []
while size_remaining:
+ try:
+ select.select([self.rfile.fileno()], [], [], 3)
+ except select.error:
+ print "got select timeout"
+ raise
chunk_size = min(size_remaining, max_chunk_size)
L.append(self.rfile.read(chunk_size))
size_remaining -= len(L[-1])