Merge pull request #43 from hollodotme/fast-cgi-client-41

Add proper handling of stream_select return value

Author: hollodotme

CHANGELOG.md

@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a CH
 
 ## [2.7.2] - YYYY-MM-DD
 
+### Improved
+
+* Handling of `stream_select` returning `false` in case of a system call interrupt. - [#41]
+
 ### Fixed
 
 * Remove/close sockets after fetching their responses triggered async requests in order to prevent halt on further 
@@ -230,3 +234,4 @@ Based on [Pierrick Charron](https://github.com/adoy)'s [PHP-FastCGI-Client](http
 [#33]: https://github.com/hollodotme/fast-cgi-client/pull/33
 [#37]: https://github.com/hollodotme/fast-cgi-client/issue/37
 [#40]: https://github.com/hollodotme/fast-cgi-client/issue/40
+[#41]: https://github.com/hollodotme/fast-cgi-client/issue/41

composer.json

@@ -4,7 +4,8 @@
   "keywords": [
     "fastcgi",
     "php-fpm",
-    "socket"
+    "socket",
+    "async"
   ],
   "minimum-stability": "dev",
   "prefer-stable": true,

src/Client.php

@@ -172,10 +172,7 @@ public function waitForResponses( ?int $timeoutMs = null ) : void
 
 		while ( $this->hasUnhandledResponses() )
 		{
-			foreach ( $this->getSocketsHavingResponse() as $socket )
-			{
-				$this->fetchResponseAndNotifyCallback( $socket, $timeoutMs );
-			}
+			$this->handleReadyResponses( $timeoutMs );
 		}
 	}
 
@@ -209,18 +206,6 @@ public function hasUnhandledResponses() : bool
 		return $this->sockets->hasBusySockets();
 	}
 
-	/**
-	 * @return Generator|Socket[]
-	 * @throws ReadFailedException
-	 */
-	private function getSocketsHavingResponse() : Generator
-	{
-		foreach ( $this->getRequestIdsHavingResponse() as $requestId )
-		{
-			yield $this->sockets->getById( $requestId );
-		}
-	}
-
 	/**
 	 * @param int $requestId
 	 *
@@ -246,7 +231,12 @@ public function getRequestIdsHavingResponse() : array
 		$reads  = $this->sockets->collectResources();
 		$writes = $excepts = null;
 
-		stream_select( $reads, $writes, $excepts, 0, Socket::STREAM_SELECT_USEC );
+		$result = @stream_select( $reads, $writes, $excepts, 0, Socket::STREAM_SELECT_USEC );
+
+		if ( false === $result || 0 === count( $reads ) )
+		{
+			return [];
+		}
 
 		return $this->sockets->getSocketIdsByResources( $reads );
 	}

src/Sockets/Socket.php

@@ -52,8 +52,10 @@
 use function stream_select;
 use function stream_set_timeout;
 use function stream_socket_client;
+use function stream_socket_shutdown;
 use function strlen;
 use function substr;
+use const STREAM_SHUT_RDWR;
 
 final class Socket
 {
@@ -541,6 +543,7 @@ private function disconnect() : void
 	{
 		if ( is_resource( $this->resource ) )
 		{
+			@stream_socket_shutdown( $this->resource, STREAM_SHUT_RDWR );
 			fclose( $this->resource );
 		}
 	}