Merge pull request #1367 from haarg/revproxy-proto-order

bigpresh · web-flow · commit b9f370940bf5 · 2017-08-14T22:57:52.000+01:00
perfer X-Forwarded-Proto to prevent users lying
diff --git a/lib/Dancer2/Core/Request.pm b/lib/Dancer2/Core/Request.pm
@@ -167,8 +167,8 @@ sub forwarded_host        { shift->env->{'HTTP_X_FORWARDED_HOST'} }
 
 # there are two options
 sub forwarded_protocol    {
-    $_[0]->env->{'HTTP_X_FORWARDED_PROTOCOL'} ||
     $_[0]->env->{'HTTP_X_FORWARDED_PROTO'}    ||
+    $_[0]->env->{'HTTP_X_FORWARDED_PROTOCOL'} ||
     $_[0]->env->{'HTTP_FORWARDED_PROTO'}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -167,8 +167,8 @@ sub forwarded_host { shift->env->{'HTTP_X_FORWARDED_HOST'} }`
`167`	`167`
`168`	`168`	`# there are two options`
`169`	`169`	`sub forwarded_protocol {`
`170`		`- $_[0]->env->{'HTTP_X_FORWARDED_PROTOCOL'} \|\|`
`171`	`170`	`$_[0]->env->{'HTTP_X_FORWARDED_PROTO'} \|\|`
	`171`	`+ $_[0]->env->{'HTTP_X_FORWARDED_PROTOCOL'} \|\|`
`172`	`172`	`$_[0]->env->{'HTTP_FORWARDED_PROTO'}`
`173`	`173`	`}`
`174`	`174`