--------------------- PatchSet 3005 Date: 2001/09/10 20:25:55 Author: serassio Branch: nt-2_3 Tag: (none) Log: Updated configure files, some cosmetic changes Members: configure.in:1.1.1.3.4.5.2.3->1.1.1.3.4.5.2.4 contrib/chpasswd/chpasswd.c:1.1.2.1->1.1.2.2 contrib/chpasswd/chpasswd.dsp:1.1.2.3->1.1.2.4 contrib/chpasswd/chpasswd.mak:1.1.2.3->1.1.2.4 contrib/htpasswd/htpasswd.dsp:1.1.2.3->1.1.2.4 contrib/htpasswd/htpasswd.mak:1.1.2.3->1.1.2.4 include/config.h:1.1.2.6->1.1.2.7 include/config.h.in:1.1.1.3.4.1.2.5->1.1.1.3.4.1.2.6 include/squid-mswin.h:1.1.2.1->1.1.2.2 src/authenticate.c:1.1.1.3.4.1.2.3->1.1.1.3.4.1.2.4 src/cachemgr.c:1.1.1.3.4.1.2.3->1.1.1.3.4.1.2.4 src/gopher.c:1.1.1.3.4.2.2.1->1.1.1.3.4.2.2.2 src/http.c:1.1.1.3.4.3.2.3->1.1.1.3.4.3.2.4 src/useragent.c:1.1.1.3.4.1.2.13->1.1.1.3.4.1.2.14 src/wccp.c:1.1.1.1.4.2.2.3->1.1.1.1.4.2.2.4 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.1.1.3.4.5.2.3 retrieving revision 1.1.1.3.4.5.2.4 diff -u -r1.1.1.3.4.5.2.3 -r1.1.1.3.4.5.2.4 --- squid/configure.in 19 Aug 2001 19:47:00 -0000 1.1.1.3.4.5.2.3 +++ squid/configure.in 10 Sep 2001 20:25:55 -0000 1.1.1.3.4.5.2.4 @@ -3,13 +3,13 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.1.1.3.4.5.2.3 2001/08/19 19:47:00 serassio Exp $ +dnl $Id: configure.in,v 1.1.1.3.4.5.2.4 2001/09/10 20:25:55 serassio Exp $ dnl dnl dnl AC_INIT(src/main.c) AC_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.1.1.3.4.5.2.3 $)dnl +AC_REVISION($Revision: 1.1.1.3.4.5.2.4 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AC_CONFIG_AUX_DIR(cfgaux) @@ -30,6 +30,19 @@ dnl use .exe suffix for executables on cygwin32 platform case "$host_os" in cygwin|cygwin32|os2|winnt) + exec_suffix=".exe" + cgi_suffix=".exe" + ;; +*) + exec_suffix="" + cgi_suffix=".cgi" + ;; +esac +AC_SUBST(exec_suffix) +AC_SUBST(cgi_suffix) + +case "$host_os" in +cygwin|cygwin32|winnt) AC_PATH_PROG(WIN32_PSAPI, psapi.dll, none) if test "$ac_cv_path_WIN32_PSAPI" = "none"; then echo "PSAPI.DLL is reccommended to run Squid on Windows NT Platform" @@ -39,19 +52,15 @@ AC_DEFINE(HAVE_WIN32_PSAPI) WIN32_LIBS="-lpsapi" fi - exec_suffix=".exe" - cgi_suffix=".exe" WIN32_OBJS="win32.o" ;; *) - exec_suffix="" - cgi_suffix=".cgi" WIN32_OBJS="" WIN32_LIBS="" ;; esac -AC_SUBST(exec_suffix) -AC_SUBST(cgi_suffix) +AC_SUBST(WIN32_OBJS) +AC_SUBST(WIN32_LIBS) if test -z "$CACHE_HTTP_PORT"; then CACHE_HTTP_PORT="3128" @@ -76,9 +85,6 @@ dnl Check for GNU cc AC_PROG_CC -dnl Can the CC program be asked to use the Win32 API? -dnl AC_API_WIN32 - dnl Gerben Wierda case "$host" in mab-next-nextstep3) Index: squid/contrib/chpasswd/chpasswd.c =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/chpasswd/Attic/chpasswd.c,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.c 6 Jan 2001 12:48:44 -0000 1.1.2.1 +++ squid/contrib/chpasswd/chpasswd.c 10 Sep 2001 20:25:55 -0000 1.1.2.2 @@ -266,7 +266,7 @@ fclose(fpw); if (tmp) { fclose(tmp); - unlink(tmp); +// unlink(tmp); } return; } Index: squid/contrib/chpasswd/chpasswd.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/chpasswd/Attic/chpasswd.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/contrib/chpasswd/chpasswd.dsp 30 Jun 2001 18:42:07 -0000 1.1.2.3 +++ squid/contrib/chpasswd/chpasswd.dsp 10 Sep 2001 20:25:55 -0000 1.1.2.4 @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib /nologo /subsystem:console /machine:I386 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "chpasswd - Win32 Debug" @@ -80,7 +80,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF Index: squid/contrib/chpasswd/chpasswd.mak =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/chpasswd/Attic/chpasswd.mak,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid/contrib/chpasswd/chpasswd.mak 30 Jun 2001 18:42:07 -0000 1.1.2.3 +++ squid/contrib/chpasswd/chpasswd.mak 10 Sep 2001 20:25:55 -0000 1.1.2.4 @@ -58,7 +58,7 @@ BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\chpasswd.pdb" /machine:I386 /out:"$(OUTDIR)\chpasswd.exe" +LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\chpasswd.pdb" /machine:I386 /out:"$(OUTDIR)\chpasswd.exe" LINK32_OBJS= \ "$(INTDIR)\chpasswd.obj" \ "$(INTDIR)\encrypt.obj" \ @@ -101,7 +101,7 @@ BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\chpasswd.pdb" /debug /machine:I386 /out:"$(OUTDIR)\chpasswd.exe" /pdbtype:sept +LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\chpasswd.pdb" /debug /machine:I386 /out:"$(OUTDIR)\chpasswd.exe" /pdbtype:sept LINK32_OBJS= \ "$(INTDIR)\chpasswd.obj" \ "$(INTDIR)\encrypt.obj" \ Index: squid/contrib/htpasswd/htpasswd.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/htpasswd/Attic/htpasswd.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/contrib/htpasswd/htpasswd.dsp 30 Jun 2001 18:42:07 -0000 1.1.2.3 +++ squid/contrib/htpasswd/htpasswd.dsp 10 Sep 2001 20:25:56 -0000 1.1.2.4 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib advapi32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "htpasswd - Win32 Debug" @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF Index: squid/contrib/htpasswd/htpasswd.mak =================================================================== RCS file: /cvsroot/squid-sf//squid/contrib/htpasswd/Attic/htpasswd.mak,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid/contrib/htpasswd/htpasswd.mak 30 Jun 2001 18:42:07 -0000 1.1.2.3 +++ squid/contrib/htpasswd/htpasswd.mak 10 Sep 2001 20:25:56 -0000 1.1.2.4 @@ -56,7 +56,7 @@ BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\htpasswd.pdb" /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" +LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\htpasswd.pdb" /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" LINK32_OBJS= \ "$(INTDIR)\encrypt.obj" \ "$(INTDIR)\htpasswd.obj" \ @@ -98,7 +98,7 @@ BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept +LINK32_FLAGS=kernel32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:I386 /out:"$(OUTDIR)\htpasswd.exe" /pdbtype:sept LINK32_OBJS= \ "$(INTDIR)\encrypt.obj" \ "$(INTDIR)\htpasswd.obj" \ Index: squid/include/config.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/config.h,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -r1.1.2.6 -r1.1.2.7 --- squid/include/config.h 15 Jul 2001 16:58:37 -0000 1.1.2.6 +++ squid/include/config.h 10 Sep 2001 20:25:56 -0000 1.1.2.7 @@ -102,85 +102,7 @@ #elif defined(WIN32) || defined(WINNT) || defined(__WIN32__) || defined(__WIN32) #define _SQUID_MSWIN_ - -/* Some tricks for MS Compilers */ -#define alloca _alloca -#define chdir _chdir -#define getcwd _getcwd -#define getpid _getpid -#define setmode _setmode -#define snprintf _snprintf -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#define vsnprintf _vsnprintf -#define O_BYNARY _O_BINARY -#define O_TEXT _O_TEXT -#define S_IRWXO 007 -#define S_ISDIR(m) (((m) & _S_IFDIR) == _S_IFDIR) -#define ushort unsigned short int -#define uid_t int -#define gid_t int - -#define CHANGE_FD_SETSIZE 1 -#if CHANGE_FD_SETSIZE && SQUID_MAXFD > DEFAULT_FD_SETSIZE -#define FD_SETSIZE SQUID_MAXFD -#endif - -#include -#include -#include "readdir.h" - -typedef char *caddr_t; -#undef FD_CLOSE -#undef FD_OPEN -#undef FD_READ -#undef FD_WRITE -#define EISCONN WSAEISCONN -#define EINPROGRESS WSAEINPROGRESS -#define EWOULDBLOCK WSAEWOULDBLOCK -#define EALREADY WSAEALREADY -#define ETIMEDOUT WSAETIMEDOUT - -#if defined (COMM_C) || defined (COMM_SELECT_C) -#define recv(x,y,z) recv(x,y,z,0) -#define send(x,y,z) send(x,y,z,0) -#define fd_bytes(x,y,z) sd_bytes(x,y,z) -#define fd_note(x,y) sd_note(x,y) -#define fd_open(x,y,z) sd_open(x,y,z) -#define fd_close(x) sd_close(x) -#define ignoreErrno(x) WSAignoreErrno(x) -#endif - -#if defined (ICP_V2_C) -#define fd_note(x,y) sd_note(x,y) -#define ignoreErrno(x) WSAignoreErrno(x) -#define commSetSelect(x,y,z,u,v) commSetSelectS(x,y,z,u,v) -#endif - -#if defined (SNMP_CORE_C) -#define fd_note(x,y) sd_note(x,y) -#define commSetSelect(x,y,z,u,v) commSetSelectS(x,y,z,u,v) -#endif - -#if defined(WHOIS_C) || defined(WAIS_C) -#define send(x,y,z) send(x,y,z,0) -#define recv(x,y,z) recv(x,y,z,0) -#define fd_bytes(x,y,z) sd_bytes(x,y,z) -#define ignoreErrno(x) WSAignoreErrno(x) -#define commSetSelect(x,y,z,u,v) commSetSelectS(x,y,z,u,v) -#endif - -#if defined (SSL_C) || defined (PCONN_C) || defined (PUMP_C) || \ - defined (HTTP_C) || defined (HTCP_C) || defined (HELPER_C) || defined (CLIENT_SIDE_C) \ - || defined (FTP_C) || defined (GOPHER_C) || defined(IDENT_C) || \ - defined (ICMP_C) || defined (FORWARD_C) || defined (DNS_INTERNAL_C) -#define recv(x,y,z) recv(x,y,z,0) -#define send(x,y,z) send(x,y,z,0) -#define fd_bytes(x,y,z) sd_bytes(x,y,z) -#define fd_note(x,y) sd_note(x,y) -#define ignoreErrno(x) WSAignoreErrno(x) -#define commSetSelect(x,y,z,u,v) commSetSelectS(x,y,z,u,v) -#endif +#include "squid-mswin.h" #elif defined(__APPLE__) #define _SQUID_APPLE_ 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.5 retrieving revision 1.1.1.3.4.1.2.6 diff -u -r1.1.1.3.4.1.2.5 -r1.1.1.3.4.1.2.6 --- squid/include/config.h.in 15 Jul 2001 16:58:37 -0000 1.1.1.3.4.1.2.5 +++ squid/include/config.h.in 10 Sep 2001 20:25:56 -0000 1.1.1.3.4.1.2.6 @@ -1,5 +1,5 @@ /* - * $Id: config.h.in,v 1.1.1.3.4.1.2.5 2001/07/15 16:58:37 serassio Exp $ + * $Id: config.h.in,v 1.1.1.3.4.1.2.6 2001/09/10 20:25:56 serassio Exp $ * * AUTHOR: Duane Wessels * @@ -102,24 +102,7 @@ #elif defined(WIN32) || defined(WINNT) || defined(__WIN32__) || defined(__WIN32) #define _SQUID_MSWIN_ - -/* Some tricks for MS Compilers */ -#define alloca _alloca -#define chdir _chdir -#define getcwd _getcwd -#define getpid _getpid -#define setmode _setmode -#define snprintf _snprintf -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#define vsnprintf _vsnprintf -#define O_BYNARY _O_BINARY -#define O_TEXT _O_TEXT -#define S_IRWXO 007 -#define S_ISDIR(m) (((m) & _S_IFDIR) == _S_IFDIR) -#define ushort unsigned short int -#define uid_t int -#define gid_t int +#include "squid-mswin.h" #elif defined(__APPLE__) #define _SQUID_APPLE_ Index: squid/include/squid-mswin.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/Attic/squid-mswin.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/squid-mswin.h 10 Sep 2001 20:25:56 -0000 1.1.2.1 +++ squid/include/squid-mswin.h 10 Sep 2001 20:30:07 -0000 1.1.2.2 @@ -1,3 +1,35 @@ +/* + * $Id: squid-mswin.h,v 1.1.2.2 2001/09/10 20:30:07 serassio Exp $ + * + * + * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from the + * Internet community. Development is led by Duane Wessels of the + * National Laboratory for Applied Network Research and funded by the + * National Science Foundation. Squid is Copyrighted (C) 1998 by + * the Regents of the University of California. Please see the + * COPYRIGHT file for full details. Squid incorporates software + * developed and/or copyrighted by other sources. Please see the + * CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + /* Some tricks for MS Compilers */ #define alloca _alloca #define chdir _chdir Index: squid/src/authenticate.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/authenticate.c,v retrieving revision 1.1.1.3.4.1.2.3 retrieving revision 1.1.1.3.4.1.2.4 diff -u -r1.1.1.3.4.1.2.3 -r1.1.1.3.4.1.2.4 --- squid/src/authenticate.c 3 Jun 2001 19:41:47 -0000 1.1.1.3.4.1.2.3 +++ squid/src/authenticate.c 10 Sep 2001 20:25:56 -0000 1.1.1.3.4.1.2.4 @@ -1,6 +1,6 @@ /* - * $Id: authenticate.c,v 1.1.1.3.4.1.2.3 2001/06/03 19:41:47 serassio Exp $ + * $Id: authenticate.c,v 1.1.1.3.4.1.2.4 2001/09/10 20:25:56 serassio Exp $ * * DEBUG: section 29 Authenticator * AUTHOR: Duane Wessels @@ -129,9 +129,9 @@ r->data = data; r->auth_user = auth_user; #ifdef _SQUID_MSWIN_ - authenticators->stats.requests++; + authenticators->stats.requests++; authenticators->Authenticate(r->auth_user->user, r->auth_user->passwd, r, authenticateHandleReply); - authenticators->stats.replies++; + authenticators->stats.replies++; #else snprintf(buf, 8192, "%s %s\n", r->auth_user->user, r->auth_user->passwd); helperSubmit(authenticators, buf, authenticateHandleReply, r); @@ -145,46 +145,45 @@ if (!Config.Program.authenticate) return; #ifdef _SQUID_MSWIN_ - if (authenticators == NULL) - authenticators = xmalloc(sizeof(AuthPlugin)); - debug(29, 0) ("authenticateInit: Loading %s\n", Config.Program.authenticate->key); - authenticators->hnd = LoadLibrary(Config.Program.authenticate->key); - if (authenticators->hnd == NULL) { + if (authenticators == NULL) + authenticators = xmalloc(sizeof(AuthPlugin)); + debug(29, 0) ("authenticateInit: Loading %s\n", Config.Program.authenticate->key); + authenticators->hnd = LoadLibrary(Config.Program.authenticate->key); + if (authenticators->hnd == NULL) { debug(29, 0) ("authenticateInit: Unable to load %s\n", Config.Program.authenticate->key); - xfree(authenticators); - Config.Program.authenticate = NULL; - return; - } - authenticators->Authenticate = (PFAuthenticate)GetProcAddress(authenticators->hnd,"Authenticate"); - if (authenticators->Authenticate == NULL) { + xfree(authenticators); + Config.Program.authenticate = NULL; + return; + } + authenticators->Authenticate = (PFAuthenticate)GetProcAddress(authenticators->hnd,"Authenticate"); + if (authenticators->Authenticate == NULL) { debug(29, 0) ("authenticateInit: Invalid auth plugin %s\n", Config.Program.authenticate->key); - FreeLibrary(authenticators->hnd); - xfree(authenticators); - Config.Program.authenticate = NULL; - return; - } - authenticators->Init = (PFInit)GetProcAddress(authenticators->hnd,"Init"); - if (authenticators->Init == NULL) { + FreeLibrary(authenticators->hnd); + xfree(authenticators); + Config.Program.authenticate = NULL; + return; + } + authenticators->Init = (PFInit)GetProcAddress(authenticators->hnd,"Init"); + if (authenticators->Init == NULL) { debug(29, 0) ("authenticateInit: Invalid auth plugin %s\n", Config.Program.authenticate->key); - FreeLibrary(authenticators->hnd); - xfree(authenticators); - Config.Program.authenticate = NULL; - return; - } - if (Config.Program.authenticate->next) { + FreeLibrary(authenticators->hnd); + xfree(authenticators); + Config.Program.authenticate = NULL; + return; + } + if (Config.Program.authenticate->next) { debug(29, 0) ("authenticateInit: Initializing with group %s\n", Config.Program.authenticate->next->key); - authenticators->Init(Config.Program.authenticate->next->key); - } - else - { - debug(29, 0) ("authenticateInit: Missing auth plugin %s Parameter\n", Config.Program.authenticate->key); - FreeLibrary(authenticators->hnd); - xfree(authenticators); - Config.Program.authenticate = NULL; - return; - } - authenticators->stats.requests=0; - authenticators->stats.replies=0; + authenticators->Init(Config.Program.authenticate->next->key); + } + else { + debug(29, 0) ("authenticateInit: Missing auth plugin %s Parameter\n", Config.Program.authenticate->key); + FreeLibrary(authenticators->hnd); + xfree(authenticators); + Config.Program.authenticate = NULL; + return; + } + authenticators->stats.requests=0; + authenticators->stats.replies=0; #else if (authenticators == NULL) authenticators = helperCreate("authenticator"); Index: squid/src/cachemgr.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/cachemgr.c,v retrieving revision 1.1.1.3.4.1.2.3 retrieving revision 1.1.1.3.4.1.2.4 diff -u -r1.1.1.3.4.1.2.3 -r1.1.1.3.4.1.2.4 --- squid/src/cachemgr.c 29 Jul 2001 16:06:05 -0000 1.1.1.3.4.1.2.3 +++ squid/src/cachemgr.c 10 Sep 2001 20:25:56 -0000 1.1.1.3.4.1.2.4 @@ -1,6 +1,6 @@ /* - * $Id: cachemgr.c,v 1.1.1.3.4.1.2.3 2001/07/29 16:06:05 serassio Exp $ + * $Id: cachemgr.c,v 1.1.1.3.4.1.2.4 2001/09/10 20:25:56 serassio Exp $ * * DEBUG: section 0 CGI Cache Manager * AUTHOR: Duane Wessels @@ -623,7 +623,7 @@ #ifdef _SQUID_MSWIN_ answer=read_reply(s, req); closesocket(s); - return answer; + return answer; #else return read_reply(s, req); #endif Index: squid/src/gopher.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/gopher.c,v retrieving revision 1.1.1.3.4.2.2.1 retrieving revision 1.1.1.3.4.2.2.2 diff -u -r1.1.1.3.4.2.2.1 -r1.1.1.3.4.2.2.2 --- squid/src/gopher.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.2.2.1 +++ squid/src/gopher.c 10 Sep 2001 20:25:56 -0000 1.1.1.3.4.2.2.2 @@ -1,7 +1,7 @@ /* - * $Id: gopher.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:14 hno Exp $ + * $Id: gopher.c,v 1.1.1.3.4.2.2.2 2001/09/10 20:25:56 serassio Exp $ * * DEBUG: section 10 Gopher * AUTHOR: Harvest Derived @@ -826,4 +826,4 @@ gd->buf = memAllocate(MEM_4K_BUF); return (gd); } -#endif GOPHER_C +#endif /* GOPHER_C */ Index: squid/src/http.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/http.c,v retrieving revision 1.1.1.3.4.3.2.3 retrieving revision 1.1.1.3.4.3.2.4 diff -u -r1.1.1.3.4.3.2.3 -r1.1.1.3.4.3.2.4 --- squid/src/http.c 8 Sep 2001 15:43:02 -0000 1.1.1.3.4.3.2.3 +++ squid/src/http.c 10 Sep 2001 20:25:56 -0000 1.1.1.3.4.3.2.4 @@ -1,6 +1,6 @@ /* - * $Id: http.c,v 1.1.1.3.4.3.2.3 2001/09/08 15:43:02 serassio Exp $ + * $Id: http.c,v 1.1.1.3.4.3.2.4 2001/09/10 20:25:56 serassio Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -521,8 +521,8 @@ } else if (entry->mem_obj->inmem_hi == 0) { ErrorState *err; err = errorCon(ERR_READ_ERROR, HTTP_INTERNAL_SERVER_ERROR); - err->request = requestLink((request_t *) request); err->xerrno = errno; + err->request = requestLink((request_t *) request); fwdFail(httpState->fwd, err); comm_close(fd); } else { Index: squid/src/useragent.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/useragent.c,v retrieving revision 1.1.1.3.4.1.2.13 retrieving revision 1.1.1.3.4.1.2.14 diff -u -r1.1.1.3.4.1.2.13 -r1.1.1.3.4.1.2.14 --- squid/src/useragent.c 19 Aug 2001 20:08:41 -0000 1.1.1.3.4.1.2.13 +++ squid/src/useragent.c 10 Sep 2001 20:25:56 -0000 1.1.1.3.4.1.2.14 @@ -1,6 +1,6 @@ /* - * $Id: useragent.c,v 1.1.1.3.4.1.2.13 2001/08/19 20:08:41 serassio Exp $ + * $Id: useragent.c,v 1.1.1.3.4.1.2.14 2001/09/10 20:25:56 serassio Exp $ * * DEBUG: section 40 User-Agent logging * AUTHOR: Joe Ramey @@ -142,4 +142,4 @@ fclose(cache_useragent_log); cache_useragent_log = NULL; #endif -} \ No newline at end of file +} Index: squid/src/wccp.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/wccp.c,v retrieving revision 1.1.1.1.4.2.2.3 retrieving revision 1.1.1.1.4.2.2.4 diff -u -r1.1.1.1.4.2.2.3 -r1.1.1.1.4.2.2.4 --- squid/src/wccp.c 1 Sep 2001 15:08:12 -0000 1.1.1.1.4.2.2.3 +++ squid/src/wccp.c 10 Sep 2001 20:25:56 -0000 1.1.1.1.4.2.2.4 @@ -1,6 +1,6 @@ /* - * $Id: wccp.c,v 1.1.1.1.4.2.2.3 2001/09/01 15:08:12 serassio Exp $ + * $Id: wccp.c,v 1.1.1.1.4.2.2.4 2001/09/10 20:25:56 serassio Exp $ * * DEBUG: section 80 WCCP Support * AUTHOR: Glenn Chisholm @@ -224,7 +224,7 @@ #ifdef _SQUID_MSWIN_ (char *)&wccp_i_see_you, #else - &wccp_i_see_you, + &wccp_i_see_you, #endif WCCP_RESPONSE_SIZE, 0, @@ -270,7 +270,7 @@ #ifdef _SQUID_MSWIN_ (const char*)&wccp_here_i_am, #else - &wccp_here_i_am, + &wccp_here_i_am, #endif sizeof(wccp_here_i_am), 0);