plugins XEP-0047 and XEP-0065: timout bug fix

src/plugins/plugin_xep_0047.py

@@ -296,6 +296,9 @@ class XEP_0047():
             self.terminateStream(sid, "IQ_ERROR")
             return
         
+        if data['timer'].active():
+            data['timer'].cancel()
+        
         buffer = data["file_obj"].read(data["block_size"])
         if buffer:
             next_iq_elt = client.IQ(data["xmlstream"],'set')

src/plugins/plugin_xep_0065.py

@@ -668,6 +668,7 @@ class XEP_0065():
             self.sendNotAcceptableError(iq_elt['id'], iq_elt['from'], xmlstream)
             return
 
+        self.current_stream[sid]['timer'].cancel()
         self.current_stream[sid]["to"] = jid.JID(iq_elt["to"])
         self.current_stream[sid]["xmlstream"] = xmlstream