Bootstrapped

diff --git a/configure b/configure
index 00231b8afa3ef2779002fd36b5954c22f726867f..9701eeea59f61460e34c67e114726e7fb98bedf4 100755 (executable)
--- a/configure
+++ b/configure
@@ -39551,12 +39551,24 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 elif test "$ac_cv_func_select" = "yes" ; then
-        SELECT_TYPE="select"
+       case "$host_os" in
+       mingw|mingw32)
+               SELECT_TYPE="select_win32"
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SELECT_WIN32 1
+_ACEOF
+
+               ;;
+       *)
+               SELECT_TYPE="select"
 
 cat >>confdefs.h <<\_ACEOF
 #define USE_SELECT 1
 _ACEOF
 
+               ;;
+       esac
 else
         echo "Eep!  Can't find poll, kqueue, epoll, or select!"
         echo "I'll try select and hope for the best."

diff --git a/include/autoconf.h.in b/include/autoconf.h.in
index 373edfcd4d4dea9a3026d68859fc8730c6f3603a..c7a5c46a5f7718d02b36c3aead26d41aab4ebe9a 100644 (file)
--- a/include/autoconf.h.in
+++ b/include/autoconf.h.in
@@ -899,6 +899,9 @@
 /* Use select() for the IO loop */
 #undef USE_SELECT
 
+/* Use Winsock select() for the IO loop */
+#undef USE_SELECT_WIN32
+
 /* Define this to include code for SSL encryption. */
 #undef USE_SSL
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 65401aaee74b49ede888596b8f6d8e71972a7766..691304778a3cfa87301f23b73394f057de26e2a7 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.392 2006/06/13 10:29:30 serassio Exp $
+#  $Id: Makefile.in,v 1.393 2006/06/13 20:56:28 serassio Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -183,18 +183,18 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc \
        client_side_request.cc client_side_request.h BodyReader.cc \
        BodyReader.h ClientRequestContext.h clientStream.cc \
        clientStream.h CommIO.h comm_select.cc comm_select.h \
-       comm_poll.cc comm_poll.h comm_epoll.cc comm_epoll.h \
-       comm_kqueue.cc comm_kqueue.h CommRead.h ConfigOption.cc \
-       ConfigParser.cc ConfigParser.h ConnectionDetail.h debug.cc \
-       Debug.h defines.h CommonPool.h CompositePoolNode.h \
-       delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
-       DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
-       DelayPool.cc DelayPool.h DelayPools.h DelaySpec.cc DelaySpec.h \
-       DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \
-       DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \
-       disk.cc DiskIO/DiskIOModule.cc DiskIO/ReadRequest.cc \
-       DiskIO/ReadRequest.h DiskIO/WriteRequest.cc \
-       DiskIO/WriteRequest.h DiskIO/DiskFile.h \
+       comm_select_win32.cc comm_poll.cc comm_poll.h comm_epoll.cc \
+       comm_epoll.h comm_kqueue.cc comm_kqueue.h CommRead.h \
+       ConfigOption.cc ConfigParser.cc ConfigParser.h \
+       ConnectionDetail.h debug.cc Debug.h defines.h CommonPool.h \
+       CompositePoolNode.h delay_pools.cc DelayId.cc DelayId.h \
+       DelayIdComposite.h DelayBucket.cc DelayBucket.h DelayConfig.cc \
+       DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
+       DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
+       DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
+       NullDelayId.cc NullDelayId.h disk.cc DiskIO/DiskIOModule.cc \
+       DiskIO/ReadRequest.cc DiskIO/ReadRequest.h \
+       DiskIO/WriteRequest.cc DiskIO/WriteRequest.h DiskIO/DiskFile.h \
        DiskIO/DiskIOStrategy.h DiskIO/IORequestor.h \
        DiskIO/DiskIOModule.h dlink.h dns_internal.cc dns.cc enums.h \
        errorpage.cc ElementList.h ESI.cc ESI.h ESIAssign.cc \
