Changeset 105

Timestamp:

03/02/08 21:35:46 (5 years ago)

Author:

Seldaek

Message:

* Changed the Timeout detection to a hand-crafted one since set_stream_timeout seems to produce bugs

Files:

• trunk/Phergie/Driver/Streams.php (modified) (2 diffs)

trunk/Phergie/Driver/Streams.php

@@ -131 +131 @@
 
         if ($this->getIni('timeout')) {
-                stream_set_timeout($this->socket, $this->getIni('timeout') * 60);
+                $timeout = $this->getIni('timeout') * 60;
         } elseif ($this->getIni('keepalive')) {
-                stream_set_timeout($this->socket, 400);
+                $timeout = 600;
+                } else {
+                        $timeout = false;
                 }
+                $lastPacket = time();
 
         unset($port);
@@ -176 +179 @@
                 $buffer = fgets($this->socket, 512);
 
-                                $checkTimeout = stream_get_meta_data($this->socket);
-                                if ($checkTimeout['timed_out'] === true) {
-                                        $this->debug('Timed out');
-                        foreach ($this->plugins as $plugin) {
-                            $plugin->shutdown();
-                        }
-                                        break 2;
+                                // Check if we timed out
+                                if ($timeout !== false) {
+                                        // Reset last packet timestamp if we received something
+                                        if (!empty($buffer)) {
+                                                $lastPacket = time();
+                                        }
+                                        // Timed out, exit
+                                        if ($lastPacket < (time() - $timeout)) {
+                                                $this->debug('Timed out');
+                                foreach ($this->plugins as $plugin) {
+                                    $plugin->shutdown();
+                                }
+                                                break 2;
+                                        }
                                 }
             }