---------------------
PatchSet 7135 
Date: 2005/10/26 05:08:07
Author: adri
Branch: tidyup_deferred_reads
Tag: (none) 
Log:

Reverse more unneeded changes!

Members: 
	src/client_side.c:1.47.2.59.4.9->1.47.2.59.4.10 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.47.2.59.4.9
retrieving revision 1.47.2.59.4.10
diff -u -r1.47.2.59.4.9 -r1.47.2.59.4.10
--- squid/src/client_side.c	26 Oct 2005 03:46:26 -0000	1.47.2.59.4.9
+++ squid/src/client_side.c	26 Oct 2005 05:08:07 -0000	1.47.2.59.4.10
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.47.2.59.4.9 2005/10/26 03:46:26 adri Exp $
+ * $Id: client_side.c,v 1.47.2.59.4.10 2005/10/26 05:08:07 adri Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -150,9 +150,6 @@
 static BODY_HANDLER clientReadBody;
 static void clientAbortBody(request_t * req);
 
-static void clientReadSchedule(ConnStateData *conn);
-static void clientReadClear(ConnStateData *conn);
-
 static int
 checkAccelOnly(clientHttpRequest * http)
 {
@@ -2176,7 +2173,7 @@
 	 * blocking!.
 	 */
 #ifdef _SQUID_CYGWIN_
-	clientReadSchedule(conn);
+        commSetSelect(conn->fd, COMM_SELECT_READ, clientReadRequest, conn, 0);
 #else
 	clientReadRequest(conn->fd, conn);	/* Read next request */
 #endif
@@ -2964,18 +2961,6 @@
 }
 
 static void
-clientReadSchedule(ConnStateData *conn)
-{
-    commSetSelect(conn->fd, COMM_SELECT_READ, clientReadRequest, conn, 0);
-}
-
-static void
-clientReadClear(ConnStateData *conn)
-{
-    commSetSelect(conn->fd, COMM_SELECT_READ, NULL, NULL, 0);
-}
-
-static void
 clientReadRequest(int fd, void *data)
 {
     ConnStateData *conn = data;
@@ -2996,7 +2981,7 @@
         commDeferReadUntil(conn->fd, 1, clientReadRequest, conn);
         return;
     }
-    clientReadSchedule(conn);
+    commSetSelect(conn->fd, COMM_SELECT_READ, clientReadRequest, conn, 0);
     if (len == 0) {
 	/* Grow the request memory area to accomodate for a large request */
 	conn->in.size += CLIENT_REQ_BUF_SZ;
@@ -3236,7 +3221,7 @@
 	    }
 	    if (request->method == METHOD_CONNECT) {
 		/* Stop reading requests... */
-		clientReadClear(conn);
+                commSetSelect(conn->fd, COMM_SELECT_READ, NULL, NULL, 0);
 		if (conn->chr == http)
 		    clientAccessCheck(http);
 		else {
@@ -3479,7 +3464,7 @@
 	/*
 	 * Aha, but we don't want a read handler!
 	 */
-	clientReadClear(conn);
+        commSetSelect(conn->fd, COMM_SELECT_READ, NULL, NULL, 0);
     }
 #else
     /*
@@ -3568,7 +3553,7 @@
 	if (aclCheckFast(Config.accessList.identLookup, &identChecklist))
 	    identStart(&me, &peer, clientIdentDone, connState);
 #endif
-	clientReadSchedule(connState);
+        commSetSelect(fd, COMM_SELECT_READ, clientReadRequest, connState, 0);
 	clientdbEstablished(peer.sin_addr, 1);
 	assert(N);
 	(*N)++;
@@ -3614,7 +3599,7 @@
     } else {
 	debug(83, 5) ("clientNegotiateSSL: FD %d has no certificate.\n", fd);
     }
-    clientReadSchedule(conn);
+    commSetSelect(conn->fd, COMM_SELECT_READ, clientReadRequest, conn, 0);
 }
 
 struct _https_port_data {