Merge pull request #4 from PaulWieland/master

Two small fixes to enable reconnecting and prevent forked process from hanging at 100% cpu

ap2-receiver.py

@@ -333,7 +333,7 @@ def do_GET_PARAMETER(self):
                 else:
                     print("Ops GET_PARAMETER: %s" % p)
         if DISABLE_VM:
-            res = b"volume: 0"
+            res = b"volume: 0" + b"\r\n"
         else:
             res = b"\r\n".join(b"%s: %s" % (k, v) for k, v in params_res.items()) + b"\r\n"
         self.send_response(200)
@@ -342,6 +342,7 @@ def do_GET_PARAMETER(self):
         self.send_header("Server", self.version_string())
         self.send_header("CSeq", self.headers["CSeq"])
         self.end_headers()
+        hexdump(res);
         self.wfile.write(res)
 
     def do_SET_PARAMETER(self):
@@ -440,6 +441,12 @@ def do_TEARDOWN(self):
         self.send_header("Server", self.version_string())
         self.send_header("CSeq", self.headers["CSeq"])
         self.end_headers()
+
+        # Erase the hap() instance, otherwise reconnects fail
+        self.server.hap = None
+
+        # terminate the forked event_proc, otherwise a zombie process consumes 100% cpu
+        self.event_proc.terminate()
 
     def do_SETPEERS(self):
         print("SETPEERS %s" % self.path)
@@ -615,7 +622,7 @@ def handle_info(self):
                 print("Content-Type: %s | Not implemented" % self.headers["Content-Type"])
                 self.send_error(404)
         else:
-            res = writePlistToString(second_stage_info)
+            res = writePlistToString(sonos_one_info)
             self.send_response(200)
             self.send_header("Content-Length", len(res))
             self.send_header("Content-Type", HTTP_CT_BPLIST)