diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-06-13 00:09:56 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-06-13 00:09:56 +0100 |
| commit | 616c7ef5507e3005d41441df03f3096ed4f8216a (patch) | |
| tree | ca1115da627fa591b3ed1aca2f6400935f6a8a5c | |
| parent | 6008554b60d04336b81601196c08a90875bdf088 (diff) | |
| parent | 1290bf766c700f939d9f63da1968b1e6357c75bf (diff) | |
| download | prosody-616c7ef5507e3005d41441df03f3096ed4f8216a.tar.gz prosody-616c7ef5507e3005d41441df03f3096ed4f8216a.zip | |
Merge 0.9->trunk
| -rw-r--r-- | core/certmanager.lua | 2 | ||||
| -rw-r--r-- | util/pubsub.lua | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua index 4b96e774..472e1665 100644 --- a/core/certmanager.lua +++ b/core/certmanager.lua @@ -64,7 +64,7 @@ function create_context(host, mode, user_ssl_config) 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; }; diff --git a/util/pubsub.lua b/util/pubsub.lua index 1ecbdfa8..e1418c62 100644 --- a/util/pubsub.lua +++ b/util/pubsub.lua @@ -233,6 +233,9 @@ function service:delete(node, actor) 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; |