Merge 0.9->trunk

diff --git a/core/certmanager.lua b/core/certmanager.lua
index 4b96e774a8d3cec6ec276498c3f4e6b47b9b26c7..472e16654eea18ba900de2d9af2a4fc0303f84bb 100644 (file)
--- 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 1ecbdfa81df130b0177ee0fb9b273f82b3884bb8..e1418c62d51fdccf96b4f8605789ce0378e11a9e 100644 (file)
--- 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;