removed stateful functions; allow for fallback when the forwardProxies array is empty (via gfosco)

moisadoru · moisadoru · commit d0735d0f8744 · 2013-11-20T10:21:27.000+02:00
diff --git a/src/base_facebook.php b/src/base_facebook.php
@@ -1183,8 +1183,9 @@ protected function getUrl($name, $path='', $params=array()) {
   protected function getHttpHost() {
     if ($this->trustForwarded && isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
       $forwardProxies = explode(',', $_SERVER['HTTP_X_FORWARDED_HOST']);
-      $forwardProxies = array_filter($forwardProxies);
-      return current($forwardProxies);
+      if (!empty($forwardProxies)) {
+        return $forwardProxies[0];
+      }
     }
     return $_SERVER['HTTP_HOST'];
   }

Original file line number	Diff line number	Diff line change
`@@ -1183,8 +1183,9 @@ protected function getUrl($name, $path='', $params=array()) {`
`1183`	`1183`	`protected function getHttpHost() {`
`1184`	`1184`	`if ($this->trustForwarded && isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {`
`1185`	`1185`	`$forwardProxies = explode(',', $_SERVER['HTTP_X_FORWARDED_HOST']);`
`1186`		`- $forwardProxies = array_filter($forwardProxies);`
`1187`		`- return current($forwardProxies);`
	`1186`	`+ if (!empty($forwardProxies)) {`
	`1187`	`+ return $forwardProxies[0];`
	`1188`	`+ }`
`1188`	`1189`	`}`
`1189`	`1190`	`return $_SERVER['HTTP_HOST'];`
`1190`	`1191`	`}`