@@ -258,8 +258,8 @@ am__objects_3 = $(am__objects_2) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \
        ACLTime.$(OBJEXT) ACLTimeData.$(OBJEXT) ACLUrl.$(OBJEXT) \
        ACLUrlPath.$(OBJEXT) ACLUrlPort.$(OBJEXT) \
        ACLUserData.$(OBJEXT)
-am__objects_4 = comm_select.$(OBJEXT) comm_poll.$(OBJEXT) \
-       comm_epoll.$(OBJEXT) comm_kqueue.$(OBJEXT)
+am__objects_4 = comm_select.$(OBJEXT) comm_select_win32.$(OBJEXT) \
+       comm_poll.$(OBJEXT) comm_epoll.$(OBJEXT) comm_kqueue.$(OBJEXT)
 am__objects_5 = delay_pools.$(OBJEXT) DelayId.$(OBJEXT) \
        DelayBucket.$(OBJEXT) DelayConfig.$(OBJEXT) \
        DelayPool.$(OBJEXT) DelaySpec.$(OBJEXT) DelayTagged.$(OBJEXT) \
@@ -390,26 +390,27 @@ am__tests_testCacheManager_SOURCES_DIST = debug.cc globals.cc \
        ACLUserData.cc authenticate.cc BodyReader.cc cache_manager.cc \
        cache_cf.cc CacheDigest.cc carp.cc cbdata.cc client_db.cc \
        client_side.cc client_side_reply.cc client_side_request.cc \
-       clientStream.cc comm_select.cc comm_select.h comm_poll.cc \
-       comm_poll.h comm_epoll.cc comm_epoll.h comm_kqueue.cc \
-       comm_kqueue.h ConfigOption.cc ConfigParser.cc CommonPool.h \
-       CompositePoolNode.h delay_pools.cc DelayId.cc DelayId.h \
-       DelayIdComposite.h DelayBucket.cc DelayBucket.h DelayConfig.cc \
-       DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
-       DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
-       DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
-       NullDelayId.cc NullDelayId.h disk.cc dns_internal.cc dns.cc \
-       event.cc errorpage.cc ElementList.h ESI.cc ESI.h ESIAssign.cc \
-       ESIAssign.h ESIAttempt.h ESIContext.cc ESIContext.h \
-       ESICustomParser.cc ESICustomParser.h ESIElement.h ESIExcept.h \
-       ESIExpatParser.cc ESIExpatParser.h ESIExpression.cc \
-       ESIExpression.h ESIInclude.cc ESIInclude.h ESILiteral.h \
-       ESILibxml2Parser.cc ESILibxml2Parser.h ESIParser.cc \
-       ESIParser.h ESISegment.cc ESISegment.h ESISequence.cc \
-       ESISequence.h ESIVar.h ESIVarState.cc ESIVarState.h ETag.cc \
-       external_acl.cc ExternalACLEntry.cc fd.cc fde.cc forward.cc \
-       fqdncache.cc ftp.cc gopher.cc helper.cc htcp.cc htcp.h http.cc \
-       HttpBody.cc HttpHeader.cc HttpHeaderTools.cc HttpHdrCc.cc \
+       clientStream.cc comm_select.cc comm_select.h \
+       comm_select_win32.cc comm_poll.cc comm_poll.h comm_epoll.cc \
+       comm_epoll.h comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
+       ConfigParser.cc CommonPool.h CompositePoolNode.h \
+       delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
+       DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
+       DelayPool.cc DelayPool.h DelayPools.h DelaySpec.cc DelaySpec.h \
+       DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \
+       DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \
+       disk.cc dns_internal.cc dns.cc event.cc errorpage.cc \
+       ElementList.h ESI.cc ESI.h ESIAssign.cc ESIAssign.h \
+       ESIAttempt.h ESIContext.cc ESIContext.h ESICustomParser.cc \
+       ESICustomParser.h ESIElement.h ESIExcept.h ESIExpatParser.cc \
+       ESIExpatParser.h ESIExpression.cc ESIExpression.h \
+       ESIInclude.cc ESIInclude.h ESILiteral.h ESILibxml2Parser.cc \
+       ESILibxml2Parser.h ESIParser.cc ESIParser.h ESISegment.cc \
+       ESISegment.h ESISequence.cc ESISequence.h ESIVar.h \
+       ESIVarState.cc ESIVarState.h ETag.cc external_acl.cc \
+       ExternalACLEntry.cc fd.cc fde.cc forward.cc fqdncache.cc \
+       ftp.cc gopher.cc helper.cc htcp.cc htcp.h http.cc HttpBody.cc \
+       HttpHeader.cc HttpHeaderTools.cc HttpHdrCc.cc \
        HttpHdrContRange.cc HttpHdrRange.cc HttpHdrSc.cc \
        HttpHdrScTarget.cc HttpMsg.cc HttpReply.cc HttpStatusLine.cc \
        icmp.cc icp_v2.cc icp_v3.cc ACLIdent.cc ACLIdent.h ident.cc \
