Merge pull request #3266 from dialoghq/feature/taxing-rewrites

Matthew Fisher · Matthew Fisher · commit d124842c6f4c · 2015-03-14T13:19:27.000-07:00
feat(router): avoid regex-based taxing rewrites
diff --git a/router/image/templates/nginx.conf b/router/image/templates/nginx.conf
@@ -99,7 +99,7 @@ http {
 
         {{ if eq $enforceHTTPS "true" }}
         if ($access_scheme != "https") {
-          rewrite ^(.*)$ https://$host$1 permanent;
+          return 301 https://$server_name$request_uri;
         }
         {{ end }}
     }
@@ -173,7 +173,7 @@ http {
 
             {{ if eq $enforceHTTPS "true" }}
             if ($access_scheme != "https") {
-              rewrite ^(.*)$ https://$host$1 permanent;
+              return 301 https://$server_name$request_uri;
             }
             {{ end }}
 

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ http {`
`99`	`99`
`100`	`100`	`{{ if eq $enforceHTTPS "true" }}`
`101`	`101`	`if ($access_scheme != "https") {`
`102`		`- rewrite ^(.*)$ https://$host$1 permanent;`
	`102`	`+ return 301 https://$server_name$request_uri;`
`103`	`103`	`}`
`104`	`104`	`{{ end }}`
`105`	`105`	`}`
`@@ -173,7 +173,7 @@ http {`
`173`	`173`
`174`	`174`	`{{ if eq $enforceHTTPS "true" }}`
`175`	`175`	`if ($access_scheme != "https") {`
`176`		`- rewrite ^(.*)$ https://$host$1 permanent;`
	`176`	`+ return 301 https://$server_name$request_uri;`
`177`	`177`	`}`
`178`	`178`	`{{ end }}`
`179`	`179`