From 8f2196c04794d7b4a3eac705b9756835dc4db82b Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Tue, 12 Jan 2016 08:52:43 -0700
Subject: [PATCH] tls: No arguments to directive and no block is an error

---
 caddy/setup/tls.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/caddy/setup/tls.go b/caddy/setup/tls.go
index 9e51bc151..5b6c086e9 100644
--- a/caddy/setup/tls.go
+++ b/caddy/setup/tls.go
@@ -34,7 +34,9 @@ func TLS(c *Controller) (middleware.Middleware, error) {
 		}
 
 		// Optional block with extra parameters
+		var hadBlock bool
 		for c.NextBlock() {
+			hadBlock = true
 			switch c.Val() {
 			case "protocols":
 				args := c.RemainingArgs()
@@ -71,6 +73,11 @@ func TLS(c *Controller) (middleware.Middleware, error) {
 				return nil, c.Errf("Unknown keyword '%s'", c.Val())
 			}
 		}
+
+		// tls requires at least one argument if a block is not opened
+		if len(args) == 0 && !hadBlock {
+			return nil, c.ArgErr()
+		}
 	}
 
 	SetDefaultTLSParams(c.Config)