---------------------
PatchSet 7103 
Date: 2005/10/12 08:18:01
Author: adri
Branch: tidyup_deferred_reads
Tag: (none) 
Log:

Remove commSetDefer()s

Members: 
	src/ftp.c:1.18.6.20.4.4->1.18.6.20.4.5 
	src/http.c:1.17.6.27.4.16->1.17.6.27.4.17 

Index: squid/src/ftp.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/ftp.c,v
retrieving revision 1.18.6.20.4.4
retrieving revision 1.18.6.20.4.5
diff -u -r1.18.6.20.4.4 -r1.18.6.20.4.5
--- squid/src/ftp.c	12 Oct 2005 05:31:01 -0000	1.18.6.20.4.4
+++ squid/src/ftp.c	12 Oct 2005 08:18:01 -0000	1.18.6.20.4.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.c,v 1.18.6.20.4.4 2005/10/12 05:31:01 adri Exp $
+ * $Id: ftp.c,v 1.18.6.20.4.5 2005/10/12 08:18:01 adri Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -923,7 +923,6 @@
 	debug(9, 3) ("ftpScheduleDataClear: FD %d\n", ftpState->data.fd);
 	ftpState->data.pending_read = 0;
 	commSetSelect(ftpState->data.fd, COMM_SELECT_READ, NULL, NULL, 0);
-	commSetDefer(ftpState->data.fd, NULL, NULL);
 }
 
 #define ftpScheduleDataRead(a) ftpScheduleDataReadDebug((a), __FILE__, __LINE__)
@@ -938,7 +937,6 @@
 	    ftpDataRead,
 	    ftpState,
 	    Config.Timeout.read);
-	commSetDefer(ftpState->data.fd, NULL, NULL);
 }
 
 static void
Index: squid/src/http.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/http.c,v
retrieving revision 1.17.6.27.4.16
retrieving revision 1.17.6.27.4.17
diff -u -r1.17.6.27.4.16 -r1.17.6.27.4.17
--- squid/src/http.c	12 Oct 2005 07:20:55 -0000	1.17.6.27.4.16
+++ squid/src/http.c	12 Oct 2005 08:18:01 -0000	1.17.6.27.4.17
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http.c,v 1.17.6.27.4.16 2005/10/12 07:20:55 adri Exp $
+ * $Id: http.c,v 1.17.6.27.4.17 2005/10/12 08:18:01 adri Exp $
  *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
@@ -777,7 +777,6 @@
 		}
 		if (keep_alive) {
 		    /* yes we have to clear all these! */
-		    commSetDefer(fd, NULL, NULL);
 		    commSetTimeout(fd, -1, NULL, NULL);
 		    httpReadClear(fd, httpState);
 #if DELAY_POOLS
@@ -855,7 +854,6 @@
 	 * request bodies.
 	 */
 	commSetTimeout(fd, Config.Timeout.read, httpTimeout, httpState);
-        commSetDefer(fd, NULL, NULL);
     }
     httpState->flags.request_sent = 1;
 }