X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fjagi%2Fscgi%2FEventServer.java;h=f617cf54f5c7970aaf6b9263ef504b4f23da415f;hb=HEAD;hp=202b8ddad9f109b70bd9dff9e714fa5a292dcd25;hpb=794a5c90597dcfeffafbc5976cde812072023d0a;p=jagi.git

diff --git a/src/jagi/scgi/EventServer.java b/src/jagi/scgi/EventServer.java
index 202b8dd..f617cf5 100644
--- a/src/jagi/scgi/EventServer.java
+++ b/src/jagi/scgi/EventServer.java
@@ -115,11 +115,14 @@ public class EventServer implements Runnable {
 
 	public void handle(int events) throws IOException {
 	    if(!eof && (buf.remaining() == 0)) {
-		buf.rewind();
+		buf.clear();
 		while(buf.remaining() > 0) {
-		    if(in.read(buf) < 0)
+		    if(in.read(buf) < 0) {
+			eof = true;
 			break;
+		    }
 		}
+		buf.flip();
 	    }
 	    double now = Driver.current().time();
 	    if((events & SelectionKey.OP_WRITE) != 0) {
@@ -168,7 +171,7 @@ public class EventServer implements Runnable {
 	public void handle(int events) throws IOException {
 	    double now = Driver.current().time();
 	    if((events & SelectionKey.OP_READ) != 0) {
-		buf.rewind();
+		buf.clear();
 		if(buf.remaining() > max - cur)
 		    buf.limit(buf.position() + (int)Math.min(max - cur, Integer.MAX_VALUE));
 		int rv = sk.read(buf);
@@ -176,7 +179,8 @@ public class EventServer implements Runnable {
 		    eof = true;
 		} else if(rv > 0) {
 		    lastread = now;
-		    cur += rv;
+		    if((cur += rv) >= max)
+			eof = true;
 		}
 		buf.flip();
 		while(buf.remaining() > 0)