switched from strtok() to explode()

moisadoru · moisadoru · commit 34f51d97d505 · 2013-11-15T10:17:00.000+02:00
diff --git a/src/base_facebook.php b/src/base_facebook.php
@@ -1156,7 +1156,9 @@ protected function getUrl($name, $path='', $params=array()) {
 
   protected function getHttpHost() {
     if ($this->trustForwarded && isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
-      return strtok($_SERVER['HTTP_X_FORWARDED_HOST'], ',');
+      $forwardProxies = explode(',', $_SERVER['HTTP_X_FORWARDED_HOST']);
+      $forwardProxies = array_filter($forwarders);
+      return current($forwardProxies);
     }
     return $_SERVER['HTTP_HOST'];
   }

Original file line number	Diff line number	Diff line change
`@@ -1156,7 +1156,9 @@ protected function getUrl($name, $path='', $params=array()) {`
`1156`	`1156`
`1157`	`1157`	`protected function getHttpHost() {`
`1158`	`1158`	`if ($this->trustForwarded && isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {`
`1159`		`- return strtok($_SERVER['HTTP_X_FORWARDED_HOST'], ',');`
	`1159`	`+ $forwardProxies = explode(',', $_SERVER['HTTP_X_FORWARDED_HOST']);`
	`1160`	`+ $forwardProxies = array_filter($forwarders);`
	`1161`	`+ return current($forwardProxies);`
`1160`	`1162`	`}`
`1161`	`1163`	`return $_SERVER['HTTP_HOST'];`
`1162`	`1164`	`}`