[Cvs-cvs] ccvs/src ChangeLog server.c [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <address@hidden>     06/02/13 22:36:46

Modified files:
        src            : ChangeLog server.c 

Log message:
        * server.c (do_cvs_command): Skip server_cleanup in the child process.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.421&tr2=1.2336.2.422&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/server.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.284.2.43&tr2=1.284.2.44&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.421 ccvs/src/ChangeLog:1.2336.2.422
--- ccvs/src/ChangeLog:1.2336.2.421     Mon Feb 13 21:50:38 2006
+++ ccvs/src/ChangeLog  Mon Feb 13 22:36:46 2006
@@ -1,5 +1,7 @@
 2006-02-13  Derek Price  <address@hidden>
 
+       * server.c (do_cvs_command): Skip server_cleanup in the child process.
+
        * sanity.sh (sshstdio-6): Rewrite using more portable sed script.
 
 2006-02-02  Derek Price  <address@hidden>
Index: ccvs/src/server.c
diff -u ccvs/src/server.c:1.284.2.43 ccvs/src/server.c:1.284.2.44
--- ccvs/src/server.c:1.284.2.43        Thu Feb  2 13:08:36 2006
+++ ccvs/src/server.c   Mon Feb 13 22:36:46 2006
@@ -2963,10 +2963,7 @@
 
        rcs_cleanup ();
        Lock_Cleanup ();
-#ifdef SERVER_SUPPORT
-       if (server_active)
-           server_cleanup (0);
-#endif
+       /* Don't call server_cleanup - the parent will handle that.  */
 #ifdef SYSTEM_CLEANUP
        /* Hook for OS-specific behavior, for example socket subsystems on
           NT and OS2 or dealing with windows and arguments on Mac.  */