From: wessels <>
Date: Wed, 25 Mar 1998 12:21:47 +0000 (+0000)
Subject: From:    "Michael O'Reilly" <michael@metal.iinet.net.au>
X-Git-Tag: SQUID_3_0_PRE1~3752
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5874bf28ae4dddfe69862c566932ff56d2106e6d;p=thirdparty%2Fsquid.git

From:    "Michael O'Reilly" <michael@metal.iinet.net.au>
#1. close() called on a network socket on linux doesn't block, so
there's no point in paying the cost an aioClose.
---

diff --git a/src/comm.cc b/src/comm.cc
index da6d6a69d6..057920f957 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.235 1998/03/24 17:29:44 wessels Exp $
+ * $Id: comm.cc,v 1.236 1998/03/25 05:21:47 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -642,7 +642,13 @@ comm_close(int fd)
     if (F->uses)		/* assume persistent connect count */
 	pconnHistCount(1, F->uses);
     fd_close(fd);		/* update fdstat */
-#if USE_ASYNC_IO
+#if defined(_SQUID_LINUX_)
+    /*
+     * michael@metal.iinet.net.au sez close() on
+     * network sockets never blocks.
+     */
+    close(fd);
+#elsif USE_ASYNC_IO
     aioClose(fd);
 #else
     close(fd);