# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1527211993 -7200
# Node ID 2a0d7fa4c56adbff084c8f8d426367bd293f51b8
# Parent  d614003a82c1ea9390fc8e841b0c009582a4e96a# Parent  1a29b56a2d63ff1e4e473ea2537a9c26b4d0df50
Merge 0.10->trunk

diff -r d614003a82c1 -r 2a0d7fa4c56a core/certmanager.lua
--- a/core/certmanager.lua	Wed May 23 18:15:36 2018 +0200
+++ b/core/certmanager.lua	Fri May 25 03:33:13 2018 +0200
@@ -158,7 +158,7 @@
 local function create_context(host, mode, ...)
 	local cfg = new_config();
 	cfg:apply(core_defaults);
-	local service_name, port = host:match("^(%w+) port (%d+)$");
+	local service_name, port = host:match("^(%S+) port (%d+)$");
 	if service_name then
 		cfg:apply(find_service_cert(service_name, tonumber(port)));
 	else