From 1ed786f836b59c7893bc944939cc520dcfe00208 Mon Sep 17 00:00:00 2001
From: Abiola Ibrahim <abiola89@gmail.com>
Date: Wed, 23 Dec 2015 09:36:00 +0100
Subject: [PATCH] Cleanups and panic prevention in tests.

---
 caddy/setup/rewrite.go          | 6 ++++--
 middleware/rewrite/condition.go | 5 +++--
 middleware/rewrite/to.go        | 4 ++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/caddy/setup/rewrite.go b/caddy/setup/rewrite.go
index e642d071..4c84cb5f 100644
--- a/caddy/setup/rewrite.go
+++ b/caddy/setup/rewrite.go
@@ -2,6 +2,7 @@ package setup
 
 import (
 	"net/http"
+	"strings"
 
 	"github.com/mholt/caddy/middleware"
 	"github.com/mholt/caddy/middleware/rewrite"
@@ -54,10 +55,11 @@ func rewriteParse(c *Controller) ([]rewrite.Rule, error) {
 					}
 					pattern = c.Val()
 				case "to":
-					if !c.NextArg() {
+					args1 := c.RemainingArgs()
+					if len(args1) == 0 {
 						return nil, c.ArgErr()
 					}
-					to = c.Val()
+					to = strings.Join(args1, " ")
 				case "ext":
 					args1 := c.RemainingArgs()
 					if len(args1) == 0 {
diff --git a/middleware/rewrite/condition.go b/middleware/rewrite/condition.go
index ab69ef4a..51d4b3a2 100644
--- a/middleware/rewrite/condition.go
+++ b/middleware/rewrite/condition.go
@@ -2,10 +2,11 @@ package rewrite
 
 import (
 	"fmt"
-	"github.com/mholt/caddy/middleware"
 	"net/http"
 	"regexp"
 	"strings"
+
+	"github.com/mholt/caddy/middleware"
 )
 
 const (
@@ -19,7 +20,7 @@ const (
 )
 
 func operatorError(operator string) error {
-	return fmt.Errorf("Invalid operator", operator)
+	return fmt.Errorf("Invalid operator %v", operator)
 }
 
 func newReplacer(r *http.Request) middleware.Replacer {
diff --git a/middleware/rewrite/to.go b/middleware/rewrite/to.go
index 294b8f04..1dc48fdb 100644
--- a/middleware/rewrite/to.go
+++ b/middleware/rewrite/to.go
@@ -54,6 +54,10 @@ func To(fs http.FileSystem, r *http.Request, to string) bool {
 // isValidFile checks if file exists on the filesystem.
 // if file ends with `/`, it is validated as a directory.
 func isValidFile(fs http.FileSystem, file string) bool {
+	if fs == nil {
+		return false
+	}
+
 	f, err := fs.Open(file)
 	if err != nil {
 		return false