@@ -579,26 +580,26 @@ am__tests_testHttpRequest_SOURCES_DIST = debug.cc globals.cc \
        cache_manager.cc cache_cf.cc CacheDigest.cc carp.cc cbdata.cc \
        client_db.cc client_side.cc client_side_reply.cc \
        client_side_request.cc clientStream.cc comm_select.cc \
-       comm_select.h comm_poll.cc comm_poll.h comm_epoll.cc \
-       comm_epoll.h comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
-       ConfigParser.cc CommonPool.h CompositePoolNode.h \
-       delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
-       DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
-       DelayPool.cc DelayPool.h DelayPools.h DelaySpec.cc DelaySpec.h \
-       DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \
-       DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \
-       disk.cc dns_internal.cc dns.cc event.cc errorpage.cc \
-       ElementList.h ESI.cc ESI.h ESIAssign.cc ESIAssign.h \
-       ESIAttempt.h ESIContext.cc ESIContext.h ESICustomParser.cc \
-       ESICustomParser.h ESIElement.h ESIExcept.h ESIExpatParser.cc \
-       ESIExpatParser.h ESIExpression.cc ESIExpression.h \
-       ESIInclude.cc ESIInclude.h ESILiteral.h ESILibxml2Parser.cc \
-       ESILibxml2Parser.h ESIParser.cc ESIParser.h ESISegment.cc \
-       ESISegment.h ESISequence.cc ESISequence.h ESIVar.h \
-       ESIVarState.cc ESIVarState.h ETag.cc external_acl.cc \
-       ExternalACLEntry.cc fd.cc fde.cc forward.cc fqdncache.cc \
-       ftp.cc gopher.cc helper.cc htcp.cc htcp.h http.cc HttpBody.cc \
-       HttpHeader.cc HttpHeaderTools.cc HttpHdrCc.cc \
+       comm_select.h comm_select_win32.cc comm_poll.cc comm_poll.h \
+       comm_epoll.cc comm_epoll.h comm_kqueue.cc comm_kqueue.h \
+       ConfigOption.cc ConfigParser.cc CommonPool.h \
+       CompositePoolNode.h delay_pools.cc DelayId.cc DelayId.h \
+       DelayIdComposite.h DelayBucket.cc DelayBucket.h DelayConfig.cc \
+       DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
+       DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
+       DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
+       NullDelayId.cc NullDelayId.h disk.cc dns_internal.cc dns.cc \
+       event.cc errorpage.cc ElementList.h ESI.cc ESI.h ESIAssign.cc \
+       ESIAssign.h ESIAttempt.h ESIContext.cc ESIContext.h \
+       ESICustomParser.cc ESICustomParser.h ESIElement.h ESIExcept.h \
+       ESIExpatParser.cc ESIExpatParser.h ESIExpression.cc \
+       ESIExpression.h ESIInclude.cc ESIInclude.h ESILiteral.h \
+       ESILibxml2Parser.cc ESILibxml2Parser.h ESIParser.cc \
+       ESIParser.h ESISegment.cc ESISegment.h ESISequence.cc \
+       ESISequence.h ESIVar.h ESIVarState.cc ESIVarState.h ETag.cc \
+       external_acl.cc ExternalACLEntry.cc fd.cc fde.cc forward.cc \
+       fqdncache.cc ftp.cc gopher.cc helper.cc htcp.cc htcp.h http.cc \
+       HttpBody.cc HttpHeader.cc HttpHeaderTools.cc HttpHdrCc.cc \
        HttpHdrContRange.cc HttpHdrRange.cc HttpHdrSc.cc \
        HttpHdrScTarget.cc HttpMsg.cc HttpReply.cc HttpStatusLine.cc \
        icmp.cc icp_v2.cc icp_v3.cc ACLIdent.cc ACLIdent.h ident.cc \
