---------------------
PatchSet 1421 
Date: 2005/05/28 13:47:31
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge conflict

Members: 
	src/ipc.cc:1.8.2.15->1.8.2.16 

Index: squid3/src/ipc.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ipc.cc,v
retrieving revision 1.8.2.15
retrieving revision 1.8.2.16
diff -u -r1.8.2.15 -r1.8.2.16
--- squid3/src/ipc.cc	28 May 2005 13:40:13 -0000	1.8.2.15
+++ squid3/src/ipc.cc	28 May 2005 13:47:31 -0000	1.8.2.16
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipc.cc,v 1.8.2.15 2005/05/28 13:40:13 serassio Exp $
+ * $Id: ipc.cc,v 1.8.2.16 2005/05/28 13:47:31 serassio Exp $
  *
  * DEBUG: section 54    Interprocess Communication
  * AUTHOR: Duane Wessels
@@ -937,11 +937,8 @@
     for (int loopIndex = 3; loopIndex < SQUID_MAXFD; ++loopIndex)
         close(loopIndex);
 
-#if HAVE_SETSID
-
-    setsid();
-
-#endif
+    if (opt_no_daemon)
+        squid_signal(SIGINT, SIG_IGN, SA_RESETHAND);
 
     execvp(prog, (char *const *) args);
 
@@ -1874,7 +1871,6 @@
                       rfc1738_escape_unescaped(buf1));
         int writerv;
 
-<<<<<<< ipc.cc
         if (type == IPC_TCP_SOCKET)
             writerv = write(c2p[1], buf1, recvrv);
         else
@@ -1889,10 +1885,6 @@
 }
 
 #endif
-=======
-    if (opt_no_daemon)
-        squid_signal(SIGINT, SIG_IGN, SA_RESETHAND);
->>>>>>> 1.10
 
 void
 IPCInstance::childToParentLoop() {