Merge pull request #29 from ins0/fix/26

Fix/26
ins0 · Mar 23, 2016 · e3d8948 · e3d8948
2 parents 672502d + c375eb3
commit e3d8948
Showing 1 changed file with 20 additions and 16 deletions.
diff --git a/src/Racecore/GATracking/Client/Adapter/Socket.php b/src/Racecore/GATracking/Client/Adapter/Socket.php
@@ -8,6 +8,9 @@
 
 class Socket extends Client\AbstractClientAdapter
 {
+    const READ_TIMEOUT = 3;
+    const READ_BUFFER = 8192;
+
     private $connection = null;
 
     /**
@@ -20,15 +23,16 @@ private function createConenction($endpoint)
         // port
         $port = $this->getOption('ssl') == true ? 443 : 80;
 
-        // connect
-        $connection = @fsockopen($port == 443 ? 'ssl://' . $endpoint['host'] : $endpoint['host'], $port, $error, $errorMessage, 10);
+        $connection = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
+        socket_connect($connection, $endpoint['host'], $port);
+        socket_set_option($connection, SOL_SOCKET, SO_RCVTIMEO, array('sec' => self::READ_TIMEOUT, 'usec' => 0));
 
-        if (!$connection || $error) {
-            throw new Exception\EndpointServerException('Analytics Host not reachable! Error:' . $errorMessage);
+        if ($this->getOption('async')) {
+            socket_set_nonblock($connection);
         }
 
-        if ($this->getOption('async')) {
-            stream_set_blocking($connection, 0);
+        if (!$connection) {
+            throw new Exception\EndpointServerException('Analytics Host not reachable! Error:');
         }
 
         $this->connection = $connection;
@@ -55,7 +59,7 @@ private function writeHeader($endpoint, Request\TrackingRequest $request, $lastD
             ($lastData ? 'Connection: Close' . "\r\n" : '') . "\r\n";
 
         // fwrite + check if fwrite was ok
-        if (!fwrite($this->connection, $header) || !fwrite($this->connection, $payloadString)) {
+        if (!socket_write($this->connection, $header) || !socket_write($this->connection, $payloadString)) {
             throw new Exception\EndpointServerException('Server closed connection unexpectedly');
         }
 
@@ -69,17 +73,18 @@ private function writeHeader($endpoint, Request\TrackingRequest $request, $lastD
      */
     private function readConnection(Request\TrackingRequest $request)
     {
-        if ($this->getOption('async')) {
-            return false;
-        }
-
         // response
         $response = '';
 
         // receive response
-        while (!feof($this->connection)) {
-            $response .= fread($this->connection, 8192);
-        }
+        do {
+            $out = @socket_read($this->connection, self::READ_BUFFER);
+            $response .= $out;
+
+            if (!$out || strlen($out) < self::READ_BUFFER) {
+                break;
+            }
+        } while (true);
 
         // response
         $responseContainer = explode("\r\n\r\n", $response, 2);
@@ -110,9 +115,8 @@ public function send($url, Request\TrackingRequestCollection $requestCollection)
 
             $request->setResponseHeader($responseHeader);
         }
-
         // connection close
-        fclose($this->connection);
+        socket_close($this->connection);
 
         return $requestCollection;
     }