# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1279873347 -3600
# Node ID 502a634f0578b1aebcde78391f51f6095aa4078a
# Parent  abc4a52aef02d5ddcd9a3736fe8dec5ec1ea44c9# Parent  3976bad56640fbbe6b1b38a96487c5eae1642231
Merge 0.7->trunk

diff -r abc4a52aef02 -r 502a634f0578 core/certmanager.lua
--- a/core/certmanager.lua	Thu Jul 22 13:19:37 2010 +0100
+++ b/core/certmanager.lua	Fri Jul 23 09:22:27 2010 +0100
@@ -25,7 +25,8 @@
 function create_context(host, mode, config)
 	local user_ssl_config = config and config.core.ssl or default_ssl_config;
 
-	if not(ssl and user_ssl_config) then return nil; end
+	if not ssl then return nil, "LuaSec (required for encryption) was not found"; end
+	if not user_ssl_config then return nil, "No SSL/TLS configuration present for "..host; end
 	
 	local ssl_config = {
 		mode = mode;
@@ -67,7 +68,6 @@
 		else
 			log("error", "SSL/TLS: Error initialising for host %s: %s", host, err );
 		end
-		ssl = false
         end
         return ctx, err;
 end