Software / code / prosody
Changeset
5483:ed10252ee9c3
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 17 Apr 2013 19:11:57 +0200 |
| parents | 5480:415e520e4a4c (current diff) 5482:f2631a14b953 (diff) |
| children | 5489:421c7830eccc |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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;
