--------------------- PatchSet 4660 Date: 2002/08/13 19:49:06 Author: serassio Branch: nt-2_5 Tag: (none) Log: Fixed helper bugs Members: lib/win32lib.c:1.1.32.6->1.1.32.7 port/win32/squid/buildver.h:1.1.2.11->1.1.2.12 src/helper.c:1.16.10.9->1.16.10.10 Index: squid/lib/win32lib.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/win32lib.c,v retrieving revision 1.1.32.6 retrieving revision 1.1.32.7 diff -u -r1.1.32.6 -r1.1.32.7 --- squid/lib/win32lib.c 12 Aug 2002 19:36:37 -0000 1.1.32.6 +++ squid/lib/win32lib.c 13 Aug 2002 19:49:06 -0000 1.1.32.7 @@ -1,5 +1,5 @@ /* - * $Id: win32lib.c,v 1.1.32.6 2002/08/12 19:36:37 serassio Exp $ + * $Id: win32lib.c,v 1.1.32.7 2002/08/13 19:49:06 serassio Exp $ * * * * * * * * * Legal stuff * * * * * * * * @@ -35,6 +35,7 @@ */ #include "squid.h" +#undef strerror /* The following code section is part of an EXPERIMENTAL native */ /* Windows NT/2000 Squid port - Compiles only on MS Visual C++ */ Index: squid/port/win32/squid/buildver.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/buildver.h,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -u -r1.1.2.11 -r1.1.2.12 --- squid/port/win32/squid/buildver.h 12 Aug 2002 19:36:38 -0000 1.1.2.11 +++ squid/port/win32/squid/buildver.h 13 Aug 2002 19:49:07 -0000 1.1.2.12 @@ -1,4 +1,4 @@ -#define FILEVER 2,5,10,29 -#define PRODUCTVER 2,5,10,29 -#define STRFILEVER "2, 5, 10, 29\0" -#define STRPRODUCTVER "2, 5, 10, 29\0" +#define FILEVER 2,5,10,34 +#define PRODUCTVER 2,5,10,34 +#define STRFILEVER "2, 5, 10, 34\0" +#define STRPRODUCTVER "2, 5, 10, 34\0" Index: squid/src/helper.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/helper.c,v retrieving revision 1.16.10.9 retrieving revision 1.16.10.10 diff -u -r1.16.10.9 -r1.16.10.10 --- squid/src/helper.c 12 Aug 2002 19:21:21 -0000 1.16.10.9 +++ squid/src/helper.c 13 Aug 2002 19:49:08 -0000 1.16.10.10 @@ -1,6 +1,6 @@ /* - * $Id: helper.c,v 1.16.10.9 2002/08/12 19:21:21 serassio Exp $ + * $Id: helper.c,v 1.16.10.10 2002/08/13 19:49:08 serassio Exp $ * * DEBUG: section 84 Helper process maintenance * AUTHOR: Harvest Derived? @@ -581,7 +581,7 @@ hIpc = srv->hIpc; pid = srv->win32_pid; no = srv->index + 1; - shutdown(srv->rfd, SD_BOTH); + shutdown(srv->wfd, SD_BOTH); #endif wfd = srv->wfd; srv->wfd = -1; @@ -644,7 +644,7 @@ hIpc = srv->hIpc; pid = srv->win32_pid; no = srv->index + 1; - shutdown(srv->rfd, SD_BOTH); + shutdown(srv->wfd, SD_BOTH); #endif comm_close(srv->wfd); srv->wfd = -1;