---------------------
PatchSet 5136 
Date: 2002/09/26 07:08:16
Author: adri
Branch: commloops
Tag: (none) 
Log:

Fix some more missing bits. Oops.

Members: 
	src/comm.c:1.21.4.6->1.21.4.7 
	src/protos.h:1.49.4.4->1.49.4.5 

Index: squid/src/comm.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/comm.c,v
retrieving revision 1.21.4.6
retrieving revision 1.21.4.7
diff -u -r1.21.4.6 -r1.21.4.7
--- squid/src/comm.c	26 Sep 2002 06:22:21 -0000	1.21.4.6
+++ squid/src/comm.c	26 Sep 2002 07:08:17 -0000	1.21.4.7
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.c,v 1.21.4.6 2002/09/26 06:22:21 adri Exp $
+ * $Id: comm.c,v 1.21.4.7 2002/09/26 07:08:17 adri Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -127,7 +127,7 @@
  * code block.
  */
 static void
-comm_addiocallback(int fd, IOCB *callback, size_t retval, comm_err_t errcode,
+comm_addiocallback(int fd, IOCB *callback, char *buf, size_t retval, comm_err_t errcode,
   int xerrno, void *callback_data)
 {
 	CommCallbackData *cio;
@@ -145,6 +145,7 @@
 	cio->callback = callback;
 	cio->callback_data = callback_data;
 	cio->seqnum = CommCallbackSeqnum;
+        cio->buf = buf;
 
 	/* Add it to the end of the list */
 	dlinkAddTail(cio, &(cio->h_node), &CommCallbackList);
@@ -204,7 +205,7 @@
 
 	assert(Fc->read.handler != NULL);
 
-	comm_addiocallback(fd, Fc->read.handler, retval, errcode, xerrno,
+	comm_addiocallback(fd, Fc->read.handler, Fc->read.buf, retval, errcode, xerrno,
 	    Fc->read.handler_data);
 	Fc->read.handler = NULL;
 	Fc->read.handler_data = NULL;
@@ -747,6 +748,7 @@
     commSetCloseOnExec(sock);
     /* fdstat update */
     fd_open(sock, FD_SOCKET, "HTTP Request");
+    fdc_table[sock].active = 1;
     F = &fd_table[sock];
     xstrncpy(F->ipaddr, inet_ntoa(P.sin_addr), 16);
     F->remote_port = htons(P.sin_port);
Index: squid/src/protos.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/protos.h,v
retrieving revision 1.49.4.4
retrieving revision 1.49.4.5
diff -u -r1.49.4.4 -r1.49.4.5
--- squid/src/protos.h	26 Sep 2002 06:08:06 -0000	1.49.4.4
+++ squid/src/protos.h	26 Sep 2002 07:08:16 -0000	1.49.4.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.49.4.4 2002/09/26 06:08:06 adri Exp $
+ * $Id: protos.h,v 1.49.4.5 2002/09/26 07:08:16 adri Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -154,6 +154,7 @@
 /* comm.c */
 extern int comm_existsiocallback(void);
 extern void comm_calliocallback(void);
+extern void comm_read(int fd, char *buf, int len, IOCB *handler, void *data);
 
 extern int commSetNonBlocking(int fd);
 extern int commUnsetNonBlocking(int fd);