Support force_ip_resolve in StreamHandler

guzzle · Nov 15, 2016 · f2337fe · f2337fe
1 parent f0339b9
commit f2337fe
Showing 1 changed file with 28 additions and 9 deletions.
diff --git a/src/Handler/StreamHandler.php b/src/Handler/StreamHandler.php
@@ -11,6 +11,7 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UriInterface;
 
 /**
  * HTTP handler that uses PHP's HTTP stream wrapper.
@@ -277,6 +278,7 @@ private function createStream(RequestInterface $request, array $options)
 
         $params = [];
         $context = $this->getDefaultContext($request, $options);
+        $uri = $request->getUri()->withFragment('');
 
         if (isset($options['on_headers']) && !is_callable($options['on_headers'])) {
             throw new \InvalidArgumentException('on_headers must be callable');
@@ -286,7 +288,7 @@ private function createStream(RequestInterface $request, array $options)
             foreach ($options as $key => $value) {
                 $method = "add_{$key}";
                 if (isset($methods[$method])) {
-                    $this->{$method}($request, $context, $value, $params);
+                    $this->{$method}($request, $context, $value, $params, $uri);
                 }
             }
         }
@@ -308,8 +310,8 @@ function () use ($context, $params) {
         );
 
         return $this->createResource(
-            function () use ($request, &$http_response_header, $context) {
-                $resource = fopen((string) $request->getUri()->withFragment(''), 'r', null, $context);
+            function () use ($uri, &$http_response_header, $context) {
+                $resource = fopen((string) $uri, 'r', null, $context);
                 $this->lastHeaders = $http_response_header;
                 return $resource;
             }
@@ -350,7 +352,7 @@ private function getDefaultContext(RequestInterface $request)
         return $context;
     }
 
-    private function add_proxy(RequestInterface $request, &$options, $value, &$params)
+    private function add_proxy(RequestInterface $request, &$options, $value, &$params, UriInterface &$uri)
     {
         if (!is_array($value)) {
             $options['http']['proxy'] = $value;
@@ -369,14 +371,14 @@ private function add_proxy(RequestInterface $request, &$options, $value, &$param
         }
     }
 
-    private function add_timeout(RequestInterface $request, &$options, $value, &$params)
+    private function add_timeout(RequestInterface $request, &$options, $value, &$params, UriInterface &$uri)
     {
         if ($value > 0) {
             $options['http']['timeout'] = $value;
         }
     }
 
-    private function add_verify(RequestInterface $request, &$options, $value, &$params)
+    private function add_verify(RequestInterface $request, &$options, $value, &$params, UriInterface &$uri)
     {
         if ($value === true) {
             // PHP 5.6 or greater will find the system cert by default. When
@@ -402,7 +404,7 @@ private function add_verify(RequestInterface $request, &$options, $value, &$para
         $options['ssl']['allow_self_signed'] = false;
     }
 
-    private function add_cert(RequestInterface $request, &$options, $value, &$params)
+    private function add_cert(RequestInterface $request, &$options, $value, &$params, UriInterface &$uri)
     {
         if (is_array($value)) {
             $options['ssl']['passphrase'] = $value[1];
@@ -416,7 +418,7 @@ private function add_cert(RequestInterface $request, &$options, $value, &$params
         $options['ssl']['local_cert'] = $value;
     }
 
-    private function add_progress(RequestInterface $request, &$options, $value, &$params)
+    private function add_progress(RequestInterface $request, &$options, $value, &$params, UriInterface &$uri)
     {
         $this->addNotification(
             $params,
@@ -428,7 +430,24 @@ function ($code, $a, $b, $c, $transferred, $total) use ($value) {
         );
     }
 
-    private function add_debug(RequestInterface $request, &$options, $value, &$params)
+    private function add_force_ip_resolve(RequestInterface $request, &$options, $value, &$params, UriInterface &$uri)
+    {
+        if ('v4' === $value) {
+            $records = dns_get_record($uri->getHost(), DNS_A);
+            if (!isset($records[0]['ip'])) {
+                throw new ConnectException("Could not resolve IPv4 address for host '{$uri->getHost()}'", $request);
+            }
+            $uri = $uri->withHost($records[0]['ip']);
+        } else if ('v6' === $value) {
+            $records = dns_get_record($uri->getHost(), DNS_AAAA);
+            if (!isset($records[0]['ipv6'])) {
+                throw new ConnectException("Could not resolve IPv6 address for host '{$uri->getHost()}'", $request);
+            }
+            $uri = $uri->withHost('[' . $records[0]['ipv6'] . ']');
+        }
+    }
+
+    private function add_debug(RequestInterface $request, &$options, $value, &$params, UriInterface &$uri)
     {
         if ($value === false) {
             return;