bug symfony#12572 [HttpFoundation] fix checkip6 (Neime)

fabpot · fabpot · commit ff079dd41e95 · 2014-12-29T09:16:17.000+01:00
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes symfony#12572). Discussion ---------- [HttpFoundation] fix checkip6 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | I have this error ContextErrorException: Warning: inet_pton(): Unrecognized address X.X.X.X:X in IpUtils.php line 110 X.X.X.X:X is detected as a ipv6 because HTTP_X_FORWARDED_FOR have a port. Commits ------- 1da0ba4 [Debug] fix checkip6
diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php
@@ -39,7 +39,7 @@ public static function checkIp($requestIp, $ips)
             $ips = array($ips);
         }
 
-        $method = false !== strpos($requestIp, ':') ? 'checkIp6' : 'checkIp4';
+        $method = substr_count($requestIp, ':') > 1 ? 'checkIp6' : 'checkIp4';
 
         foreach ($ips as $ip) {
             if (self::$method($requestIp, $ip)) {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static function checkIp($requestIp, $ips)`
`39`	`39`	`$ips = array($ips);`
`40`	`40`	`}`
`41`	`41`
`42`		`- $method = false !== strpos($requestIp, ':') ? 'checkIp6' : 'checkIp4';`
	`42`	`+ $method = substr_count($requestIp, ':') > 1 ? 'checkIp6' : 'checkIp4';`
`43`	`43`
`44`	`44`	`foreach ($ips as $ip) {`
`45`	`45`	`if (self::$method($requestIp, $ip)) {`