Fixed IPv6 Check in RequestMatcher

yohang · fabpot · commit 959c1dfa4bc9 · 2012-10-16T13:28:16.000+02:00
Added a fallback check for ipv6 support even if sockets extension is not available
diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php
@@ -154,7 +154,7 @@ protected function checkIp4($requestIp, $ip)
      */
     protected function checkIp6($requestIp, $ip)
     {
-        if (!defined('AF_INET6')) {
+        if (!((extension_loaded('sockets') && defined('AF_INET6')) || @inet_pton('::1'))) {
             throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ protected function checkIp4($requestIp, $ip)`
`154`	`154`	`*/`
`155`	`155`	`protected function checkIp6($requestIp, $ip)`
`156`	`156`	`{`
`157`		`- if (!defined('AF_INET6')) {`
	`157`	`+ if (!((extension_loaded('sockets') && defined('AF_INET6')) \|\| @inet_pton('::1'))) {`
`158`	`158`	`throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');`
`159`	`159`	`}`
`160`	`160`