Merged changes from SQUID_3_0

diff --git a/src/WinSvc.cc b/src/WinSvc.cc
index c1a9534be4b46599cd9819ba37ea45a3825a8888..8acce9787d7ca5feb2097d510e46ce2400ffab31 100755 (executable)
--- a/src/WinSvc.cc
+++ b/src/WinSvc.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: WinSvc.cc,v 1.3.6.1 2008/02/17 11:37:52 serassio Exp $
+ * $Id: WinSvc.cc,v 1.3.6.2 2008/02/17 19:44:01 serassio Exp $
  *
  * Windows support
  * AUTHOR: Guido Serassio <serassio@squid-cache.org>
@@ -939,7 +939,6 @@ int main(int argc, char **argv)
         freopen(stderr_path, "w", stderr);
         setmode(fileno(stderr), O_TEXT);
         WIN32_run_mode = _WIN_SQUID_RUN_MODE_SERVICE;
-        opt_no_daemon = 1;
 
         if (!(c=strchr(argv[1],':'))) {
             fprintf(stderr, "Bad Service Parameter: %s\n", argv[1]);

diff --git a/src/ipc_win32.cc b/src/ipc_win32.cc
index 905f4f8327cb8c7f3517a4c8bd43090e47424e04..97f6a3277e5e2e396b0c28f9cf6de9086baf9935 100755 (executable)
--- a/src/ipc_win32.cc
+++ b/src/ipc_win32.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipc_win32.cc,v 1.4 2007/04/30 16:56:09 wessels Exp $
+ * $Id: ipc_win32.cc,v 1.4.6.1 2008/02/17 19:44:01 serassio Exp $
  *
  * DEBUG: section 54    Windows Interprocess Communication
  * AUTHOR: Andrey Shorin <tolsty@tushino.com>
@@ -411,7 +411,7 @@ ipc_thread_1(void *in_params)
         debugs(54, 3, "ipcCreate: CHILD accepted new FD " << fd);
         comm_close(crfd);
         snprintf(buf1, 8191, "%s CHILD socket", prog);
-        fd_open(fd, FD_SOCKET, buf1);
+        fdc_open(fd, FD_SOCKET, buf1);
         fd_table[fd].flags.ipc = 1;
         cwfd = crfd = fd;
     } else if (type == IPC_UDP_SOCKET) {

diff --git a/src/main.cc b/src/main.cc
index 5c363d4f02401b14cc332b9ce36f1e0bbcb778ec..413d2041ea293229d5811f2ae6678996b3a28902 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.451.4.1 2008/02/17 11:37:52 serassio Exp $
+ * $Id: main.cc,v 1.451.4.2 2008/02/17 19:44:01 serassio Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -62,10 +62,7 @@
 #if USE_POLL
 #include "comm_poll.h"
 #endif
-#if USE_SELECT
-#include "comm_select.h"
-#endif
-#if USE_SELECT_WIN32
+#if defined(USE_SELECT) || defined(USE_SELECT_WIN32)
 #include "comm_select.h"
 #endif
 #include "SquidTime.h"
@@ -929,7 +926,7 @@ mainInitialize(void)
 
         commPollRegisterWithCacheManager(manager);
 #endif
-#ifdef USE_SELECT
+#if defined(USE_SELECT) || defined(USE_SELECT_WIN32)
 
         commSelectRegisterWithCacheManager(manager);
 #endif