Tue Oct 19 01:31:35 CEST 1999
Modified Files in squid/src
	disk.c 
Modified Files in squid/include
	autoconf.h.in 
Modified Files in squid
	acconfig.h configure configure.in 

Added configure option --enable-optimistic-io

Fixed a minor inconsistency when OPTIMISTIC_IO is enabled

-----------------------------------------------------------------

Index: squid/acconfig.h
diff -u squid/acconfig.h:1.1.1.22.2.3 squid/acconfig.h:1.1.1.22.2.4
--- squid/acconfig.h:1.1.1.22.2.3	Sun Oct 17 16:34:54 1999
+++ squid/acconfig.h	Tue Oct 19 01:31:23 1999
@@ -117,6 +117,11 @@
  */
 #undef USE_CARP
 
+/*
+ * Optimistic I/O
+ */
+#undef OPTIMISTIC_IO
+
 /********************************
  *  END OF CONFIGURABLE OPTIONS *
  ********************************/
Index: squid/configure.in
diff -u squid/configure.in:1.1.1.34.2.12 squid/configure.in:1.1.1.34.2.13
--- squid/configure.in:1.1.1.34.2.12	Sun Oct 17 16:34:58 1999
+++ squid/configure.in	Tue Oct 19 01:31:28 1999
@@ -273,6 +273,14 @@
 AC_SUBST(ASYNC_OBJS)
 AC_SUBST(SQUID_PTHREAD_LIB)
 
+AC_ARG_ENABLE(optimistic-io,
+[  --enable-optimistic-io  Enable optimistic I/O],
+[ if test "$enableval" = "yes" ; then
+    echo "Optimistic I/O enabled"
+    AC_DEFINE(OPTIMISTIC_IO)
+  fi
+])
+
 AC_ARG_ENABLE(icmp,
 [  --enable-icmp           Enable ICMP pinging],
 [ if test "$enableval" = "yes" ; then
Index: squid/include/autoconf.h.in
diff -u squid/include/autoconf.h.in:1.1.1.27.2.5 squid/include/autoconf.h.in:1.1.1.27.2.6
--- squid/include/autoconf.h.in:1.1.1.27.2.5	Sun Oct 17 16:35:03 1999
+++ squid/include/autoconf.h.in	Tue Oct 19 01:31:34 1999
@@ -139,6 +139,11 @@
  */
 #undef USE_CARP
 
+/*
+ * Optimistic I/O
+ */
+#undef OPTIMISTIC_IO
+
 /* Define if struct tm has tm_gmtoff member */
 #undef HAVE_TM_GMTOFF
 
Index: squid/src/disk.c
diff -u squid/src/disk.c:1.1.1.22.2.1 squid/src/disk.c:1.1.1.22.2.2
--- squid/src/disk.c:1.1.1.22.2.1	Tue Jul 13 02:11:55 1999
+++ squid/src/disk.c	Tue Oct 19 01:31:34 1999
@@ -431,16 +431,14 @@
 	diskHandleWrite(fd, NULL);
 #else
 #ifdef OPTIMISTIC_IO
-	if (F->flags.calling_io_handler)
+	if (F->flags.calling_io_handler) {
 #endif
 	    commSetSelect(fd, COMM_SELECT_WRITE, diskHandleWrite, NULL, 0);
+	    F->flags.write_daemon = 1;
 #ifdef OPTIMISTIC_IO
-	else
+	} else
 	    diskHandleWrite(fd, NULL);
 #endif
-#endif
-#ifndef OPTIMISTIC_IO
-	F->flags.write_daemon = 1;
 #endif
     }
 }