Improved defer tasks.

hprose · Aug 10, 2016 · 3b524e5 · 3b524e5
1 parent 7daf980
commit 3b524e5
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/Hprose/Socket/Service.php b/src/Hprose/Socket/Service.php
@@ -14,7 +14,7 @@
  *                                                        *
  * hprose socket Service library for php 5.3+             *
  *                                                        *
- * LastModified: Aug 8, 2016                              *
+ * LastModified: Aug 10, 2016                             *
  * Author: Ma Bingyao <[email protected]>                  *
  *                                                        *
 \**********************************************************/
@@ -294,11 +294,14 @@ public function error($server, $socket, $ex) {
         $this->close($socket, $context);
     }
     private function timeout() {
-        $deadlines = $this->deadlines;
-        if (empty($deadlines)) {
-            return 3600;
+        if (empty($this->deferTasks)) {
+            $deadlines = $this->deadlines;
+            if (empty($deadlines)) {
+                return 3600;
+            }
+            return max(0, min($deadlines) - microtime(true));
         }
-        return max(0, min($deadlines) - microtime(true));
+        return 0;
     }
     public function handle($servers) {
         $readableSockets = &$this->readableSockets;