From d7e46398189abd89d18d874e3c53b42d492002b8 Mon Sep 17 00:00:00 2001
From: Felipe Madrigal <luis.felipe@ooyala.com>
Date: Fri, 26 Sep 2014 00:20:46 -0500
Subject: [PATCH] Rearrange rules for matching strict slash

---
 regexp.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/regexp.go b/regexp.go
index 35c8177..a630548 100644
--- a/regexp.go
+++ b/regexp.go
@@ -35,12 +35,13 @@ func newRouteRegexp(tpl string, matchHost, matchPrefix, matchQuery, strictSlash
 	defaultPattern := "[^/]+"
 	if matchQuery {
 		defaultPattern = "[^?&]+"
-		matchPrefix, strictSlash = true, false
+		matchPrefix = true
 	} else if matchHost {
 		defaultPattern = "[^.]+"
-		matchPrefix, strictSlash = false, false
+		matchPrefix = false
 	}
-	if matchPrefix {
+	// Only match strict slash if not matching
+	if matchPrefix || matchHost || matchQuery {
 		strictSlash = false
 	}
 	// Set a flag for strictSlash.