From 6327a0ba12ad18e5a8853393cdc6b1fd58c7e7f8 Mon Sep 17 00:00:00 2001
From: SilverFox <vzerda@gmail.com>
Date: Thu, 28 Sep 2017 05:48:52 +0800
Subject: [PATCH] Make add-base-url compatible with minified html

---
 pkg/nginx/template/template.go      |  8 ++++----
 pkg/nginx/template/template_test.go | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkg/nginx/template/template.go b/pkg/nginx/template/template.go
index 5469000a7..c22625333 100644
--- a/pkg/nginx/template/template.go
+++ b/pkg/nginx/template/template.go
@@ -324,12 +324,12 @@ func buildProxyPass(host string, b interface{}, loc interface{}) string {
 			// path has a slash suffix, so that it can be connected with baseuri directly
 			bPath := fmt.Sprintf("%s%s", path, "$baseuri")
 			if len(location.Rewrite.BaseURLScheme) > 0 {
-				abu = fmt.Sprintf(`subs_filter '<head(.*)>' '<head$1><base href="%v://$http_host%v">' r;
-	    subs_filter '<HEAD(.*)>' '<HEAD$1><base href="%v://$http_host%v">' r;
+				abu = fmt.Sprintf(`subs_filter '<head(.*?)>' '<head$1><base href="%v://$http_host%v">' r;
+	    subs_filter '<HEAD(.*?)>' '<HEAD$1><base href="%v://$http_host%v">' r;
 	    `, location.Rewrite.BaseURLScheme, bPath, location.Rewrite.BaseURLScheme, bPath)
 			} else {
-				abu = fmt.Sprintf(`subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host%v">' r;
-	    subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host%v">' r;
+				abu = fmt.Sprintf(`subs_filter '<head(.*?)>' '<head$1><base href="$scheme://$http_host%v">' r;
+	    subs_filter '<HEAD(.*?)>' '<HEAD$1><base href="$scheme://$http_host%v">' r;
 	    `, bPath, bPath)
 			}
 		}
diff --git a/pkg/nginx/template/template_test.go b/pkg/nginx/template/template_test.go
index cecc69b9a..97b2925c2 100644
--- a/pkg/nginx/template/template_test.go
+++ b/pkg/nginx/template/template_test.go
@@ -64,34 +64,34 @@ var (
 		"redirect / to /jenkins and rewrite": {"/", "/jenkins", "~* /", `
 	    rewrite /(.*) /jenkins/$1 break;
 	    proxy_pass http://upstream-name;
-	    subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/$baseuri">' r;
-	    subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/$baseuri">' r;
+	    subs_filter '<head(.*?)>' '<head$1><base href="$scheme://$http_host/$baseuri">' r;
+	    subs_filter '<HEAD(.*?)>' '<HEAD$1><base href="$scheme://$http_host/$baseuri">' r;
 	    `, true, ""},
 		"redirect /something to / and rewrite": {"/something", "/", `~* ^/something\/?(?<baseuri>.*)`, `
 	    rewrite /something/(.*) /$1 break;
 	    rewrite /something / break;
 	    proxy_pass http://upstream-name;
-	    subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/something/$baseuri">' r;
-	    subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/something/$baseuri">' r;
+	    subs_filter '<head(.*?)>' '<head$1><base href="$scheme://$http_host/something/$baseuri">' r;
+	    subs_filter '<HEAD(.*?)>' '<HEAD$1><base href="$scheme://$http_host/something/$baseuri">' r;
 	    `, true, ""},
 		"redirect /end-with-slash/ to /not-root and rewrite": {"/end-with-slash/", "/not-root", `~* ^/end-with-slash/(?<baseuri>.*)`, `
 	    rewrite /end-with-slash/(.*) /not-root/$1 break;
 	    proxy_pass http://upstream-name;
-	    subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
-	    subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
+	    subs_filter '<head(.*?)>' '<head$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
+	    subs_filter '<HEAD(.*?)>' '<HEAD$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
 	    `, true, ""},
 		"redirect /something-complex to /not-root and rewrite": {"/something-complex", "/not-root", `~* ^/something-complex\/?(?<baseuri>.*)`, `
 	    rewrite /something-complex/(.*) /not-root/$1 break;
 	    proxy_pass http://upstream-name;
-	    subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
-	    subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
+	    subs_filter '<head(.*?)>' '<head$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
+	    subs_filter '<HEAD(.*?)>' '<HEAD$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
 	    `, true, ""},
 		"redirect /something to / and rewrite with specific scheme": {"/something", "/", `~* ^/something\/?(?<baseuri>.*)`, `
 	    rewrite /something/(.*) /$1 break;
 	    rewrite /something / break;
 	    proxy_pass http://upstream-name;
-	    subs_filter '<head(.*)>' '<head$1><base href="http://$http_host/something/$baseuri">' r;
-	    subs_filter '<HEAD(.*)>' '<HEAD$1><base href="http://$http_host/something/$baseuri">' r;
+	    subs_filter '<head(.*?)>' '<head$1><base href="http://$http_host/something/$baseuri">' r;
+	    subs_filter '<HEAD(.*?)>' '<HEAD$1><base href="http://$http_host/something/$baseuri">' r;
 	    `, true, "http"},
 	}
 )