---------------------
PatchSet 1773 
Date: 2001/03/25 17:49:42
Author: serassio
Branch: nt-2_3
Tag: (none) 
Log:
Latest Squid-NT update

Members: 
	Readme.txt:1.1.2.1->1.1.2.2 
	WIN32-ChangeLog.txt:1.1.2.2->1.1.2.3 
	auth_modules/NT/Makefile.in:1.1.2.1->1.1.2.2 
	include/autoconf.h:1.1.2.1->1.1.2.2 
	include/config.h:1.1.2.1->1.1.2.2 
	include/config.h.in:1.1.1.3.4.1.2.1->1.1.1.3.4.1.2.2 
	include/radix.h:1.1.1.1.42.1->1.1.1.1.42.2 
	include/version.h:1.1.1.3.4.4.2.1->1.1.1.3.4.4.2.2 
	lib/rfc1738.c:1.1.1.2.4.1.2.1->1.1.1.2.4.1.2.2 

Index: squid/Readme.txt
===================================================================
RCS file: /cvsroot/squid-sf//squid/Attic/Readme.txt,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid/Readme.txt	6 Jan 2001 12:40:07 -0000	1.1.2.1
+++ squid/Readme.txt	25 Mar 2001 17:49:42 -0000	1.1.2.2
@@ -1,55 +1,64 @@
 Free Squid NT 2.3 STABLE 4 for Windows NT 4
 
-(native port of Squid 2.3 STABLE 4, plus 21/12/2000 tarball update and many NT service enhancement,
-derived from the Harvest project) 
-
+(native port of Squid 2.3 STABLE 4, plus 09/01/2001 tarball update and many NT service enhancement, derived from the Harvest project) 
 Current features: 
 
-    Run as a native Windows NT Service (No CygWin Unix emulation, compiled with MS VC 6.0) 
-    Use PSAPI.LIB for rusage emulation 
-    Internal DNS looks in registry for configured DNS, resolv.conf no more needed 
-    External DNS helper run as a DLL plug-in and use internal NT DNS resolver, so hosts file if used. 
-    All squid -k switches (check, debug, interrupt, kill, parse, reconfigure, rotate, shutdown) works 
-    Native Windows NT Authenticator working as DLL plug-in, is possible to authenticante aginst a single NT Server, a
-    single or a trusted NT Domain. User access allowed by NT User Group membership 
-    NCSA Authenticator working as DLL plug-in 
-    Working htpasswd and chhpasswd.cgi for NCSA password support 
-    LDAP Authenticator working as DLL plug-in (NOT YET TESTED !!!) 
-    Working Cachemgr CGI interface 
-    Code Merged with main Head 21/12/2000 tarball 
-    Buffered Disk I/O 
-
+Run as a native Windows NT Service (No CygWin Unix emulation, compiled with MS VC 6.0) 
+Use PSAPI.LIB for rusage emulation 
+Internal DNS looks in registry for configured DNS, resolv.conf no more needed 
+External DNS helper run as a DLL plug-in and use internal NT DNS resolver, so hosts file if used. 
+All squid -k switches (check, debug, interrupt, kill, parse, reconfigure, rotate, shutdown) works 
+Native Windows NT Authenticator working as DLL plug-in, is possible to authenticante against a single NT Server, a single or a trusted NT Domain. User access allowed by NT User Group membership 
+NCSA Authenticator working as DLL plug-in 
+Working htpasswd and chhpasswd.cgi for NCSA password support 
+LDAP Authenticator working as DLL plug-in (NOT YET TESTED !!!) 
+Working Cachemgr CGI interface 
+Code Merged with main Head 09/01/2001 tarball 
+Buffered Disk I/O 
 Current ChangeLog
 
