--------------------- PatchSet 2984 Date: 2001/09/09 10:10:12 Author: serassio Branch: nt-2_3 Tag: (none) Log: Updated rc files to STABLE5 revision, updated WIN32 docs Members: auth_modules/LDAP/LDAP_auth.rc:1.1.2.1->1.1.2.2 auth_modules/NCSA/NCSA_auth.rc:1.1.2.1->1.1.2.2 auth_modules/NT/NT_auth.rc:1.1.2.1->1.1.2.2 auth_modules/NT/Readme.txt:1.1.2.1->1.1.2.2 contrib/chpasswd/chpasswd.rc:1.1.2.1->1.1.2.2 contrib/htpasswd/htpasswd.rc:1.1.2.1->1.1.2.2 doc/WIN32-ChangeLog.txt:1.1.2.3->1.1.2.4 src/fd.c:1.1.1.3.4.1.2.2->1.1.1.3.4.1.2.3 win/squid.rc:1.1.2.1->1.1.2.2 win/cachemgr/cachemgr.rc:1.1.2.1->1.1.2.2 win/dnsserver/dnsserver.rc:1.1.2.1->1.1.2.2 Index: squid/auth_modules/LDAP/LDAP_auth.rc =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/LDAP/Attic/LDAP_auth.rc,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/LDAP/LDAP_auth.rc 6 Jan 2001 12:48:44 -0000 1.1.2.1 +++ squid/auth_modules/LDAP/LDAP_auth.rc 9 Sep 2001 10:10:12 -0000 1.1.2.2 @@ -49,13 +49,13 @@ VALUE "FileDescription", "SquidNT - LDAP Authenticator DLL plug-in\0" VALUE "FileVersion", "1, 0, 0, 1\0" VALUE "InternalName", "LDAP_auth\0" - VALUE "LegalCopyright", "Romeo Anghelache & Guido Serassio\0" + VALUE "LegalCopyright", "Romeo Anghelache, Guido Serassio & Andrey Shorin\0" VALUE "LegalTrademarks", "GNU gpl\0" VALUE "OriginalFilename", "LDAP_auth.dll\0" - VALUE "PrivateBuild", "STABLE4\0" + VALUE "PrivateBuild", "STABLE5\0" VALUE "ProductName", "Squid Proxy Server for Windows NT\0" VALUE "ProductVersion", "2.3\0" - VALUE "SpecialBuild", "STABLE4\0" + VALUE "SpecialBuild", "STABLE5\0" END END BLOCK "VarFileInfo" Index: squid/auth_modules/NCSA/NCSA_auth.rc =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/NCSA/Attic/NCSA_auth.rc,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/NCSA/NCSA_auth.rc 6 Jan 2001 12:48:44 -0000 1.1.2.1 +++ squid/auth_modules/NCSA/NCSA_auth.rc 9 Sep 2001 10:10:12 -0000 1.1.2.2 @@ -49,13 +49,13 @@ VALUE "FileDescription", "SquidNT - NCSA Authenticator DLL plug-in\0" VALUE "FileVersion", "1, 0, 0, 1\0" VALUE "InternalName", "NCSA_auth\0" - VALUE "LegalCopyright", "Romeo Anghelache & Guido Serassio\0" + VALUE "LegalCopyright", "Romeo Anghelache, Guido Serassio & Andrey Shorin\0" VALUE "LegalTrademarks", "GNU gpl\0" VALUE "OriginalFilename", "NCSA_auth.dll\0" - VALUE "PrivateBuild", "STABLE4\0" + VALUE "PrivateBuild", "STABLE5\0" VALUE "ProductName", "Squid Proxy Server for Windows NT\0" VALUE "ProductVersion", "2.3\0" - VALUE "SpecialBuild", "STABLE4\0" + VALUE "SpecialBuild", "STABLE5\0" END END BLOCK "VarFileInfo" Index: squid/auth_modules/NT/NT_auth.rc =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/NT/Attic/NT_auth.rc,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/NT_auth.rc 6 Jan 2001 12:48:44 -0000 1.1.2.1 +++ squid/auth_modules/NT/NT_auth.rc 9 Sep 2001 10:10:12 -0000 1.1.2.2 @@ -49,13 +49,13 @@ VALUE "FileDescription", "SquidNT - NT Authenticator DLL plug-in\0" VALUE "FileVersion", "1, 0, 0, 1\0" VALUE "InternalName", "NT_auth\0" - VALUE "LegalCopyright", "Romeo Anghelache & Guido Serassio\0" + VALUE "LegalCopyright", "Romeo Anghelache, Guido Serassio & Andrey Shorin\0" VALUE "LegalTrademarks", "GNU gpl\0" VALUE "OriginalFilename", "NT_auth.dll\0" - VALUE "PrivateBuild", "STABLE4\0" + VALUE "PrivateBuild", "STABLE5\0" VALUE "ProductName", "Squid Proxy Server for Windows NT\0" VALUE "ProductVersion", "2.3\0" - VALUE "SpecialBuild", "STABLE4\0" + VALUE "SpecialBuild", "STABLE5\0" END END BLOCK "VarFileInfo" Index: squid/auth_modules/NT/Readme.txt =================================================================== RCS file: /cvsroot/squid-sf//squid/auth_modules/NT/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/auth_modules/NT/Readme.txt 6 Jan 2001 12:48:44 -0000 1.1.2.1 +++ squid/auth_modules/NT/Readme.txt 9 Sep 2001 10:10:12 -0000 1.1.2.2 @@ -47,7 +47,7 @@ The Makefile assumes that GCC is in the current PATH. nt_auth compile ONLY on GygWin Environment or MS VC++. Note: Under MS VC++ this package compile as a dll, an work only with my release -of native NT Squid 2.3 Stable4 port. +of native NT Squid 2.3 Stable5 port. Testing - Index: squid/contrib/chpasswd/chpasswd.rc =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/chpasswd/Attic/chpasswd.rc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/contrib/chpasswd/chpasswd.rc 6 Jan 2001 12:48:44 -0000 1.1.2.1 +++ squid/contrib/chpasswd/chpasswd.rc 9 Sep 2001 10:10:13 -0000 1.1.2.2 @@ -49,13 +49,13 @@ VALUE "FileDescription", "SquidNT - CGI NCSA Password Manager\0" VALUE "FileVersion", "1, 0, 0, 1\0" VALUE "InternalName", "chpasswd\0" - VALUE "LegalCopyright", "Romeo Anghelache & Guido Serassio\0" + VALUE "LegalCopyright", "Romeo Anghelache, Guido Serassio & Andrey Shorin\0" VALUE "LegalTrademarks", "GNU gpl\0" VALUE "OriginalFilename", "chpasswd.exe\0" - VALUE "PrivateBuild", "STABLE4\0" + VALUE "PrivateBuild", "STABLE5\0" VALUE "ProductName", "Squid Proxy Server for Windows NT\0" VALUE "ProductVersion", "2.3\0" - VALUE "SpecialBuild", "STABLE4\0" + VALUE "SpecialBuild", "STABLE5\0" END END BLOCK "VarFileInfo" Index: squid/contrib/htpasswd/htpasswd.rc =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/htpasswd/Attic/htpasswd.rc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/contrib/htpasswd/htpasswd.rc 6 Jan 2001 12:48:45 -0000 1.1.2.1 +++ squid/contrib/htpasswd/htpasswd.rc 9 Sep 2001 10:10:13 -0000 1.1.2.2 @@ -49,13 +49,13 @@ VALUE "FileDescription", "SquidNT - NCSA Password Manager\0" VALUE "FileVersion", "1, 0, 0, 1\0" VALUE "InternalName", "htpasswd\0" - VALUE "LegalCopyright", "Romeo Anghelache & Guido Serassio\0" + VALUE "LegalCopyright", "Romeo Anghelache, Guido Serassio & Andrey Shorin\0" VALUE "LegalTrademarks", "GNU gpl\0" VALUE "OriginalFilename", "htpasswd.exe\0" - VALUE "PrivateBuild", "STABLE4\0" + VALUE "PrivateBuild", "STABLE5\0" VALUE "ProductName", "Squid Proxy Server for Windows NT\0" VALUE "ProductVersion", "2.3\0" - VALUE "SpecialBuild", "STABLE4\0" + VALUE "SpecialBuild", "STABLE5\0" END END BLOCK "VarFileInfo" Index: squid/doc/WIN32-ChangeLog.txt =================================================================== RCS file: /cvsroot/squid-sf//squid/doc/Attic/WIN32-ChangeLog.txt,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid/doc/WIN32-ChangeLog.txt 13 Aug 2001 17:09:16 -0000 1.1.2.3 +++ squid/doc/WIN32-ChangeLog.txt 9 Sep 2001 10:10:13 -0000 1.1.2.4 @@ -3,32 +3,32 @@ Plese note, that ALL the Windows NT source addition are encapsulated between #ifdef _SQUID_MSWIN_ - #endif sections. -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) - - Internal DNS looks in registry for configured DNS (Guido Serassio) - - Added WIN32 EXE file version information (Guido Serassio) -06 Dec 2000 - cachemgr.exe done (Romeo Anghelache) - - patched comm_select to handle service_not_available in win32 (Romeo Anghelache) -09 Dec 2000 - Fixed a problem with log files rotate (Guido Serassio) - - Added native Windows NT Authenticator working as DLL (Guido Serassio) -10 Dec 2000 - Added NCSA Authenticator working as DLL (Guido Serassio) - - Added crypt function to source (Guido Serassio) - - Ported htpasswd and chhpasswd.cgi for NCSA password support (Guido Serassio) - - Added dnsserver helper running as DLL (Guido Serassio) -11 Dec 2000 - Added LDAP Authenticator working as DLL - NOT YET TESTED !!! (Guido Serassio) -14 Dec 2000 - Disk I/O is now buffered (Romeo Anghelache) -21 Dec 2000 - Merged with 21/12/2000 main Head tarball (Guido Serassio) -11 Jan 2001 - Merged with 09/01/2001 main Head tarball (Guido Serassio) +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) + - Internal DNS looks in registry for configured DNS - (Guido Serassio) + - Added WIN32 EXE file version information - (Guido Serassio) +06 Dec 2000 - cachemgr.exe done - (Romeo Anghelache) + - patched comm_select to handle service_not_available in win32 - (Romeo Anghelache) +09 Dec 2000 - Fixed a problem with log files rotate - (Guido Serassio) + - Added native Windows NT Authenticator working as DLL - (Guido Serassio) +10 Dec 2000 - Added NCSA Authenticator working as DLL - (Guido Serassio) + - Added crypt function to source - (Guido Serassio) + - Ported htpasswd and chhpasswd.cgi for NCSA password support - (Guido Serassio) + - Added dnsserver helper running as DLL - (Guido Serassio) +11 Dec 2000 - Added LDAP Authenticator working as DLL - NOT YET TESTED !!! - (Guido Serassio) +14 Dec 2000 - Disk I/O is now buffered - (Romeo Anghelache) +21 Dec 2000 - Merged with 21/12/2000 main Head tarball - (Guido Serassio) +11 Jan 2001 - Merged with 09/01/2001 main Head tarball - (Guido Serassio) 28 Jan 2001 - Restored use of perl scripts, sed and cf_gen during compile phase - No more - code enhancement (Guido Serassio) -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) + code enhancement - (Guido Serassio) +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) + and fixed the config-file not found error when running as a service - (Guido Serassio) 16 Jun 2001 - Fixed a bug in the native Windows NT Authenticator when authentication is made - against a NT domain (Guido Serassio) + against a NT domain - (Guido Serassio) - Fixed a bug in free disk space determination - (Guido Serassio) - Fixed various memory leaks (Backported patches) - (Guido Serassio) 17 Jun 2001 - Backported WIN32 code from 2.5 DEVEL. Now is possible to run multiple instances of @@ -42,3 +42,5 @@ 15 Jul 2001 - Enabled SNMP functionality - (Guido Serassio) 31 Jul 2001 - Merged code enhancement from Andrey Shorin - (Guido Serassio) 13 Aug 2001 - Added support for Service command line with -O switch - (Guido Serassio) +01 Sep 2001 - Fixed swap.state log files handling - (Guido Serassio) +08 Sep 2001 - Multiple minor bugs fixes - (Guido Serassio) Index: squid/src/fd.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fd.c,v retrieving revision 1.1.1.3.4.1.2.2 retrieving revision 1.1.1.3.4.1.2.3 diff -u -r1.1.1.3.4.1.2.2 -r1.1.1.3.4.1.2.3 --- squid/src/fd.c 29 Jul 2001 09:10:28 -0000 1.1.1.3.4.1.2.2 +++ squid/src/fd.c 9 Sep 2001 10:10:14 -0000 1.1.1.3.4.1.2.3 @@ -1,6 +1,6 @@ /* - * $Id: fd.c,v 1.1.1.3.4.1.2.2 2001/07/29 09:10:28 serassio Exp $ + * $Id: fd.c,v 1.1.1.3.4.1.2.3 2001/09/09 10:10:14 serassio Exp $ * * DEBUG: section 51 Filedescriptor Functions * AUTHOR: Duane Wessels @@ -178,9 +178,6 @@ } debug(51, 3) ("fd_close FD %d %s\n", fd, F->desc); F->flags.open = 0; -//#ifdef _SQUID_MSWIN_ -// F->fbuf = NULL; -//#endif fdUpdateBiggest(fd, 0); Number_FD--; commUpdateReadBits(fd, NULL); Index: squid/win/squid.rc =================================================================== RCS file: /cvsroot/squid-sf//squid/win/Attic/squid.rc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/win/squid.rc 6 Jan 2001 12:40:17 -0000 1.1.2.1 +++ squid/win/squid.rc 9 Sep 2001 10:10:14 -0000 1.1.2.2 @@ -49,13 +49,13 @@ VALUE "FileDescription", "SquidNT - Main executable\0" VALUE "FileVersion", "1, 0, 0, 1\0" VALUE "InternalName", "squid\0" - VALUE "LegalCopyright", "Romeo Anghelache & Guido Serassio\0" + VALUE "LegalCopyright", "Romeo Anghelache, Guido Serassio & Andrey Shorin\0" VALUE "LegalTrademarks", "GNU gpl\0" VALUE "OriginalFilename", "squid.exe\0" - VALUE "PrivateBuild", "STABLE4\0" + VALUE "PrivateBuild", "STABLE5\0" VALUE "ProductName", "Squid Proxy Server for Windows NT\0" VALUE "ProductVersion", "2.3\0" - VALUE "SpecialBuild", "STABLE4\0" + VALUE "SpecialBuild", "STABLE5\0" END END BLOCK "VarFileInfo" Index: squid/win/cachemgr/cachemgr.rc =================================================================== RCS file: /cvsroot/squid-sf//squid/win/cachemgr/Attic/cachemgr.rc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/win/cachemgr/cachemgr.rc 6 Jan 2001 12:40:17 -0000 1.1.2.1 +++ squid/win/cachemgr/cachemgr.rc 9 Sep 2001 10:10:14 -0000 1.1.2.2 @@ -49,13 +49,13 @@ VALUE "FileDescription", "SquidNT - CGI Cache Manager\0" VALUE "FileVersion", "1, 0, 0, 1\0" VALUE "InternalName", "cachemgr\0" - VALUE "LegalCopyright", "Romeo Anghelache & Guido Serassio\0" + VALUE "LegalCopyright", "Romeo Anghelache, Guido Serassio & Andrey Shorin\0" VALUE "LegalTrademarks", "GNU gpl\0" VALUE "OriginalFilename", "cachemgr.exe\0" - VALUE "PrivateBuild", "STABLE4\0" + VALUE "PrivateBuild", "STABLE5\0" VALUE "ProductName", "Squid Proxy Server for Windows NT\0" VALUE "ProductVersion", "2.3\0" - VALUE "SpecialBuild", "STABLE4\0" + VALUE "SpecialBuild", "STABLE5\0" END END BLOCK "VarFileInfo" Index: squid/win/dnsserver/dnsserver.rc =================================================================== RCS file: /cvsroot/squid-sf//squid/win/dnsserver/Attic/dnsserver.rc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/win/dnsserver/dnsserver.rc 6 Jan 2001 12:40:17 -0000 1.1.2.1 +++ squid/win/dnsserver/dnsserver.rc 9 Sep 2001 10:10:15 -0000 1.1.2.2 @@ -49,13 +49,13 @@ VALUE "FileDescription", "SquidNT - DNS Server DLL plug-in\0" VALUE "FileVersion", "1, 0, 0, 1\0" VALUE "InternalName", "dnsserver\0" - VALUE "LegalCopyright", "Romeo Anghelache & Guido Serassio\0" + VALUE "LegalCopyright", "Romeo Anghelache, Guido Serassio & Andrey Shorin\0" VALUE "LegalTrademarks", "GNU gpl\0" VALUE "OriginalFilename", "dnsserver.dll\0" - VALUE "PrivateBuild", "STABLE4\0" + VALUE "PrivateBuild", "STABLE5\0" VALUE "ProductName", "Squid Proxy Server for Windows NT\0" VALUE "ProductVersion", "2.3\0" - VALUE "SpecialBuild", "STABLE4\0" + VALUE "SpecialBuild", "STABLE5\0" END END BLOCK "VarFileInfo"