summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/SSLServer.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-09-01 11:27:58 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-09-01 11:27:58 -0500
commitbb664680720acd69261e9e1c2b505c3c02bbbd05 (patch)
tree66055f9ba7af3102fb22cd07bb7be8f637cd2d08 /src/lib/Bcfg2/Server/SSLServer.py
parent9279eee9c97a9366b04e738acac8c2dbd1215d5b (diff)
parent166201ecf2cd7c5837bdeb5ec4fcaef0132ed719 (diff)
downloadbcfg2-bb664680720acd69261e9e1c2b505c3c02bbbd05.tar.gz
bcfg2-bb664680720acd69261e9e1c2b505c3c02bbbd05.tar.bz2
bcfg2-bb664680720acd69261e9e1c2b505c3c02bbbd05.zip
Merge branch 'maint'
Diffstat (limited to 'src/lib/Bcfg2/Server/SSLServer.py')
-rw-r--r--src/lib/Bcfg2/Server/SSLServer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/SSLServer.py b/src/lib/Bcfg2/Server/SSLServer.py
index 215fd0e2b..80a819031 100644
--- a/src/lib/Bcfg2/Server/SSLServer.py
+++ b/src/lib/Bcfg2/Server/SSLServer.py
@@ -243,7 +243,7 @@ class XMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
L = []
while size_remaining:
chunk_size = min(size_remaining, max_chunk_size)
- chunk = self.rfile.read(chunk_size)
+ chunk = self.rfile.read(chunk_size).decode('utf-8')
if not chunk:
break
L.append(chunk)