Allow X-Forwarded-For to have multiple values

kassner · web-flow · commit 536209cdfdbd · 2017-05-16T20:28:18.000+02:00
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
@@ -63,6 +63,11 @@ public function getRemoteAddress($ipToLong = false)
         if (!$this->remoteAddress) {
             return false;
         }
+        
+        if (strpos($this->remoteAddress, ',') !== false) {
+            $ipList = explode(',', $this->remoteAddress);
+            $this->remoteAddress = trim(reset($ipList));
+        }
 
         return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
     }

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,11 @@ public function getRemoteAddress($ipToLong = false)`
`63`	`63`	`if (!$this->remoteAddress) {`
`64`	`64`	`return false;`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ if (strpos($this->remoteAddress, ',') !== false) {`
	`68`	`+ $ipList = explode(',', $this->remoteAddress);`
	`69`	`+ $this->remoteAddress = trim(reset($ipList));`
	`70`	`+ }`
`66`	`71`
`67`	`72`	`return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;`
`68`	`73`	`}`