Software / code / prosody
Changeset
5677:9afc94c4346e
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 13 Jun 2013 00:09:56 +0100 |
| parents | 5674:ebdbf4cf0b2f (current diff) 5676:c1021a2e7071 (diff) |
| children | 5679:51f7de1b6bb5 |
| files | core/certmanager.lua |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/core/certmanager.lua Tue Jun 11 21:50:41 2013 +0100 +++ b/core/certmanager.lua Thu Jun 13 00:09:56 2013 +0100 @@ -64,7 +64,7 @@ verifyext = user_ssl_config.verifyext or default_verifyext; options = user_ssl_config.options or default_options; depth = user_ssl_config.depth; - curve = user_ssl_config.curve; + curve = user_ssl_config.curve or "secp384r1"; dhparam = user_ssl_config.dhparam; };
--- a/util/pubsub.lua Tue Jun 11 21:50:41 2013 +0100 +++ b/util/pubsub.lua Thu Jun 13 00:09:56 2013 +0100 @@ -233,6 +233,9 @@ end -- local node_obj = self.nodes[node]; + if not node_obj then + return false, "item-not-found"; + end self.nodes[node] = nil; self.config.broadcaster("delete", node, node_obj.subscribers); return true;