@@ -754,26 +755,27 @@ am__tests_testURL_SOURCES_DIST = debug.cc url.cc URLScheme.cc \
        ACLUserData.cc authenticate.cc BodyReader.cc cache_manager.cc \
        cache_cf.cc CacheDigest.cc carp.cc cbdata.cc client_db.cc \
        client_side.cc client_side_reply.cc client_side_request.cc \
-       clientStream.cc comm_select.cc comm_select.h comm_poll.cc \
-       comm_poll.h comm_epoll.cc comm_epoll.h comm_kqueue.cc \
-       comm_kqueue.h ConfigOption.cc ConfigParser.cc CommonPool.h \
-       CompositePoolNode.h delay_pools.cc DelayId.cc DelayId.h \
-       DelayIdComposite.h DelayBucket.cc DelayBucket.h DelayConfig.cc \
-       DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
-       DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
-       DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
-       NullDelayId.cc NullDelayId.h disk.cc dns_internal.cc dns.cc \
-       event.cc errorpage.cc ElementList.h ESI.cc ESI.h ESIAssign.cc \
-       ESIAssign.h ESIAttempt.h ESIContext.cc ESIContext.h \
-       ESICustomParser.cc ESICustomParser.h ESIElement.h ESIExcept.h \
-       ESIExpatParser.cc ESIExpatParser.h ESIExpression.cc \
-       ESIExpression.h ESIInclude.cc ESIInclude.h ESILiteral.h \
-       ESILibxml2Parser.cc ESILibxml2Parser.h ESIParser.cc \
-       ESIParser.h ESISegment.cc ESISegment.h ESISequence.cc \
-       ESISequence.h ESIVar.h ESIVarState.cc ESIVarState.h ETag.cc \
-       external_acl.cc ExternalACLEntry.cc fd.cc fde.cc forward.cc \
-       fqdncache.cc ftp.cc gopher.cc helper.cc htcp.cc htcp.h http.cc \
-       HttpBody.cc HttpHeader.cc HttpHeaderTools.cc HttpHdrCc.cc \
+       clientStream.cc comm_select.cc comm_select.h \
+       comm_select_win32.cc comm_poll.cc comm_poll.h comm_epoll.cc \
+       comm_epoll.h comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
+       ConfigParser.cc CommonPool.h CompositePoolNode.h \
+       delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
+       DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
+       DelayPool.cc DelayPool.h DelayPools.h DelaySpec.cc DelaySpec.h \
+       DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \
+       DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \
+       disk.cc dns_internal.cc dns.cc event.cc errorpage.cc \
+       ElementList.h ESI.cc ESI.h ESIAssign.cc ESIAssign.h \
+       ESIAttempt.h ESIContext.cc ESIContext.h ESICustomParser.cc \
+       ESICustomParser.h ESIElement.h ESIExcept.h ESIExpatParser.cc \
+       ESIExpatParser.h ESIExpression.cc ESIExpression.h \
+       ESIInclude.cc ESIInclude.h ESILiteral.h ESILibxml2Parser.cc \
+       ESILibxml2Parser.h ESIParser.cc ESIParser.h ESISegment.cc \
+       ESISegment.h ESISequence.cc ESISequence.h ESIVar.h \
+       ESIVarState.cc ESIVarState.h ETag.cc external_acl.cc \
+       ExternalACLEntry.cc fd.cc fde.cc forward.cc fqdncache.cc \
+       ftp.cc gopher.cc helper.cc htcp.cc htcp.h http.cc HttpBody.cc \
+       HttpHeader.cc HttpHeaderTools.cc HttpHdrCc.cc \
        HttpHdrContRange.cc HttpHdrRange.cc HttpHdrSc.cc \
        HttpHdrScTarget.cc HttpMsg.cc HttpReply.cc HttpStatusLine.cc \
        icmp.cc icp_v2.cc icp_v3.cc ACLIdent.cc ACLIdent.h ident.cc \
