# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1366218717 -7200
# Node ID ed10252ee9c393dafde46d59d8e3fbffc3159edf
# Parent  415e520e4a4c1771ef4d00f72a6ad8826f1756ad# Parent  f2631a14b953d07f8b0fe4ca31f8beceb5216872
Merge 0.9->trunk

diff -r 415e520e4a4c -r ed10252ee9c3 net/server_select.lua
--- a/net/server_select.lua	Wed Apr 17 14:20:02 2013 +0100
+++ b/net/server_select.lua	Wed Apr 17 19:11:57 2013 +0200
@@ -551,9 +551,6 @@
 						handler.readbuffer = _readbuffer	-- when handshake is done, replace the handshake function with regular functions
 						handler.sendbuffer = _sendbuffer
 						_ = status and status( handler, "ssl-handshake-complete" )
-						if self.autostart_ssl and listeners.onconnect then
-							listeners.onconnect(self);
-						end
 						_readlistlen = addsocket(_readlist, client, _readlistlen)
 						return true
 					else
diff -r 415e520e4a4c -r ed10252ee9c3 plugins/mod_pubsub.lua
--- a/plugins/mod_pubsub.lua	Wed Apr 17 14:20:02 2013 +0100
+++ b/plugins/mod_pubsub.lua	Wed Apr 17 19:11:57 2013 +0200
@@ -193,7 +193,9 @@
 	local id = (item and item.attr.id);
 	if not id then
 		id = uuid_generate();
-		item.attr.id = id;
+		if item then
+			item.attr.id = id;
+		end
 	end
 	local ok, ret = service:publish(node, stanza.attr.from, id, item);
 	local reply;