-    Install: 
-        Edit the squid.conf 
-        Manually create logs directory, etc. 
-        squid -z (creates the cache directories) 
-        squid -i (installs the SquidNT2.3Stable4 beta service) 
-
-    Authenticators configuration: 
-        Edit the squid.conf 
-        Specify the FULL DLL path (with .dll suffix) in the authenticate_program directive plus the correct parameter -
-        See the original authenticator documentation 
-
-    External DNS Helper Plug-in configuration: 
-        Edit the squid.conf 
-        Specify the FULL DLL path (with .dll suffix) in the cache_dns_program directive 
-
-    Uninstall: 
-        squid -r (removes the SquidNT2.3Stable4 beta service) 
-
-    Usage: 
-        Start: Control Panel/Services: choose "Start" for the "SquidNT2.3Stable4 beta" service. 
-        Stop: Control Panel/Services: choose "Stop" for the "SquidNT2.3Stable4 beta" service. 
-        squid -h Print help message. 
-        squid -k reconfigure | rotate | shutdown | interrupt | kill | debug | check
-        Send signal to running copy and exit. 
-        squid -v Print version. 
+Install: 
+Read the CompileOptions.txt file 
+Edit the squid.conf (use path with '/' char, NOT '\') 
+Manually create ALL the directories specified in squid.conf, except the contents of the cache directory 
+squid -z (creates the cache directories) 
+squid -i (installs the SquidNT2.3Stable4 beta service) 
+
+
+Authenticators configuration: 
+Edit the squid.conf 
+Specify the FULL DLL path (with .dll suffix) in the authenticate_program directive plus the correct parameter - See the original authenticator documentation 
+
+
+External DNS Helper Plug-in configuration: 
+Edit the squid.conf 
+Specify the FULL DLL path (with .dll suffix) in the cache_dns_program directive 
+
 
-The results of the rest of the (original) cmdline switches is undeterminate (for the moment). 
+Uninstall: 
+squid -r (removes the SquidNT2.3Stable4 beta service) 
+
+
+Usage: 
+Start: Control Panel/Services: choose "Start" for the "SquidNT2.3Stable4 beta" service. 
+Stop: Control Panel/Services: choose "Stop" for the "SquidNT2.3Stable4 beta" service. 
+squid -f file Set Windows NT Registry to use given config-file instead of default config-file
+squid -h Print help message. 
+squid -k reconfigure | rotate | shutdown | interrupt | kill | debug | check
+Send signal to running copy and exit. 
+squid -v Print version.
+
+The results of the rest of the (original) cmdline switches is undeterminate (for the moment).
+
+
+Compiling: 
+Compile environment needed:
+
+MS Visual Studio C++ 6.0
+Native Perl for NT
+Native sed for NT
+PSAPI files from MS SDK
 
 No warranties of any kind. No time for support, sorry. Use at your own risk.
 
 Original Port and some enhancements by Romeo Anghelache (see the ChangeLog) 
-
Index: squid/WIN32-ChangeLog.txt
===================================================================
RCS file: /cvsroot/squid-sf//squid/Attic/WIN32-ChangeLog.txt,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- squid/WIN32-ChangeLog.txt	25 Mar 2001 16:07:21 -0000	1.1.2.2
+++ squid/WIN32-ChangeLog.txt	25 Mar 2001 17:49:42 -0000	1.1.2.3
@@ -3,7 +3,7 @@
 Plese note, that ALL the Windows NT source addition are encapsulated between
 #ifdef _SQUID_MSWIN_ - #endif sections.
 
-16 Nov 2000 - Initial WIN32 port (Romeo Angelache)
+16 Nov 2000 - Initial WIN32 port (Romeo Anghelache)
 03 Dec 2000 - Added more service functionality, so squid -k works (Guido Serassio)
             - Added PSAPI.LIB for rusage emulation (Guido Serassio)
             - Merged with 21/11/2000 main Head tarball (Guido Serassio)
@@ -26,4 +26,4 @@
 10 Feb 2001 - Fixed a problem with fatal errors handling (Guido Serassio)
 04 Mar 2001 - Merged with 03/03/2001 main Head tarball (Guido Serassio)
 12 Mar 2001 - Enabled -f switch to set Windows NT Registry with an alternate config-file
-              and fixed the config-file not found error when running as a service (Guido Serassio)
\ No newline at end of file
+              and fixed the config-file not found error when running as a service (Guido Serassio)
Index: squid/auth_modules/NT/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/NT/Attic/Makefile.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid/auth_modules/NT/Makefile.in	6 Jan 2001 12:48:44 -0000	1.1.2.1
+++ squid/auth_modules/NT/Makefile.in	25 Mar 2001 17:49:42 -0000	1.1.2.2
@@ -45,7 +45,7 @@
 SHELL		= /bin/sh
 DEFINES		= 
 
-INCLUDE		= -I. -I../../include -I$(top_srcdir)/include -I../../src
+INCLUDE		= -I. -I$(top_srcdir)/include -I$(top_srcdir)/src
 CFLAGS 		= $(AC_CFLAGS) $(INCLUDE) $(DEFINES)
 AUTH_LIBS	= $(XTRA_LIBS) -lnetapi32
 
Index: squid/include/autoconf.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/Attic/autoconf.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- squid/include/autoconf.h	6 Jan 2001 12:51:32 -0000	1.1.2.1
+++ squid/include/autoconf.h	25 Mar 2001 17:49:42 -0000	1.1.2.2
@@ -100,7 +100,7 @@
  * directory.
  */
 #undef USE_USERAGENT_LOG
-#define USE_USERAGENT_LOG 1
+//#define USE_USERAGENT_LOG 1
 
 /*
  * A dangerous feature which causes Squid to kill its parent process
@@ -116,7 +116,7 @@
  * Define to enable WCCP
  */
 #undef USE_WCCP
-//#define USE_WCCP 1
+#define USE_WCCP 1
 
 /*
  * Squid frequently calls gettimeofday() for accurate timestamping.
@@ -276,7 +276,7 @@
  * the dnsserver processes instead.
  */
 #undef USE_DNSSERVERS
-//#define USE_DNSSERVERS 1
+#define USE_DNSSERVERS 1
 /*
  * we check for the existance of struct mallinfo
  */
Index: squid/include/config.h.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/Attic/config.h.in,v
retrieving revision 1.1.1.3.4.1.2.1
retrieving revision 1.1.1.3.4.1.2.2
diff -u -r1.1.1.3.4.1.2.1 -r1.1.1.3.4.1.2.2
--- squid/include/config.h.in	6 Jan 2001 12:40:10 -0000	1.1.1.3.4.1.2.1
+++ squid/include/config.h.in	25 Mar 2001 17:49:42 -0000	1.1.1.3.4.1.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: config.h.in,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:10 hno Exp $
+ * $Id: config.h.in,v 1.1.1.3.4.1.2.2 2001/03/25 17:49:42 serassio Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -97,7 +97,10 @@
 #elif defined(__NetBSD__)
 #define _SQUID_NETBSD_
 
-#elif defined(__CYGWIN32__)  || defined(__CYGWIN__) || defined(WIN32) || defined(WINNT) || defined(__WIN32__) || defined(__WIN32)
+#elif defined(__CYGWIN32__)  || defined(__CYGWIN__) 
+#define _SQUID_CYGWIN_
+
+#elif defined(WIN32) || defined(WINNT) || defined(__WIN32__) || defined(__WIN32)
 #define _SQUID_MSWIN_
 
 #elif defined(__APPLE__)
Index: squid/include/radix.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/radix.h,v
retrieving revision 1.1.1.1.42.1
retrieving revision 1.1.1.1.42.2
diff -u -r1.1.1.1.42.1 -r1.1.1.1.42.2
--- squid/include/radix.h	6 Jan 2001 12:40:10 -0000	1.1.1.1.42.1
+++ squid/include/radix.h	25 Mar 2001 17:49:42 -0000	1.1.1.1.42.2
@@ -1,5 +1,5 @@
 /*
- * $Id: radix.h,v 1.1.1.1.42.1 2001/01/06 12:40:10 hno Exp $
+ * $Id: radix.h,v 1.1.1.1.42.2 2001/03/25 17:49:42 serassio Exp $
  */
 
 /*
@@ -154,5 +154,7 @@
           *rn_newpair __P((void *, int, struct radix_node[2])), *rn_search __P((void *, struct radix_node *)),
           *rn_search_m __P((void *, struct radix_node *, void *));
 
-//#define min(x,y) ((x)<(y)? (x) : (y))
+#ifndef min
+#define min(x,y) ((x)<(y)? (x) : (y))
+#endif
 #endif /* _RADIX_H_ */
Index: squid/include/version.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/version.h,v
retrieving revision 1.1.1.3.4.4.2.1
retrieving revision 1.1.1.3.4.4.2.2
diff -u -r1.1.1.3.4.4.2.1 -r1.1.1.3.4.4.2.2
--- squid/include/version.h	6 Jan 2001 12:40:10 -0000	1.1.1.3.4.4.2.1
+++ squid/include/version.h	25 Mar 2001 17:49:42 -0000	1.1.1.3.4.4.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: version.h,v 1.1.1.3.4.4.2.1 2001/01/06 12:40:10 hno Exp $
+ * $Id: version.h,v 1.1.1.3.4.4.2.2 2001/03/25 17:49:42 serassio Exp $
  *
  *  SQUID_VERSION - String for version id of this distribution
  */
@@ -8,5 +8,5 @@
 #endif
 
 #ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 974851223
+#define SQUID_RELEASE_TIME 983577621
 #endif
Index: squid/lib/rfc1738.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/rfc1738.c,v
retrieving revision 1.1.1.2.4.1.2.1
retrieving revision 1.1.1.2.4.1.2.2
diff -u -r1.1.1.2.4.1.2.1 -r1.1.1.2.4.1.2.2
--- squid/lib/rfc1738.c	6 Jan 2001 12:40:10 -0000	1.1.1.2.4.1.2.1
+++ squid/lib/rfc1738.c	25 Mar 2001 17:49:42 -0000	1.1.1.2.4.1.2.2
@@ -1,5 +1,5 @@
 /*
- * $Id: rfc1738.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:10 hno Exp $
+ * $Id: rfc1738.c,v 1.1.1.2.4.1.2.2 2001/03/25 17:49:42 serassio Exp $
  *
  * DEBUG: 
  * AUTHOR: Harvest Derived
@@ -97,7 +97,7 @@
     if (buf == NULL || strlen(url) * 3 > bufsize) {
 	xfree(buf);
 	bufsize = strlen(url) * 3 + 1;
-	buf = (char* )xcalloc(bufsize, 1);
+	buf = xcalloc(bufsize, 1);
     }
     for (p = url, q = buf; *p != '\0'; p++, q++) {
 	do_escape = 0;
