diff options
| author | Kim Alvefur <zash@zash.se> | 2013-04-17 19:11:57 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-04-17 19:11:57 +0200 |
| commit | 3b6ed12bb6225d37e234c6c994b2114f1e5e0b84 (patch) | |
| tree | bbb6068989d701249c75d0626778b76d2343ef54 | |
| parent | d138cfd437d5f9df479bf12adebefc9431953de9 (diff) | |
| parent | 998b0c1b8b39f8033fdfe1439afb533455ba15d5 (diff) | |
| download | prosody-3b6ed12bb6225d37e234c6c994b2114f1e5e0b84.tar.gz prosody-3b6ed12bb6225d37e234c6c994b2114f1e5e0b84.zip | |
Merge 0.9->trunk
| -rw-r--r-- | net/server_select.lua | 3 | ||||
| -rw-r--r-- | plugins/mod_pubsub.lua | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/server_select.lua b/net/server_select.lua index 8ce9eed2..f123f4b7 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -551,9 +551,6 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport 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 --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua index 4d3911bb..22969ab5 100644 --- a/plugins/mod_pubsub.lua +++ b/plugins/mod_pubsub.lua @@ -193,7 +193,9 @@ function handlers.set_publish(origin, stanza, publish) 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; |