--------------------- PatchSet 4652 Date: 2002/08/12 19:36:36 Author: serassio Branch: nt-2_5 Tag: (none) Log: Merged latest s2_5 chenges with win32 stuff Members: helpers/basic_auth/LDAP/squid_ldap_auth.c:1.2.8.3->1.2.8.4 helpers/basic_auth/win32_locallogon/NT_auth.c:1.1.4.2->1.1.4.3 lib/win32lib.c:1.1.32.5->1.1.32.6 port/win32/squid.dsw:1.1.2.17->1.1.2.18 port/win32/LDAP_auth/LDAP_auth.dsp:1.1.2.3->1.1.2.4 port/win32/include/squid-mswin.h:1.1.2.11->1.1.2.12 port/win32/squid/buildver.h:1.1.2.10->1.1.2.11 src/fs/awin32/store_io_aufs.c:1.1.62.9->1.1.62.10 Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/basic_auth/LDAP/squid_ldap_auth.c,v retrieving revision 1.2.8.3 retrieving revision 1.2.8.4 diff -u -r1.2.8.3 -r1.2.8.4 --- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c 12 Aug 2002 19:21:20 -0000 1.2.8.3 +++ squid/helpers/basic_auth/LDAP/squid_ldap_auth.c 12 Aug 2002 19:36:36 -0000 1.2.8.4 @@ -47,6 +47,8 @@ * - Allow full filter specifications in -f */ +#include "util.h" + #include #include #include @@ -66,8 +68,6 @@ #include #endif -#include "util.h" - /* Change this to your search base */ static char *basedn; static char *searchfilter = NULL; Index: squid/helpers/basic_auth/win32_locallogon/NT_auth.c =================================================================== RCS file: /cvsroot/squid-sf//squid/helpers/basic_auth/win32_locallogon/Attic/NT_auth.c,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -u -r1.1.4.2 -r1.1.4.3 --- squid/helpers/basic_auth/win32_locallogon/NT_auth.c 21 Jul 2002 09:07:11 -0000 1.1.4.2 +++ squid/helpers/basic_auth/win32_locallogon/NT_auth.c 12 Aug 2002 19:36:37 -0000 1.1.4.3 @@ -152,6 +152,8 @@ fflush(stdout); continue; } + rfc1738_unescape(username); + rfc1738_unescape(password); if (Valid_User(username, password, NTGroup) == NTV_NO_ERROR) puts("OK"); else Index: squid/lib/win32lib.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/win32lib.c,v retrieving revision 1.1.32.5 retrieving revision 1.1.32.6 diff -u -r1.1.32.5 -r1.1.32.6 --- squid/lib/win32lib.c 14 Jul 2002 21:08:52 -0000 1.1.32.5 +++ squid/lib/win32lib.c 12 Aug 2002 19:36:37 -0000 1.1.32.6 @@ -1,5 +1,5 @@ /* - * $Id: win32lib.c,v 1.1.32.5 2002/07/14 21:08:52 serassio Exp $ + * $Id: win32lib.c,v 1.1.32.6 2002/08/12 19:36:37 serassio Exp $ * * * * * * * * * Legal stuff * * * * * * * * @@ -39,6 +39,9 @@ /* The following code section is part of an EXPERIMENTAL native */ /* Windows NT/2000 Squid port - Compiles only on MS Visual C++ */ #if defined(_SQUID_MSWIN_) + +#define sys_nerr _sys_nerr + #undef assert #include #include @@ -411,4 +414,17 @@ return &grp; } +/* + * xbstrerror with argument for late notification */ + +const char * +xbstrerror(int err) +{ + static char xbstrerror_buf[BUFSIZ]; + if (err < 0 || err >= sys_nerr) + return ("Unknown"); + snprintf(xbstrerror_buf, BUFSIZ, "(%d) %s", err, strerror(err)); + return xbstrerror_buf; +} + #endif Index: squid/port/win32/squid.dsw =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid.dsw,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -u -r1.1.2.17 -r1.1.2.18 --- squid/port/win32/squid.dsw 16 Jul 2002 13:00:43 -0000 1.1.2.17 +++ squid/port/win32/squid.dsw 12 Aug 2002 19:36:38 -0000 1.1.2.18 @@ -11,6 +11,9 @@ Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name libmiscutil + End Project Dependency }}} ############################################################################### Index: squid/port/win32/LDAP_auth/LDAP_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/LDAP_auth/Attic/LDAP_auth.dsp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid/port/win32/LDAP_auth/LDAP_auth.dsp 29 Jun 2002 12:58:30 -0000 1.1.2.3 +++ squid/port/win32/LDAP_auth/LDAP_auth.dsp 12 Aug 2002 19:36:38 -0000 1.1.2.4 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD CPP /nologo /G6 /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x410 /d "NDEBUG" @@ -70,7 +70,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x410 /d "_DEBUG" Index: squid/port/win32/include/squid-mswin.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/squid-mswin.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/include/squid-mswin.h 14 Jul 2002 21:07:29 -0000 1.1.2.11 +++ squid/port/win32/include/squid-mswin.h 12 Aug 2002 19:36:38 -0000 1.1.2.12 @@ -1,5 +1,5 @@ /* - * $Id: squid-mswin.h,v 1.1.2.11 2002/07/14 21:07:29 serassio Exp $ + * $Id: squid-mswin.h,v 1.1.2.12 2002/08/12 19:36:38 serassio Exp $ * * AUTHOR: Guido Serassio & Andrey Shorin * @@ -222,15 +222,11 @@ extern __declspec(thread) int ws32_result; -#if !defined(_etext) /* util.c actually */ #define strerror(e) xbstrerror(e) -#else -#define NOT_NEEDED 1 -#endif /* internal to CRTLIB */ /* used also in win32lib.c */ -extern void __cdecl _dosmaperr(unsigned long oserrno); +extern void __cdecl _dosmaperr(unsigned long); #define socket(f,t,p) \ (INVALID_SOCKET == ((SOCKET)ws32_result = socket(f,t,p)) ? \ 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.10 retrieving revision 1.1.2.11 diff -u -r1.1.2.10 -r1.1.2.11 --- squid/port/win32/squid/buildver.h 11 Aug 2002 15:34:30 -0000 1.1.2.10 +++ squid/port/win32/squid/buildver.h 12 Aug 2002 19:36:38 -0000 1.1.2.11 @@ -1,4 +1,4 @@ -#define FILEVER 2,5,10,24 -#define PRODUCTVER 2,5,10,24 -#define STRFILEVER "2, 5, 10, 24\0" -#define STRPRODUCTVER "2, 5, 10, 24\0" +#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" Index: squid/src/fs/awin32/store_io_aufs.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/awin32/Attic/store_io_aufs.c,v retrieving revision 1.1.62.9 retrieving revision 1.1.62.10 diff -u -r1.1.62.9 -r1.1.62.10 --- squid/src/fs/awin32/store_io_aufs.c 9 Aug 2002 20:19:09 -0000 1.1.62.9 +++ squid/src/fs/awin32/store_io_aufs.c 12 Aug 2002 19:36:39 -0000 1.1.62.10 @@ -1,6 +1,6 @@ /* - * $Id: store_io_aufs.c,v 1.1.62.9 2002/08/09 20:19:09 serassio Exp $ + * $Id: store_io_aufs.c,v 1.1.62.10 2002/08/12 19:36:39 serassio Exp $ * * DEBUG: section 79 Storage Manager awin32 Interface * AUTHOR: Robert Collins @@ -316,10 +316,13 @@ aiostate->fd = fd; commSetCloseOnExec(fd); fd_open(fd, FD_FILE, storeAufsDirFullPath(INDEXSD(sio->swap_dirn), sio->swap_filen, NULL)); - if (FILE_MODE(sio->mode) == O_WRONLY) - storeAufsKickWriteQueue(sio); - else if (FILE_MODE(sio->mode) == O_RDONLY) - storeAufsKickReadQueue(sio); + if (FILE_MODE(sio->mode) == O_WRONLY) { + if (storeAufsKickWriteQueue(sio)) + return; + } else if (FILE_MODE(sio->mode) == O_RDONLY) { + if (storeAufsKickReadQueue(sio)) + return; + } if (aiostate->flags.close_request) storeAufsIOCallback(sio, errflag); debug(79, 3) ("storeAufsOpenDone: exiting\n");