--------------------- PatchSet 816 Date: 2003/07/13 12:58:10 Author: serassio Branch: nt Tag: (none) Log: Updated MSVC project and accessory files Members: port/win32/store_modules.cmd:1.2.18.1->1.2.18.2 port/win32/include/autoconf.h:1.2.18.2->1.2.18.3 port/win32/include/squid-mswin.h:1.3.18.3->1.3.18.4 port/win32/libdigest/libdigest.dsp:1.2.18.1->1.2.18.2 port/win32/libntlm/libntlm.dsp:1.2.18.1->1.2.18.2 port/win32/squid/squid.dsp:1.2.18.3->1.2.18.4 Index: squid3/port/win32/store_modules.cmd =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/store_modules.cmd,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -r1.2.18.1 -r1.2.18.2 --- squid3/port/win32/store_modules.cmd 25 Feb 2003 02:48:38 -0000 1.2.18.1 +++ squid3/port/win32/store_modules.cmd 13 Jul 2003 12:58:10 -0000 1.2.18.2 @@ -12,6 +12,6 @@ for /F %%m in (%temp%\store_modules.txt) do echo extern STSETUP storeFsSetup_%%m; echo void storeFsSetup(void) echo { -for /F %%m in (%temp%\store_modules.txt) do echo storeFsAdd("%%m", storeFsSetup_%%m); +for /F %%m in (%temp%\store_modules.txt) do echo StoreEntry::FsAdd("%%m", storeFsSetup_%%m); echo } if exist %temp%\store_modules.txt del %temp%\store_modules.txt Index: squid3/port/win32/include/autoconf.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/include/Attic/autoconf.h,v retrieving revision 1.2.18.2 retrieving revision 1.2.18.3 diff -u -r1.2.18.2 -r1.2.18.3 --- squid3/port/win32/include/autoconf.h 13 Mar 2003 21:02:06 -0000 1.2.18.2 +++ squid3/port/win32/include/autoconf.h 13 Jul 2003 12:58:10 -0000 1.2.18.3 @@ -38,7 +38,7 @@ #define DEFAULT_FD_SETSIZE 256 /* Traffic management via "delay pools". */ -/* #undef DELAY_POOLS */ +#define DELAY_POOLS 1 /* Define if you have problems with memPools and want to disable Pools */ /* #undef DISABLE_POOLS */ @@ -757,7 +757,7 @@ #define USE_ICMP 1 /* Compile in support for Ident (RFC 931) lookups? Enabled by default. */ -/* #undef USE_IDENT */ +#define USE_IDENT 1 /* Use kqueue() for the IO loop */ /* #undef USE_KQUEUE */ Index: squid3/port/win32/include/squid-mswin.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/include/Attic/squid-mswin.h,v retrieving revision 1.3.18.3 retrieving revision 1.3.18.4 diff -u -r1.3.18.3 -r1.3.18.4 --- squid3/port/win32/include/squid-mswin.h 1 May 2003 21:45:43 -0000 1.3.18.3 +++ squid3/port/win32/include/squid-mswin.h 13 Jul 2003 12:58:10 -0000 1.3.18.4 @@ -1,5 +1,5 @@ /* - * $Id: squid-mswin.h,v 1.3.18.3 2003/05/01 21:45:43 serassio Exp $ + * $Id: squid-mswin.h,v 1.3.18.4 2003/07/13 12:58:10 serassio Exp $ * * AUTHOR: Guido Serassio & Andrey Shorin * @@ -482,7 +482,10 @@ int result; if ((result = ::recv(_get_osfhandle(s), (char *)b, l, f)) == SOCKET_ERROR) { errno = WSAGetLastError(); - return -1; + if ((errno == WSAESHUTDOWN) || (errno == WSAECONNABORTED) || (errno == WSAECONNRESET)) + return 0; + else + return -1; } else return result; Index: squid3/port/win32/libdigest/libdigest.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libdigest/Attic/libdigest.dsp,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -r1.2.18.1 -r1.2.18.2 --- squid3/port/win32/libdigest/libdigest.dsp 25 Feb 2003 02:48:50 -0000 1.2.18.1 +++ squid3/port/win32/libdigest/libdigest.dsp 13 Jul 2003 12:58:10 -0000 1.2.18.2 @@ -41,7 +41,7 @@ # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /TP /c +# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /TP /c # ADD BASE RSC /l 0x410 /d "NDEBUG" # ADD RSC /l 0x410 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c # ADD BASE RSC /l 0x410 /d "_DEBUG" # ADD RSC /l 0x410 /d "_DEBUG" BSC32=bscmake.exe Index: squid3/port/win32/libntlm/libntlm.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libntlm/Attic/libntlm.dsp,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -r1.2.18.1 -r1.2.18.2 --- squid3/port/win32/libntlm/libntlm.dsp 25 Feb 2003 02:48:53 -0000 1.2.18.1 +++ squid3/port/win32/libntlm/libntlm.dsp 13 Jul 2003 12:58:10 -0000 1.2.18.2 @@ -41,7 +41,7 @@ # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /TP /c +# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /TP /c # ADD BASE RSC /l 0x410 /d "NDEBUG" # ADD RSC /l 0x410 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c # ADD BASE RSC /l 0x410 /d "_DEBUG" # ADD RSC /l 0x410 /d "_DEBUG" BSC32=bscmake.exe Index: squid3/port/win32/squid/squid.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/squid/Attic/squid.dsp,v retrieving revision 1.2.18.3 retrieving revision 1.2.18.4 diff -u -r1.2.18.3 -r1.2.18.4 --- squid3/port/win32/squid/squid.dsp 1 May 2003 22:59:19 -0000 1.2.18.3 +++ squid3/port/win32/squid/squid.dsp 13 Jul 2003 12:58:10 -0000 1.2.18.4 @@ -42,7 +42,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../" /I "../include" /I "../../../include" /I "../../../src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /TP /c +# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "../../" /I "../include" /I "../../../include" /I "../../../src" /I "../../../lib/libtrie/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /TP /c # ADD BASE RSC /l 0x410 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -67,7 +67,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../../include" /I "../../../src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "../include" /I "../../../include" /I "../../../src" /I "../../../lib/libtrie/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c # ADD BASE RSC /l 0x410 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -116,6 +116,10 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\DelayTagged.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\DelayUser.cc # End Source File # Begin Source File @@ -132,10 +136,6 @@ # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\..\src\ACLARP.cc -# End Source File -# Begin Source File - SOURCE=..\..\..\src\ACLASN.cc # End Source File # Begin Source File @@ -164,6 +164,11 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\ACLExtUser.cc +# ADD CPP /I "../../../lib/libtrie/include" +# End Source File +# Begin Source File + SOURCE=..\..\..\src\ACLIdent.cc # End Source File # Begin Source File @@ -244,6 +249,10 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\ACLTime.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\ACLTimeData.cc # End Source File # Begin Source File @@ -263,6 +272,42 @@ SOURCE=..\..\..\src\ACLUserData.cc # End Source File # End Group +# Begin Group "ESI Sources" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\..\src\ESI.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ESIContext.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ESICustomParser.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ESIExpatParser.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ESIExpression.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ESIParser.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ESISegment.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ESISequence.cc +# End Source File +# End Group # Begin Source File SOURCE=..\..\..\src\access_log.cc @@ -333,6 +378,18 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\comm_epoll.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\comm_kqueue.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\comm_poll.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\comm_select.cc # End Source File # Begin Source File @@ -369,6 +426,10 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\ExternalACLEntry.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\fd.cc # End Source File # Begin Source File @@ -429,6 +490,14 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\HttpHdrSc.cc +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\HttpHdrScTarget.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\HttpHeader.cc # End Source File # Begin Source File