Merge branch 'maint'

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/Plugins/NagiosGen.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/lib/Bcfg2/Server/SSLServer.py
	tools/README

1 files changed, 14 insertions, 18 deletions

diff --git a/src/lib/Bcfg2/Server/SSLServer.py b/src/lib/Bcfg2/Server/SSLServer.py
index 646124fcc..215fd0e2b 100644
--- a/src/lib/Bcfg2/Server/SSLServer.py
+++ b/src/lib/Bcfg2/Server/SSLServer.py
@@ -5,7 +5,6 @@ better. """
 import os
 import sys
 import socket
-import select
 import signal
 import logging
 import ssl
@@ -237,22 +236,23 @@ class XMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
             return False
         return True
 
-    ### need to override do_POST here
     def do_POST(self):
         try:
             max_chunk_size = 10 * 1024 * 1024
             size_remaining = int(self.headers["content-length"])
             L = []
             while size_remaining:
-                try:
-                    select.select([self.rfile.fileno()], [], [], 3)
-                except select.error:
-                    self.logger.error("Got select timeout")
-                    raise
                 chunk_size = min(size_remaining, max_chunk_size)
-                L.append(self.rfile.read(chunk_size).decode('utf-8'))
+                chunk = self.rfile.read(chunk_size)
+                if not chunk:
+                    break
+                L.append(chunk)
                 size_remaining -= len(L[-1])
             data = ''.join(L)
+            data = self.decode_request_content(data)
+            if data is None:
+                return  # response has been sent
+
             response = self.server._marshaled_dispatch(self.client_address,
                                                        data)
             if sys.hexversion >= 0x03000000:
@@ -265,6 +265,7 @@ class XMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
                               (self.client_address, sys.exc_info()[1]))
             try:
                 self.send_response(500)
+                self.send_header("Content-length", "0")
                 self.end_headers()
             except:
                 (etype, msg) = sys.exc_info()[:2]
@@ -321,14 +322,11 @@ class XMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
 
     def finish(self):
         # shut down the connection
-        if not self.wfile.closed:
-            try:
-                self.wfile.flush()
-                self.wfile.close()
-            except socket.error:
-                err = sys.exc_info()[1]
-                self.logger.warning("Error closing connection: %s" % err)
-        self.rfile.close()
+        try:
+            SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.finish(self)
+        except socket.error:
+            err = sys.exc_info()[1]
+            self.logger.warning("Error closing connection: %s" % err)
 
 
 class XMLRPCServer(SocketServer.ThreadingMixIn, SSLServer,
@@ -446,8 +444,6 @@ class XMLRPCServer(SocketServer.ThreadingMixIn, SSLServer,
                     self.handle_request()
                 except socket.timeout:
                     pass
-                except select.error:
-                    pass
                 except:
                     self.logger.error("Got unexpected error in handle_request",
                                       exc_info=1)