From 63ccc626f9c292f5cea395645fea3376da58866b Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Wed, 6 May 2015 08:58:15 -0600
Subject: [PATCH] Fix parsing bug for one-line Caddyfiles

---
 config/parse/parsing.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/parse/parsing.go b/config/parse/parsing.go
index 430751107..8eb2c12c6 100644
--- a/config/parse/parsing.go
+++ b/config/parse/parsing.go
@@ -51,6 +51,12 @@ func (p *parser) begin() error {
 		return err
 	}
 
+	if p.eof {
+		// this happens if the Caddyfile consists of only
+		// a line of addresses and nothing else
+		return nil
+	}
+
 	err = p.blockContents()
 	if err != nil {
 		return err
@@ -113,12 +119,6 @@ func (p *parser) blockContents() error {
 		p.cursor--
 	}
 
-	if p.eof {
-		// this happens if the Caddyfile consists of only
-		// a line of addresses and nothing else
-		return nil
-	}
-
 	err := p.directives()
 	if err != nil {
 		return err