@@ -885,18 +887,18 @@ am__tests_test_http_range_SOURCES_DIST = tests/test_http_range.cc \
        ACLUserData.cc authenticate.cc BodyReader.cc cache_cf.cc \
        cache_manager.cc CacheDigest.cc carp.cc cbdata.cc client_db.cc \
        client_side.cc client_side_reply.cc client_side_request.cc \
-       clientStream.cc comm_select.cc comm_select.h comm_poll.cc \
-       comm_poll.h comm_epoll.cc comm_epoll.h comm_kqueue.cc \
-       comm_kqueue.h ConfigOption.cc ConfigParser.cc debug.cc \
-       CommonPool.h CompositePoolNode.h delay_pools.cc DelayId.cc \
-       DelayId.h DelayIdComposite.h DelayBucket.cc DelayBucket.h \
-       DelayConfig.cc DelayConfig.h DelayPool.cc DelayPool.h \
-       DelayPools.h DelaySpec.cc DelaySpec.h DelayTagged.cc \
-       DelayTagged.h DelayUser.cc DelayUser.h DelayVector.cc \
-       DelayVector.h NullDelayId.cc NullDelayId.h disk.cc \
-       dns_internal.cc dns.cc event.cc errorpage.cc ElementList.h \
-       ESI.cc ESI.h ESIAssign.cc ESIAssign.h ESIAttempt.h \
-       ESIContext.cc ESIContext.h ESICustomParser.cc \
+       clientStream.cc comm_select.cc comm_select.h \
+       comm_select_win32.cc comm_poll.cc comm_poll.h comm_epoll.cc \
+       comm_epoll.h comm_kqueue.cc comm_kqueue.h ConfigOption.cc \
+       ConfigParser.cc debug.cc CommonPool.h CompositePoolNode.h \
+       delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
+       DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
+       DelayPool.cc DelayPool.h DelayPools.h DelaySpec.cc DelaySpec.h \
+       DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \
+       DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \
+       disk.cc dns_internal.cc dns.cc event.cc errorpage.cc \
+       ElementList.h ESI.cc ESI.h ESIAssign.cc ESIAssign.h \
+       ESIAttempt.h ESIContext.cc ESIContext.h ESICustomParser.cc \
        ESICustomParser.h ESIElement.h ESIExcept.h ESIExpatParser.cc \
        ESIExpatParser.h ESIExpression.cc ESIExpression.h \
        ESIInclude.cc ESIInclude.h ESILiteral.h ESILibxml2Parser.cc \
@@ -987,43 +989,44 @@ am__ufsdump_SOURCES_DIST = debug.cc int.cc mem.cc store_key_md5.cc \
        cache_manager.cc CacheDigest.cc carp.cc cbdata.cc client_db.cc \
        client_side.cc client_side_reply.cc client_side_request.cc \
        client_side_request.h clientStream.cc clientStream.h CommIO.h \
