Fixed #397.

matyhtf · matyhtf · commit 3a82f7a2f104 · 2016-02-01T16:33:29.000+08:00
diff --git a/src/reactor/ReactorBase.c b/src/reactor/ReactorBase.c
@@ -207,7 +207,7 @@ static void swReactor_onTimeout_and_Finish(swReactor *reactor)
         //client exit
         if (SwooleG.timer.num <= 0)
         {
-            if (reactor->event_num == 1 && SwooleAIO.task_num == 1)
+            if (SwooleAIO.init && reactor->event_num == 1 && SwooleAIO.task_num == 0)
             {
                 reactor->running = 0;
             }
diff --git a/swoole_async.c b/swoole_async.c
@@ -370,7 +370,7 @@ PHP_FUNCTION(swoole_async_read)
 
     swHashMap_add_int(php_swoole_aio_request, fd, req);
     php_swoole_check_aio();
-    SW_CHECK_RETURN(SwooleAIO.read(fd, fcnt, buf_size, 0));
+    SW_CHECK_RETURN(SwooleAIO.read(fd, fcnt, buf_size, offset));
     RETURN_TRUE;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ static void swReactor_onTimeout_and_Finish(swReactor *reactor)`
`207`	`207`	`//client exit`
`208`	`208`	`if (SwooleG.timer.num <= 0)`
`209`	`209`	`{`
`210`		`- if (reactor->event_num == 1 && SwooleAIO.task_num == 1)`
	`210`	`+ if (SwooleAIO.init && reactor->event_num == 1 && SwooleAIO.task_num == 0)`
`211`	`211`	`{`
`212`	`212`	`reactor->running = 0;`
`213`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ PHP_FUNCTION(swoole_async_read)`
`370`	`370`
`371`	`371`	`swHashMap_add_int(php_swoole_aio_request, fd, req);`
`372`	`372`	`php_swoole_check_aio();`
`373`		`- SW_CHECK_RETURN(SwooleAIO.read(fd, fcnt, buf_size, 0));`
	`373`	`+ SW_CHECK_RETURN(SwooleAIO.read(fd, fcnt, buf_size, offset));`
`374`	`374`	`RETURN_TRUE;`
`375`	`375`	`}`
`376`	`376`