# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1392849924 -3600
# Node ID b5771e83a0ee2542aaecfd7fda9e91d939616410
# Parent  69d12c3fe9917e21a63f432bb6c8a7bc9569f939# Parent  f8c17af769d90b0f16feb552e060ce4876bdca9f
Merge 0.10->trunk

diff -r 69d12c3fe991 -r b5771e83a0ee plugins/mod_proxy65.lua
--- a/plugins/mod_proxy65.lua	Wed Feb 19 20:10:23 2014 +0100
+++ b/plugins/mod_proxy65.lua	Wed Feb 19 23:45:24 2014 +0100
@@ -101,27 +101,10 @@
 		module:log("warn", "proxy65_port is deprecated, please put proxy65_ports = { %d } into the global section instead", legacy_config);
 	end
 
+	module:depends("disco");
 	module:add_identity("proxy", "bytestreams", name);
 	module:add_feature("http://jabber.org/protocol/bytestreams");
 
-	module:hook("iq-get/host/http://jabber.org/protocol/disco#info:query", function(event)
-		local origin, stanza = event.origin, event.stanza;
-		if not stanza.tags[1].attr.node then
-			origin.send(st.reply(stanza):query("http://jabber.org/protocol/disco#info")
-				:tag("identity", {category='proxy', type='bytestreams', name=name}):up()
-				:tag("feature", {var="http://jabber.org/protocol/bytestreams"}) );
-			return true;
-		end
-	end, -1);
-
-	module:hook("iq-get/host/http://jabber.org/protocol/disco#items:query", function(event)
-		local origin, stanza = event.origin, event.stanza;
-		if not stanza.tags[1].attr.node then
-			origin.send(st.reply(stanza):query("http://jabber.org/protocol/disco#items"));
-			return true;
-		end
-	end, -1);
-
 	module:hook("iq-get/host/http://jabber.org/protocol/bytestreams:query", function(event)
 		local origin, stanza = event.origin, event.stanza;