-       comm_select.cc comm_select.h comm_poll.cc comm_poll.h \
-       comm_epoll.cc comm_epoll.h comm_kqueue.cc comm_kqueue.h \
-       ConfigOption.cc defines.h CommonPool.h CompositePoolNode.h \
-       delay_pools.cc DelayId.cc DelayId.h DelayIdComposite.h \
-       DelayBucket.cc DelayBucket.h DelayConfig.cc DelayConfig.h \
-       DelayPool.cc DelayPool.h DelayPools.h DelaySpec.cc DelaySpec.h \
-       DelayTagged.cc DelayTagged.h DelayUser.cc DelayUser.h \
-       DelayVector.cc DelayVector.h NullDelayId.cc NullDelayId.h \
-       disk.cc dns_internal.cc dns.cc enums.h errorpage.cc \
-       ElementList.h ESI.cc ESI.h ESIAssign.cc ESIAssign.h \
-       ESIAttempt.h ESIContext.cc ESIContext.h ESICustomParser.cc \
-       ESICustomParser.h ESIElement.h ESIExcept.h ESIExpatParser.cc \
-       ESIExpatParser.h ESIExpression.cc ESIExpression.h \
-       ESIInclude.cc ESIInclude.h ESILiteral.h ESILibxml2Parser.cc \
-       ESILibxml2Parser.h ESIParser.cc ESIParser.h ESISegment.cc \
-       ESISegment.h ESISequence.cc ESISequence.h ESIVar.h \
-       ESIVarState.cc ESIVarState.h ETag.cc event.cc external_acl.cc \
-       ExternalACLEntry.cc fd.cc fde.cc fde.h filemap.cc forward.cc \
-       forward.h fqdncache.cc ftp.cc gopher.cc helper.cc htcp.cc \
-       htcp.h http.cc HttpStatusLine.cc HttpHdrCc.cc HttpHdrRange.cc \
-       HttpHdrSc.cc HttpHdrScTarget.cc HttpHdrContRange.cc \
-       HttpHeader.cc HttpHeaderTools.cc HttpBody.cc HttpMsg.cc \
-       HttpReply.cc HttpRequest.cc HttpRequestMethod.cc icmp.cc \
-       icp_v2.cc icp_v3.cc ACLIdent.cc ACLIdent.h ident.cc \
-       internal.cc ipc.cc ipcache.cc LeakFinder.cc list.cc logfile.cc \
-       mem_node.cc mem_node.h Mem.h MemBuf.cc MemObject.cc \
-       MemObject.h mime.cc multicast.cc neighbors.cc net_db.cc \
-       Packer.cc Parsing.cc ProfStats.cc pconn.cc peer_digest.cc \
-       peer_select.cc protos.h redirect.cc referer.cc refresh.cc \
-       send-announce.cc snmp_core.cc snmp_agent.cc squid.h \
-       ACLCertificateData.cc ACLCertificateData.h ACLCertificate.cc \
-       ACLCertificate.h ssl_support.cc ssl_support.h tunnel.cc \
-       Server.cc SquidNew.cc stat.cc StatHist.cc stmem.cc store_io.cc \
-       StoreIOBuffer.h StoreIOState.cc store_client.cc StoreClient.h \
-       store_digest.cc store_dir.cc store_log.cc store_rebuild.cc \
-       store_swapin.cc store_swapmeta.cc store_swapout.cc structs.h \
-       SwapDir.cc tools.cc typedefs.h unlinkd.cc URLScheme.cc urn.cc \
+       comm_select.cc comm_select.h comm_select_win32.cc comm_poll.cc \
+       comm_poll.h comm_epoll.cc comm_epoll.h comm_kqueue.cc \
+       comm_kqueue.h ConfigOption.cc defines.h CommonPool.h \
+       CompositePoolNode.h delay_pools.cc DelayId.cc DelayId.h \
+       DelayIdComposite.h DelayBucket.cc DelayBucket.h DelayConfig.cc \
+       DelayConfig.h DelayPool.cc DelayPool.h DelayPools.h \
+       DelaySpec.cc DelaySpec.h DelayTagged.cc DelayTagged.h \
+       DelayUser.cc DelayUser.h DelayVector.cc DelayVector.h \
+       NullDelayId.cc NullDelayId.h disk.cc dns_internal.cc dns.cc \
+       enums.h errorpage.cc ElementList.h ESI.cc ESI.h ESIAssign.cc \
+       ESIAssign.h ESIAttempt.h ESIContext.cc ESIContext.h \
+       ESICustomParser.cc ESICustomParser.h ESIElement.h ESIExcept.h \
+       ESIExpatParser.cc ESIExpatParser.h ESIExpression.cc \
+       ESIExpression.h ESIInclude.cc ESIInclude.h ESILiteral.h \
+       ESILibxml2Parser.cc ESILibxml2Parser.h ESIParser.cc \
+       ESIParser.h ESISegment.cc ESISegment.h ESISequence.cc \
+       ESISequence.h ESIVar.h ESIVarState.cc ESIVarState.h ETag.cc \
+       event.cc external_acl.cc ExternalACLEntry.cc fd.cc fde.cc \
+       fde.h filemap.cc forward.cc forward.h fqdncache.cc ftp.cc \
+       gopher.cc helper.cc htcp.cc htcp.h http.cc HttpStatusLine.cc \
+       HttpHdrCc.cc HttpHdrRange.cc HttpHdrSc.cc HttpHdrScTarget.cc \
+       HttpHdrContRange.cc HttpHeader.cc HttpHeaderTools.cc \
+       HttpBody.cc HttpMsg.cc HttpReply.cc HttpRequest.cc \
+       HttpRequestMethod.cc icmp.cc icp_v2.cc icp_v3.cc ACLIdent.cc \
+       ACLIdent.h ident.cc internal.cc ipc.cc ipcache.cc \
+       LeakFinder.cc list.cc logfile.cc mem_node.cc mem_node.h Mem.h \
+       MemBuf.cc MemObject.cc MemObject.h mime.cc multicast.cc \
+       neighbors.cc net_db.cc Packer.cc Parsing.cc ProfStats.cc \
+       pconn.cc peer_digest.cc peer_select.cc protos.h redirect.cc \
+       referer.cc refresh.cc send-announce.cc snmp_core.cc \
+       snmp_agent.cc squid.h ACLCertificateData.cc \
+       ACLCertificateData.h ACLCertificate.cc ACLCertificate.h \
+       ssl_support.cc ssl_support.h tunnel.cc Server.cc SquidNew.cc \
+       stat.cc StatHist.cc stmem.cc store_io.cc StoreIOBuffer.h \
+       StoreIOState.cc store_client.cc StoreClient.h store_digest.cc \
+       store_dir.cc store_log.cc store_rebuild.cc store_swapin.cc \
+       store_swapmeta.cc store_swapout.cc structs.h SwapDir.cc \
+       tools.cc typedefs.h unlinkd.cc URLScheme.cc urn.cc \
        useragent.cc wais.cc wccp.cc whois.cc wordlist.cc win32.cc
 am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) mem.$(OBJEXT) \
        store_key_md5.$(OBJEXT) StoreMeta.$(OBJEXT) \
@@ -1601,10 +1604,11 @@ squid_ACLSOURCES = \
 squid_COMMSOURCES = \
        comm_select.cc \
        comm_select.h \
+       comm_select_win32.cc \
        comm_poll.cc \
        comm_poll.h \
-    comm_epoll.cc \
-    comm_epoll.h \
+       comm_epoll.cc \
+       comm_epoll.h \
        comm_kqueue.cc \
        comm_kqueue.h
 
@@ -1658,7 +1662,7 @@ squid_SOURCES = \
        ClientRequestContext.h \
        clientStream.cc \
        clientStream.h \
-    CommIO.h \
+       CommIO.h \
        $(squid_COMMSOURCES) \
        CommRead.h \
        ConfigOption.cc \
@@ -3839,6 +3843,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm_kqueue.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm_poll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm_select.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/comm_select_win32.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/delay_pools.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/disk.Po@am__quote@