---------------------
PatchSet 1109
Date: 2001/01/06 12:40:07
Author: hno
Branch: nt-2_3
Tag: (none)
Log:
Imported Serassio Guido's version of the Squid-NT port
Members:
Readme.txt:1.1->1.1.2.1
WIN32-ChangeLog.txt:1.1->1.1.2.1
configure.in:1.1.1.3.4.5->1.1.1.3.4.5.2.1
auth_modules/LDAP/squid_ldap_auth.c:1.1.1.1->1.1.1.1.56.1
auth_modules/NCSA/Makefile.in:1.1.1.1->1.1.1.1.44.1
auth_modules/NCSA/ncsa_auth.c:1.1.1.1->1.1.1.1.66.1
auth_modules/PAM/Makefile.in:1.1.1.1->1.1.1.1.22.1
auth_modules/PAM/pam_auth.c:1.1.1.1->1.1.1.1.18.1
auth_modules/SMB/Makefile.in:1.1.1.1->1.1.1.1.20.1
auth_modules/SMB/smb_auth.sh:1.1.1.2->1.1.1.2.56.1
auth_modules/getpwnam/Makefile.in:1.1.1.2->1.1.1.2.30.1
contrib/rredir.c:1.1.1.1->1.1.1.1.44.1
doc/Release-Notes-1.0.txt:1.1.1.1->1.1.1.1.44.1
doc/Release-Notes-1.1.txt:1.1.1.1->1.1.1.1.44.1
doc/Programming-Guide/prog-guide.sgml:1.1.1.2.4.1->1.1.1.2.4.1.2.1
errors/Japanese/ERR_FTP_FORBIDDEN:1.1.1.1->1.1.1.1.40.1
errors/Japanese/ERR_FTP_NOT_FOUND:1.1.1.1->1.1.1.1.40.1
errors/Japanese/ERR_FTP_UNAVAILABLE:1.1.1.1->1.1.1.1.40.1
errors/Japanese/ERR_SHUTTING_DOWN:1.1.1.1.4.1->1.1.1.1.4.1.2.1
include/Array.h:1.1.1.1->1.1.1.1.44.1
include/GNUregex.h:1.1.1.2->1.1.1.2.44.1
include/Stack.h:1.1.1.1->1.1.1.1.44.1
include/asn1.h:1.1.1.1->1.1.1.1.44.1
include/cache_snmp.h:1.1.1.3->1.1.1.3.30.1
include/config.h.in:1.1.1.3.4.1->1.1.1.3.4.1.2.1
include/hash.h:1.1.1.1->1.1.1.1.42.1
include/heap.h:1.1.1.1->1.1.1.1.2.1
include/md5.h:1.1.1.1->1.1.1.1.44.1
include/parse.h:1.1.1.1->1.1.1.1.44.1
include/radix.h:1.1.1.1->1.1.1.1.42.1
include/rfc1035.h:1.1.1.1.4.1->1.1.1.1.4.1.2.1
include/snmp-internal.h:1.1.1.1->1.1.1.1.44.1
include/snmp-mib.h:1.1.1.1->1.1.1.1.44.1
include/snmp.h:1.1.1.1->1.1.1.1.44.1
include/snmp_api.h:1.1.1.1->1.1.1.1.44.1
include/snmp_api_error.h:1.1.1.1->1.1.1.1.44.1
include/snmp_api_util.h:1.1.1.1->1.1.1.1.44.1
include/snmp_client.h:1.1.1.1->1.1.1.1.44.1
include/snmp_coexist.h:1.1.1.1->1.1.1.1.44.1
include/snmp_compat.h:1.1.1.1->1.1.1.1.44.1
include/snmp_debug.h:1.1.1.2->1.1.1.2.44.1
include/snmp_error.h:1.1.1.1->1.1.1.1.44.1
include/snmp_impl.h:1.1.1.1->1.1.1.1.44.1
include/snmp_msg.h:1.1.1.1->1.1.1.1.44.1
include/snmp_pdu.h:1.1.1.1->1.1.1.1.44.1
include/snmp_session.h:1.1.1.1->1.1.1.1.44.1
include/snmp_util.h:1.1.1.1->1.1.1.1.44.1
include/snmp_vars.h:1.1.1.2->1.1.1.2.30.1
include/snprintf.h:1.1.1.1->1.1.1.1.44.1
include/splay.h:1.1.1.2->1.1.1.2.2.1
include/tempnam.h:1.1.1.1->1.1.1.1.44.1
include/tree.h:1.1.1.1->1.1.1.1.44.1
include/util.h:1.1.1.3.4.1->1.1.1.3.4.1.2.1
include/version.h:1.1.1.3.4.4->1.1.1.3.4.4.2.1
lib/Array.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
lib/GNUregex.c:1.1.1.1->1.1.1.1.42.1
lib/Makefile.in:1.1.1.2.4.1->1.1.1.2.4.1.2.1
lib/Stack.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
lib/base64.c:1.1.1.1->1.1.1.1.40.1
lib/dlmalloc.c:1.1.1.1->1.1.1.1.44.1
lib/getfullhostname.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
lib/hash.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
lib/heap.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
lib/html_quote.c:1.1.30.1->1.1.30.1.2.1
lib/iso3307.c:1.1.1.1->1.1.1.1.44.1
lib/md5-test.c:1.1.1.1->1.1.1.1.44.1
lib/md5.c:1.1.1.2->1.1.1.2.30.1
lib/radix.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
lib/rfc1035.c:1.1.1.1.4.3->1.1.1.1.4.3.2.1
lib/rfc1123.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
lib/rfc1738.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
lib/safe_inet_addr.c:1.1.1.3->1.1.1.3.30.1
lib/snprintf.c:1.1.1.3->1.1.1.3.30.1
lib/splay.c:1.1.1.2->1.1.1.2.2.1
lib/strerror.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
lib/stub_memaccount.c:1.1.1.2->1.1.1.2.30.1
lib/tempnam.c:1.1.1.1->1.1.1.1.44.1
lib/util.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
lib/uudecode.c:1.1.1.1->1.1.1.1.44.1
scripts/RunAccel.in:1.1.1.2->1.1.1.2.44.1
scripts/RunCache.in:1.1.1.2->1.1.1.2.44.1
scripts/check_cache.pl:1.1.1.1->1.1.1.1.44.1
scripts/fileno-to-pathname.pl:1.1.1.1->1.1.1.1.44.1
scripts/flag_truncs.pl:1.1.1.1->1.1.1.1.44.1
scripts/upgrade-1.0-store.pl:1.1.1.1->1.1.1.1.44.1
src/CacheDigest.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/ETag.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/HttpBody.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/HttpHdrCc.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/HttpHdrContRange.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/HttpHdrExtField.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/HttpHdrRange.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/HttpHeader.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/HttpHeaderTools.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/HttpMsg.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/HttpReply.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/HttpRequest.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/HttpStatusLine.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/Makefile.in:1.1.1.3->1.1.1.3.14.1
src/MemBuf.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/MemPool.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/Packer.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/StatHist.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/String.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/access_log.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/acl.c:1.1.1.3.4.3->1.1.1.3.4.3.2.1
src/aiops.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/asn.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/async_io.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/authenticate.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/cache_cf.c:1.1.1.3.4.4->1.1.1.3.4.4.2.1
src/cache_diff.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/cache_manager.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/cachemgr.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/carp.c:1.1.1.1.4.4->1.1.1.1.4.4.2.1
src/cbdata.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/cf.data.pre:1.1.1.3.4.3->1.1.1.3.4.3.2.1
src/cf_gen.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/client.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/client_db.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/client_side.c:1.1.1.3.4.6->1.1.1.3.4.6.2.1
src/comm.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/comm_select.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/debug.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/defines.h:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/delay_pools.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/disk.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/dns.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/dns_internal.c:1.1.1.1.4.6->1.1.1.1.4.6.2.1
src/dnsserver.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/enums.h:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/errorpage.c:1.1.1.3.4.3->1.1.1.3.4.3.2.1
src/event.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/fd.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/filemap.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/forward.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/fqdncache.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/ftp.c:1.1.1.3.4.3->1.1.1.3.4.3.2.1
src/globals.h:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/gopher.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/helper.c:1.1.1.3->1.1.1.3.24.1
src/htcp.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/http.c:1.1.1.3.4.3->1.1.1.3.4.3.2.1
src/icmp.c:1.1.1.2.4.2->1.1.1.2.4.2.2.1
src/icp_v2.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/icp_v3.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/ident.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/internal.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/ipc.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/ipcache.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/leakfinder.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/main.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/mem.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/mib.txt:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/mime.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/mk-string-arrays.pl:1.1.1.1->1.1.1.1.44.1
src/multicast.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/neighbors.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/net_db.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/pconn.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/peer_digest.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/peer_select.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/pinger.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/protos.h:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/pump.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/recv-announce.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/redirect.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/refresh.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/send-announce.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/snmp_agent.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/snmp_core.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/squid.h:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/ssl.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/stat.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/stmem.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/store.c:1.1.1.3.4.5->1.1.1.3.4.5.2.1
src/store_client.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/store_digest.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/store_dir.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/store_dir_ufs.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/store_heap_replacement.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/store_io.c:1.1.1.1->1.1.1.1.20.1
src/store_io_ufs.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/store_key_md5.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/store_log.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/store_rebuild.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/store_swapin.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/store_swapmeta.c:1.1.1.2.4.2->1.1.1.2.4.2.2.1
src/store_swapout.c:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/structs.h:1.1.1.3.4.2->1.1.1.3.4.2.2.1
src/test-ellipses.pl:1.1.1.1->1.1.1.1.44.1
src/test_cache_digest.c:1.1.1.1.4.1->1.1.1.1.4.1.2.1
src/tools.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/typedefs.h:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/unlinkd.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/url.c:1.1.1.3.4.4->1.1.1.3.4.4.2.1
src/urn.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/useragent.c:1.1.1.3.4.1->1.1.1.3.4.1.2.1
src/wais.c:1.1.1.2.4.1->1.1.1.2.4.1.2.1
src/wccp.c:1.1.1.1.4.2->1.1.1.1.4.2.2.1
src/whois.c:1.1.1.2.4.2->1.1.1.2.4.2.2.1
test-suite/hash.c:1.1.1.1->1.1.1.1.44.1
test-suite/tcp-banger2.c:1.1.1.3->1.1.1.3.30.1
win/PSAPI.LIB:1.1->1.1.2.1
win/resource.h:1.1->1.1.2.1
win/squid.rc:1.1->1.1.2.1
win/win.dsw:1.1->1.1.2.1
win/cachemgr/cachemgr.dsp:1.1->1.1.2.1
win/cachemgr/cachemgr.mak:1.1->1.1.2.1
win/cachemgr/cachemgr.rc:1.1->1.1.2.1
win/cachemgr/resource.h:1.1->1.1.2.1
win/cf_gen/cf_gen.dsp:1.1->1.1.2.1
win/cf_gen/cf_gen.mak:1.1->1.1.2.1
win/dnsserver/dnsserver.dsp:1.1->1.1.2.1
win/dnsserver/dnsserver.mak:1.1->1.1.2.1
win/dnsserver/dnsserver.rc:1.1->1.1.2.1
win/dnsserver/resource.h:1.1->1.1.2.1
win/libregex/libregex.dsp:1.1->1.1.2.1
win/libregex/libregex.mak:1.1->1.1.2.1
win/miscutil/miscutil.dsp:1.1->1.1.2.1
win/miscutil/miscutil.mak:1.1->1.1.2.1
win/squidnt/squidnt.dsp:1.1->1.1.2.1
win/squidnt/squidnt.mak:1.1->1.1.2.1
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/Readme.txt Wed Feb 14 00:47:59 2007
@@ -0,0 +1,55 @@
+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)
+
+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
+
+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.
+
+The results of the rest of the (original) cmdline switches is undeterminate (for the moment).
+
+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)
+
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/WIN32-ChangeLog.txt Wed Feb 14 00:47:59 2007
@@ -0,0 +1,20 @@
+Squid 2.3 Stable 4 for WIN32 Change Log
+
+
+16 Nov 2000 - Initial WIN32 port (Romeo Angelache)
+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)
Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.1.1.3.4.5
retrieving revision 1.1.1.3.4.5.2.1
diff -u -r1.1.1.3.4.5 -r1.1.1.3.4.5.2.1
--- squid/configure.in 15 Aug 2000 05:52:34 -0000 1.1.1.3.4.5
+++ squid/configure.in 6 Jan 2001 12:40:08 -0000 1.1.1.3.4.5.2.1
@@ -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 2000/08/15 05:52:34 hno Exp $
+dnl $Id: configure.in,v 1.1.1.3.4.5.2.1 2001/01/06 12:40:08 hno Exp $
dnl
dnl
dnl
AC_INIT(src/main.c)
AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.1.1.3.4.5 $)dnl
+AC_REVISION($Revision: 1.1.1.3.4.5.2.1 $)dnl
AC_PREFIX_DEFAULT(/usr/local/squid)
AC_CONFIG_AUX_DIR(cfgaux)
@@ -20,8 +20,7 @@
LIBREGEX='' # libregex.a
dnl use directory structure of cached as default (hack)
-if test "$libexecdir" = '${exec_prefix}/libexec' &&
- test "$localstatedir" = '${prefix}/var'; then
+if test "$libexecdir" = '${exec_prefix}/libexec'; then
libexecdir='${bindir}'
localstatedir='${prefix}'
@@ -89,9 +88,9 @@
esac
else
case "$host" in
- *mips-sgi-irix6.*)
+ *mips-sgi-irix6.4*)
# suggested by Rafael Seidl
- CFLAGS="$CFLAGS -n32 -mips3 -O3 -OPT:Olimit=0:space=OFF \
+ CFLAGS="$CFLAGS -n32 -mips4 -O3 -OPT:Olimit=0:space=OFF \
-woff 1009,1014,1048,1110,1116,1185,1188,1204,1230,1233 \
-Wl,-woff,85,-woff,84,-woff,134 \
-nostdinc -I/usr/include -D_BSD_SIGNALS"
@@ -117,14 +116,23 @@
esac
else
case "$host" in
- *mips-sgi-irix6.*)
+ *mips-sgi-irix6.4*)
# suggested by Rafael Seidl
- LDFLAGS="-n32 -mips3 -nostdlib -L/usr/lib32"
+ LDFLAGS="-n32 -mips4 -nostdlib -L/usr/lib32"
;;
esac
fi
fi
+if test "x$ac_cv_enabled_dlmalloc" = "x"; then
+ case "$host" in
+ i386-*-solaris2.*)
+ echo "Enabling dlmalloc for $host"
+ ac_cv_enabled_dlmalloc="yes"
+ ;;
+ esac
+fi
+
dnl Enable optional modules
AC_ARG_ENABLE(dlmalloc,
[ --enable-dlmalloc[=LIB] Compile & use the malloc package by Doug Lea],
@@ -150,8 +158,6 @@
i386-*-solaris2.*)
echo "Enabling dlmalloc for $host"
use_dlmalloc="yes"
- LIBDLMALLOC="libdlmalloc.a"
- LIB_MALLOC="-L../lib -ldlmalloc"
;;
esac
fi
@@ -240,26 +246,8 @@
])
AC_ARG_ENABLE(async_io,
-[ --enable-async-io[=N_THREADS]
- Do ASYNC disk I/O using threads.
- N_THREADS is the number of worker threads
- defaults to 16. See also src/squid.h for
- some additional platform tuning],
-[ case "$enableval" in
- yes)
- async_io=yes
- ;;
- no)
- async_io=''
- ;;
- *)
- async_io=yes
- AC_DEFINE_UNQUOTED(NUMTHREADS, $enableval)
- ;;
- esac
-])
-
-if test -n "$async_io" ; then
+[ --enable-async-io Do ASYNC disk I/O using threads],
+[ if test "$enableval" = "yes" ; then
echo "Async I/O enabled"
async_io=yes
AC_DEFINE(USE_ASYNC_IO)
@@ -275,7 +263,8 @@
fi
;;
esac
-fi
+ fi
+])
AC_SUBST(ASYNC_OBJS)
AC_SUBST(SQUID_PTHREAD_LIB)
@@ -507,7 +496,7 @@
])
AC_ARG_ENABLE(internal-dns,
-[ --disable-internal-dns This prevents Squid from directly sending and
+[ --disable-internal-dns This prevents Squid from directly sending and
receiving DNS messages, and instead enables the
old external 'dnsserver' processes.],
[ if test "$enableval" = "no" ; then
@@ -519,7 +508,7 @@
])
AC_ARG_ENABLE(truncate,
-[ --enable-truncate This uses truncate() instead of unlink() when
+[ --enable-truncate This uses truncate() instead of unlink() when
removing cache files. Truncate gives a little
performance improvement, but may cause problems
when used with async I/O. Truncate uses more
@@ -530,33 +519,6 @@
fi
])
-dnl Enable underscore in hostnames
-AC_ARG_ENABLE(underscores,
-[ --enable-underscores Squid by default rejects any host names with _
- in their name to conform with internet standars.
- If you disagree with this you may allow _ in
- hostnames by using this switch, provided that
- the resolver library on the host where Squid runs
- does not reject _ in hostnames...],
-[ if test "$enableval" = "yes" ; then
- echo "Enabling the use of underscores in host names"
- AC_DEFINE(ALLOW_HOSTNAME_UNDERSCORES, 1)
- fi
-])
-
-dnl Enable HEAP_REPLACEMENT
-AC_ARG_ENABLE(heap-replacement,
-[ --enable-heap-replacement
- This option allows you to use various cache
- replacement algorithms, instead of the standard
- LRU algorithm.
- ],
-[ if test "$enableval" = "yes" ; then
- echo "Enabling HEAP_REPLACEMENT"
- AC_DEFINE(HEAP_REPLACEMENT, 1)
- fi
-])
-
# Force some compilers to use ANSI features
#
case "$host" in
@@ -626,7 +588,6 @@
gnumalloc.h \
grp.h \
ip_compat.h \
- ip_fil_compat.h \
ip_fil.h \
ip_nat.h \
libc.h \
@@ -637,11 +598,9 @@
mount.h \
net/if.h \
netdb.h \
- netinet/if_ether.h \
netinet/in.h \
netinet/tcp.h \
netinet/ip_compat.h \
- netinet/ip_fil_compat.h \
netinet/ip_fil.h \
netinet/ip_nat.h \
poll.h \
@@ -884,7 +843,6 @@
LIBS=`echo $LIBS | sed -e s/-lsocket//`
echo "Removing -lnsl for IRIX..."
LIBS=`echo $LIBS | sed -e s/-lnsl//`
- ac_cv_lib_nsl_main=no
echo "Removing -lbsd for IRIX..."
LIBS=`echo $LIBS | sed -e s/-lbsd//`
;;
@@ -914,18 +872,6 @@
;;
esac
-# Remove optimization for GCC 2.95.[12]
-# gcc -O[2] on *BSD and Linux (x86) causes pointers to magically become NULL
-if test "$GCC" = "yes"; then
- GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'`
- case "$GCCVER" in
- [2.95.[12]])
- echo "Removing -O for gcc on $host with GCC $GCCVER"
- CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`"
- ;;
- esac
-fi
-
# Recommended by Balint Nagy Endre
case "$host" in
*-univel-sysv4.2MP)
@@ -994,7 +940,6 @@
mktime \
mstats \
poll \
- pthread_sigmask \
putenv \
random \
regcomp \
@@ -1003,7 +948,6 @@
res_init \
rint \
seteuid \
- setgroups \
setpgrp \
setrlimit \
getrlimit \
@@ -1050,19 +994,12 @@
dnl installed by default, so we need to check for them
if test "$IPF_TRANSPARENT" ; then
AC_MSG_CHECKING(if IP-Filter header files are installed)
- # hold on to your hats...
- if test "$ac_cv_header_ip_compat_h" = "yes" ||
- test "$ac_cv_header_ip_fil_compat_h" = "yes" ||
- test "$ac_cv_header_netinet_ip_compat_h" = "yes" ||
- test "$ac_cv_header_netinet_ip_fil_compat_h" = "yes" ; then
- have_ipfilter_compat_header="yes"
- fi
- if test "x$have_ipfilter_compat_header" = "xyes" &&
+ if test "$ac_cv_header_ip_compat_h" = "yes" &&
test "$ac_cv_header_ip_fil_h" = "yes" &&
test "$ac_cv_header_ip_nat_h" = "yes" ; then
IPF_TRANSPARENT="yes"
AC_DEFINE(IPF_TRANSPARENT, 1)
- elif test "$have_ipfilter_compat_header" = "yes" &&
+ elif test "$ac_cv_header_netinet_ip_compat_h" = "yes" &&
test "$ac_cv_header_netinet_ip_fil_h" = "yes" &&
test "$ac_cv_header_netinet_ip_nat_h" = "yes" ; then
IPF_TRANSPARENT="yes"
@@ -1164,11 +1101,9 @@
main() {
FILE *fp;
int i,j;
-#if defined(__CYGWIN32__) || defined (__CYGWIN__)
- /*
- * getrlimit and sysconf returns bogous values on cygwin32.
+#if __CYGWIN32__
+ /* getrlimit and sysconf returns bogous values on cygwin32.
* Number of fds is virtually unlimited in cygwin (sys/param.h)
- * NOTE: __CYGWIN32__ is deprecated.
*/
i = NOFILE;
#elif HAVE_SETRLIMIT
@@ -1330,7 +1265,7 @@
AC_DEFINE_UNQUOTED(SQUID_TCP_SO_RCVBUF, $SQUID_TCP_SO_RCVBUF)
AC_CACHE_CHECK(if sys_errlist is already defined, ac_cv_needs_sys_errlist,
- AC_TRY_COMPILE([#include ],[char *s = sys_errlist;],
+ AC_TRY_COMPILE([#include ],[char *s = sys_errlist[0];],
ac_cv_needs_sys_errlist="no",
ac_cv_needs_sys_errlist="yes")
)
@@ -1496,5 +1431,4 @@
./auth_modules/PAM/Makefile \
./auth_modules/SMB/Makefile
./auth_modules/getpwnam/Makefile \
- ./auth_modules/LDAP/Makefile \
)
Index: squid/auth_modules/LDAP/squid_ldap_auth.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/LDAP/Attic/squid_ldap_auth.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.56.1
diff -u -r1.1.1.1 -r1.1.1.1.56.1
--- squid/auth_modules/LDAP/squid_ldap_auth.c 26 Jan 2000 03:25:00 -0000 1.1.1.1
+++ squid/auth_modules/LDAP/squid_ldap_auth.c 6 Jan 2001 12:40:08 -0000 1.1.1.1.56.1
@@ -19,88 +19,164 @@
or (at your option) any later version.
*/
+#include "squid.h"
+#undef sprintf
#include
-#include
+#ifdef _SQUID_MSWIN_
+#include
+#else
#include
#include
#include
+#endif
+
+typedef struct {
+ void *data;
+ acl_proxy_auth_user *auth_user;
+ RH *handler;
+} authenticateStateData;
+
/* Change this to your search base */
#define SEARCHBASE "ou=people,o=nrc.ca"
-int checkLDAP( LDAP *ld, char *userid, char *password);
+int checkLDAP(LDAP *ld, char *userid, char *password);
+
+#ifdef _SQUID_MSWIN_
+
+static char *ldapServer=NULL;
+
+
+BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason,
+ LPVOID reserved /* Not used. */ );
+__declspec (dllexport) int
+Authenticate(char *username, char *password, authenticateStateData *data, HLPCB callback)
+{
+ LDAP *ld;
+
+#else
int main(int argc, char **argv)
{
- char buf[256];
- char *user, *passwd, *p;
- char *ldapServer;
- LDAP *ld;
- LDAPMessage *result, *e;
+ char buf[256];
+ char *username, *password, *p;
+ char *ldapServer;
+ LDAP *ld;
- setbuf(stdout, NULL);
+ setbuf(stdout, NULL);
- if (argc != 2)
+ if (argc != 2)
{
- fprintf(stderr, "Usage: squid_ldap_auth ldap_server_name\n");
- exit(1);
+ fprintf(stderr, "Usage: squid_ldap_auth ldap_server_name\n");
+ exit(1);
}
- ldapServer = (char*)argv[1];
+ ldapServer = (char*)argv[1];
- while (fgets(buf, 256, stdin) != NULL)
+ while (fgets(buf, 256, stdin) != NULL)
{
- /* You can put this ldap connect outside the loop, but i didn't want to
- have the connection open too much. If you have a site which will
- be doing >1 authentication per second, you should move this (and the
- below ldap_unbind()) outside the loop.
- */
- if( (ld = ldap_init(ldapServer, LDAP_PORT)) == NULL)
- {
- fprintf(stderr, "\nUnable to connect to LDAP server:%s port:%d\n",
- ldapServer, LDAP_PORT);
- exit(1);
+ /* You can put this ldap connect outside the loop, but i didn't want to
+ have the connection open too much. If you have a site which will
+ be doing >1 authentication per second, you should move this (and the
+ below ldap_unbind()) outside the loop.
+ */
+#endif
+ if( (ld = ldap_init(ldapServer, LDAP_PORT)) == NULL)
+ {
+#ifndef _SQUID_MSWIN_
+ fprintf(stderr, "\nUnable to connect to LDAP server:%s port:%d\n",
+ ldapServer, LDAP_PORT);
+ exit(1);
+#else
+ (callback)(data,"ERR");
+ return 0;
+#endif
+ }
+#ifndef _SQUID_MSWIN_
+ if ((p = strchr(buf, '\n')) != NULL)
+ *p = '\0'; /* strip \n */
+
+ if ((username = strtok(buf, " ")) == NULL)
+ {
+ printf("ERR\n");
+ continue;
+ }
+ if ((password = strtok(NULL, "")) == NULL)
+ {
+ printf("ERR\n");
+ continue;
+ }
+#endif
+ if(checkLDAP(ld, username, password) != 0)
+ {
+#ifndef _SQUID_MSWIN_
+ printf("ERR\n");
+ continue;
+#else
+ ldap_unbind(ld);
+ (callback)(data,"ERR");
+ return 0;
+#endif
+ }
+ else
+ {
+#ifndef _SQUID_MSWIN_
+ printf("OK\n");
+ }
+ ldap_unbind(ld);
}
+#else
+ ldap_unbind(ld);
+ (callback)(data,"OK");
+ return 0;
+ }
+#endif
+}
- if ((p = strchr(buf, '\n')) != NULL)
- *p = '\0'; /* strip \n */
+int checkLDAP(LDAP *ld, char *userid, char *password)
+{
+ char buffer[256];
- if ((user = strtok(buf, " ")) == NULL)
- {
- printf("ERR\n");
- continue;
- }
- if ((passwd = strtok(NULL, "")) == NULL)
- {
- printf("ERR\n");
- continue;
- }
- if(checkLDAP(ld, user, passwd) != 0)
- {
- printf("ERR\n");
- continue;
- }
- else
- {
- printf("OK\n");
- }
- ldap_unbind(ld);
- }
+ sprintf (buffer, "uid=%s, %s", userid, SEARCHBASE);
+
+ if(ldap_simple_bind_s(ld, buffer, password) != LDAP_SUCCESS)
+ return 1;
+ return 0;
}
+#ifdef _SQUID_MSWIN_
+
+__declspec (dllexport) int Init(char *Server)
+{
+ if (ldapServer)
+ xfree(ldapServer);
+ ldapServer = xstrdup(Server);
+ return 0;
+}
-int checkLDAP( LDAP *ld, char *userid, char *password)
+BOOL APIENTRY
+DllMain (
+ HINSTANCE hInst /* Library instance handle. */ ,
+ DWORD reason /* Reason this function is being called. */ ,
+ LPVOID reserved /* Not used. */ )
{
- char str[256];
- /*sprintf(str,"uid=[%s][%s], %s",userid, password, SEARCHBASE); */
- sprintf(str,"uid=%s, %s",userid, SEARCHBASE);
-
- if(ldap_simple_bind_s(ld, str, password) != LDAP_SUCCESS)
+ switch (reason)
{
- /*fprintf(stderr, "\nUnable to bind\n");*/
- return 33;
+ case DLL_PROCESS_ATTACH:
+ break;
+
+ case DLL_PROCESS_DETACH:
+ break;
+
+ case DLL_THREAD_ATTACH:
+ break;
+
+ case DLL_THREAD_DETACH:
+ break;
}
- return 0;
+ return TRUE;
}
+
+#endif
Index: squid/auth_modules/NCSA/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/NCSA/Attic/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/auth_modules/NCSA/Makefile.in 26 Jan 2000 03:21:46 -0000 1.1.1.1
+++ squid/auth_modules/NCSA/Makefile.in 6 Jan 2001 12:40:08 -0000 1.1.1.1.44.1
@@ -1,7 +1,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.1.1.1 2000/01/26 03:21:46 hno Exp $
+# $Id: Makefile.in,v 1.1.1.1.44.1 2001/01/06 12:40:08 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
Index: squid/auth_modules/NCSA/ncsa_auth.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/NCSA/Attic/ncsa_auth.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.66.1
diff -u -r1.1.1.1 -r1.1.1.1.66.1
--- squid/auth_modules/NCSA/ncsa_auth.c 26 Jan 2000 03:21:46 -0000 1.1.1.1
+++ squid/auth_modules/NCSA/ncsa_auth.c 6 Jan 2001 12:40:08 -0000 1.1.1.1.66.1
@@ -17,34 +17,23 @@
*
*/
-#include "config.h"
-#if HAVE_STDIO_H
-#include
-#endif
-#if HAVE_STDLIB_H
-#include
-#endif
-#if HAVE_UNISTD_H
-#include
-#endif
-#if HAVE_STRING_H
-#include
-#endif
-#if HAVE_SYS_TYPES_H
-#include
-#endif
-#if HAVE_SYS_STAT_H
-#include
-#endif
-#if HAVE_CRYPT_H
-#include
-#endif
-
-#include "util.h"
-#include "hash.h"
+#include "squid.h"
static hash_table *hash = NULL;
static HASHFREE my_free;
+static char *passwdfile=NULL;
+
+#ifdef _SQUID_MSWIN_
+typedef struct {
+ void *data;
+ acl_proxy_auth_user *auth_user;
+ RH *handler;
+} authenticateStateData;
+
+
+BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason,
+ LPVOID reserved /* Not used. */ );
+#endif
typedef struct _user_data {
/* first two items must be same as hash_link */
@@ -76,16 +65,15 @@
/* initial setup */
hash = hash_create((HASHCMP *) strcmp, 7921, hash_string);
if (NULL == hash) {
- fprintf(stderr, "ncsa_auth: cannot create hash table\n");
exit(1);
}
f = fopen(passwdfile, "r");
while (fgets(buf, 8192, f) != NULL) {
if ((buf[0] == '#') || (buf[0] == ' ') || (buf[0] == '\t') ||
- (buf[0] == '\n'))
+ (buf[0] == '\n') || (buf[0] == '\r'))
continue;
- user = strtok(buf, ":\n");
- passwd = strtok(NULL, ":\n");
+ user = strtok(buf, ":\n\r");
+ passwd = strtok(NULL, ":\n\r");
if ((strlen(user) > 0) && passwd) {
u = xmalloc(sizeof(*u));
u->user = xstrdup(user);
@@ -96,18 +84,26 @@
fclose(f);
}
-int
+#ifdef _SQUID_MSWIN_
+__declspec (dllexport) int
+Authenticate(char *user, char *passwd, authenticateStateData *data, HLPCB callback)
+{
+#else
main(int argc, char **argv)
{
- struct stat sb;
- time_t change_time = 0;
char buf[256];
char *user, *passwd, *p;
+#endif
+ static time_t change_time = 0;
+ struct stat sb;
user_data *u;
+
+#ifndef _SQUID_MSWIN_
setbuf(stdout, NULL);
- if (argc != 2) {
- fprintf(stderr, "Usage: ncsa_auth \n");
- exit(1);
+ if (argc != 2)
+ {
+ fprintf(stderr, "Usage: ncsa_auth \n");
+ exit(1);
}
if (stat(argv[1], &sb) != 0) {
fprintf(stderr, "cannot stat %s\n", argv[1]);
@@ -130,14 +126,72 @@
printf("ERR\n");
continue;
}
+#else
+ if (stat(passwdfile, &sb) == 0) {
+ if (sb.st_mtime != change_time) {
+ read_passwd_file(passwdfile);
+ change_time = sb.st_mtime;
+ }
+ }
+#endif
u = hash_lookup(hash, user);
if (u == NULL) {
+#ifdef _SQUID_MSWIN_
+ (callback)(data,"ERR");
+#else
printf("ERR\n");
+#endif
+ return 0;
} else if (strcmp(u->passwd, (char *) crypt(passwd, u->passwd))) {
+#ifdef _SQUID_MSWIN_
+ (callback)(data,"ERR");
+#else
printf("ERR\n");
+#endif
+ return 0;
} else {
+#ifdef _SQUID_MSWIN_
+ (callback)(data,"OK");
+#else
printf("OK\n");
+#endif
+ return 0;
}
+}
+
+#ifdef _SQUID_MSWIN_
+__declspec (dllexport) int
+Init(char *pwfile)
+{
+ if (passwdfile)
+ xfree(passwdfile);
+ passwdfile = xstrdup(pwfile);
+ return 0;
+}
+
+BOOL APIENTRY
+DllMain (
+ HINSTANCE hInst /* Library instance handle. */ ,
+ DWORD reason /* Reason this function is being called. */ ,
+ LPVOID reserved /* Not used. */ )
+{
+
+ switch (reason)
+ {
+ case DLL_PROCESS_ATTACH:
+ break;
+
+ case DLL_PROCESS_DETACH:
+ if (passwdfile)
+ xfree(passwdfile);
+ break;
+
+ case DLL_THREAD_ATTACH:
+ break;
+
+ case DLL_THREAD_DETACH:
+ break;
}
- exit(0);
+ return TRUE;
}
+#endif
Index: squid/auth_modules/PAM/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/PAM/Attic/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.22.1
diff -u -r1.1.1.1 -r1.1.1.1.22.1
--- squid/auth_modules/PAM/Makefile.in 26 Jan 2000 03:25:00 -0000 1.1.1.1
+++ squid/auth_modules/PAM/Makefile.in 6 Jan 2001 12:40:08 -0000 1.1.1.1.22.1
@@ -1,7 +1,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.1.1.1 2000/01/26 03:25:00 hno Exp $
+# $Id: Makefile.in,v 1.1.1.1.22.1 2001/01/06 12:40:08 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
Index: squid/auth_modules/PAM/pam_auth.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/PAM/Attic/pam_auth.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.18.1
diff -u -r1.1.1.1 -r1.1.1.1.18.1
--- squid/auth_modules/PAM/pam_auth.c 26 Jan 2000 03:25:00 -0000 1.1.1.1
+++ squid/auth_modules/PAM/pam_auth.c 6 Jan 2001 12:40:08 -0000 1.1.1.1.18.1
@@ -1,5 +1,5 @@
/*
- * $Id: pam_auth.c,v 1.1.1.1 2000/01/26 03:25:00 hno Exp $
+ * $Id: pam_auth.c,v 1.1.1.1.18.1 2001/01/06 12:40:08 hno Exp $
*
* PAM authenticator module for Squid.
* Copyright (C) 1999 Henrik Nordstrom
Index: squid/auth_modules/SMB/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/SMB/Attic/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.20.1
diff -u -r1.1.1.1 -r1.1.1.1.20.1
--- squid/auth_modules/SMB/Makefile.in 26 Jan 2000 03:25:00 -0000 1.1.1.1
+++ squid/auth_modules/SMB/Makefile.in 6 Jan 2001 12:40:09 -0000 1.1.1.1.20.1
@@ -1,7 +1,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.1.1.1 2000/01/26 03:25:00 hno Exp $
+# $Id: Makefile.in,v 1.1.1.1.20.1 2001/01/06 12:40:09 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
Index: squid/auth_modules/SMB/smb_auth.sh
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/SMB/Attic/smb_auth.sh,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.56.1
diff -u -r1.1.1.2 -r1.1.1.2.56.1
--- squid/auth_modules/SMB/smb_auth.sh 26 Jan 2000 03:25:00 -0000 1.1.1.2
+++ squid/auth_modules/SMB/smb_auth.sh 6 Jan 2001 12:40:09 -0000 1.1.1.2.56.1
@@ -67,5 +67,6 @@
echo "Contents of //$dcname/$AUTHSHARE/$AUTHFILE: $authinfo"
# Allow for both \n and \r\n end-of-line termination
-[ "$authinfo" = "allow" -o "$authinfo" = "allow
" ] || exit 1
+[ "$authinfo" = "allow" -o "$authinfo" = "allow
+" ] || exit 1
exit 0
Index: squid/auth_modules/getpwnam/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/auth_modules/getpwnam/Attic/Makefile.in,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.30.1
diff -u -r1.1.1.2 -r1.1.1.2.30.1
--- squid/auth_modules/getpwnam/Makefile.in 26 Jan 2000 03:25:00 -0000 1.1.1.2
+++ squid/auth_modules/getpwnam/Makefile.in 6 Jan 2001 12:40:09 -0000 1.1.1.2.30.1
@@ -1,7 +1,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.1.1.2 2000/01/26 03:25:00 hno Exp $
+# $Id: Makefile.in,v 1.1.1.2.30.1 2001/01/06 12:40:09 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
Index: squid/contrib/rredir.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/contrib/rredir.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/contrib/rredir.c 26 Jan 2000 03:21:46 -0000 1.1.1.1
+++ squid/contrib/rredir.c 6 Jan 2001 12:40:09 -0000 1.1.1.1.44.1
@@ -1,4 +1,4 @@
-/* $Id: rredir.c,v 1.1.1.1 2000/01/26 03:21:46 hno Exp $ */
+/* $Id: rredir.c,v 1.1.1.1.44.1 2001/01/06 12:40:09 hno Exp $ */
/*
* From: richard@hekkihek.hacom.nl (Richard Huveneers)
Index: squid/doc/Release-Notes-1.0.txt
===================================================================
RCS file: /cvsroot/squid-sf//squid/doc/Attic/Release-Notes-1.0.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/doc/Release-Notes-1.0.txt 26 Jan 2000 03:21:46 -0000 1.1.1.1
+++ squid/doc/Release-Notes-1.0.txt 6 Jan 2001 12:40:09 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
-$Id: Release-Notes-1.0.txt,v 1.1.1.1 2000/01/26 03:21:46 hno Exp $
+$Id: Release-Notes-1.0.txt,v 1.1.1.1.44.1 2001/01/06 12:40:09 hno Exp $
Release Notes for version 1.0 of the Squid cache.
Index: squid/doc/Release-Notes-1.1.txt
===================================================================
RCS file: /cvsroot/squid-sf//squid/doc/Attic/Release-Notes-1.1.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/doc/Release-Notes-1.1.txt 26 Jan 2000 03:21:46 -0000 1.1.1.1
+++ squid/doc/Release-Notes-1.1.txt 6 Jan 2001 12:40:09 -0000 1.1.1.1.44.1
@@ -1,4 +1,4 @@
-$Id: Release-Notes-1.1.txt,v 1.1.1.1 2000/01/26 03:21:46 hno Exp $
+$Id: Release-Notes-1.1.txt,v 1.1.1.1.44.1 2001/01/06 12:40:09 hno Exp $
Release Notes for version 1.1 of the Squid cache.
Index: squid/doc/Programming-Guide/prog-guide.sgml
===================================================================
RCS file: /cvsroot/squid-sf//squid/doc/Programming-Guide/prog-guide.sgml,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/doc/Programming-Guide/prog-guide.sgml 17 Apr 2000 00:56:52 -0000 1.1.1.2.4.1
+++ squid/doc/Programming-Guide/prog-guide.sgml 6 Jan 2001 12:40:09 -0000 1.1.1.2.4.1.2.1
@@ -2,7 +2,7 @@
Squid Programmers Guide
Duane Wessels, Squid Developers
-$Id: prog-guide.sgml,v 1.1.1.2.4.1 2000/04/17 00:56:52 hno Exp $
+$Id: prog-guide.sgml,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:09 hno Exp $
Squid is a WWW Cache application developed by the National Laboratory
Index: squid/errors/Japanese/ERR_FTP_FORBIDDEN
===================================================================
RCS file: /cvsroot/squid-sf//squid/errors/Japanese/ERR_FTP_FORBIDDEN,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.40.1
diff -u -r1.1.1.1 -r1.1.1.1.40.1
--- squid/errors/Japanese/ERR_FTP_FORBIDDEN 26 Jan 2000 03:23:10 -0000 1.1.1.1
+++ squid/errors/Japanese/ERR_FTP_FORBIDDEN 6 Jan 2001 12:40:09 -0000 1.1.1.1.40.1
@@ -1,17 +1,17 @@
-ERROR: The requested URL could not be retrieved
+
+エラー: リクエストされた URL は取得できませんでした
-ERROR
-The requested URL could not be retrieved
+エラー
+リクエストされた URL は取得できませんでした
-An FTP authentication failure occurred
-while trying to retrieve the URL:
+以下のURLを取得しようとしているとき、FTPの認証の失敗が発生しました:
%U
-Squid sent the following FTP command:
+Squidは以下のFTPコマンドを送りました:
%f
-and then received this reply
+そして、この様な応答を受け取りました。
%F
%g
Index: squid/errors/Japanese/ERR_FTP_NOT_FOUND
===================================================================
RCS file: /cvsroot/squid-sf//squid/errors/Japanese/ERR_FTP_NOT_FOUND,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.40.1
diff -u -r1.1.1.1 -r1.1.1.1.40.1
--- squid/errors/Japanese/ERR_FTP_NOT_FOUND 26 Jan 2000 03:23:10 -0000 1.1.1.1
+++ squid/errors/Japanese/ERR_FTP_NOT_FOUND 6 Jan 2001 12:40:09 -0000 1.1.1.1.40.1
@@ -1,21 +1,21 @@
-ERROR: The requested URL could not be retrieved
+
+エラー: リクエストされた URL は取得できませんでした
-ERROR
-The requested URL could not be retrieved
+エラー
+リクエストされた URL は取得できませんでした
-The following URL could not be retrieved:
+以下のURLを取得できませんでした:
%U
-Squid sent the following FTP command:
+Squidは以下のFTPコマンドを送りました:
%f
-and then received this reply
+そして、この様な応答を受け取りました。
%F
%g
-This might be caused by an FTP URL with an absolute path (which does
-not comply with RFC 1738). If this is the cause, then the file
-can be found at %B.
+これは(RFC 1738に従っていない)絶対パスを含んだFTPのURLによる可能性があります。
+その場合に該当するなら、ファイルは%Bに見つかるかもしれません。
Index: squid/errors/Japanese/ERR_FTP_UNAVAILABLE
===================================================================
RCS file: /cvsroot/squid-sf//squid/errors/Japanese/ERR_FTP_UNAVAILABLE,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.40.1
diff -u -r1.1.1.1 -r1.1.1.1.40.1
--- squid/errors/Japanese/ERR_FTP_UNAVAILABLE 26 Jan 2000 03:23:10 -0000 1.1.1.1
+++ squid/errors/Japanese/ERR_FTP_UNAVAILABLE 6 Jan 2001 12:40:09 -0000 1.1.1.1.40.1
@@ -1,16 +1,17 @@
-ERROR: The requested URL could not be retrieved
+
+エラー: リクエストされた URL は取得できませんでした
-ERROR
-The requested URL could not be retrieved
+エラー
+リクエストされた URL は取得できませんでした
-The FTP server was too busy while trying to retrieve the URL:
+以下のURLを取得しようとしているとき、FTPサーバの負荷が高すぎました:
%U
-Squid sent the following FTP command:
+Squidは以下のFTPコマンドを送りました:
%f
-and then received this reply
+そして、この様な応答を受け取りました。
%F
%g
Index: squid/errors/Japanese/ERR_SHUTTING_DOWN
===================================================================
RCS file: /cvsroot/squid-sf//squid/errors/Japanese/ERR_SHUTTING_DOWN,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/errors/Japanese/ERR_SHUTTING_DOWN 17 Apr 2000 00:56:52 -0000 1.1.1.1.4.1
+++ squid/errors/Japanese/ERR_SHUTTING_DOWN 6 Jan 2001 12:40:10 -0000 1.1.1.1.4.1.2.1
@@ -2,7 +2,7 @@
エラー: リクエストされた URL は取得できませんでした
-ERROR
+エラー
リクエストされた URL は取得できませんでした
Index: squid/include/Array.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/Array.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/Array.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/Array.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: Array.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: Array.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
* AUTHOR: Alex Rousskov
*
Index: squid/include/GNUregex.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/GNUregex.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.44.1
diff -u -r1.1.1.2 -r1.1.1.2.44.1
--- squid/include/GNUregex.h 26 Jan 2000 03:23:10 -0000 1.1.1.2
+++ squid/include/GNUregex.h 6 Jan 2001 12:40:10 -0000 1.1.1.2.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: GNUregex.h,v 1.1.1.2 2000/01/26 03:23:10 hno Exp $
+ * $Id: GNUregex.h,v 1.1.1.2.44.1 2001/01/06 12:40:10 hno Exp $
*/
/* Definitions for data structures and routines for the regular
Index: squid/include/Stack.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/Stack.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/Stack.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/Stack.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: Stack.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: Stack.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
* AUTHOR: Alex Rousskov
*
Index: squid/include/asn1.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/asn1.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/asn1.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/asn1.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -28,7 +28,7 @@
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*
- * $Id: asn1.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: asn1.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
**********************************************************************/
Index: squid/include/cache_snmp.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/cache_snmp.h,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.30.1
diff -u -r1.1.1.3 -r1.1.1.3.30.1
--- squid/include/cache_snmp.h 26 Jan 2000 03:25:00 -0000 1.1.1.3
+++ squid/include/cache_snmp.h 6 Jan 2001 12:40:10 -0000 1.1.1.3.30.1
@@ -1,5 +1,5 @@
/*
- * $Id: cache_snmp.h,v 1.1.1.3 2000/01/26 03:25:00 hno Exp $
+ * $Id: cache_snmp.h,v 1.1.1.3.30.1 2001/01/06 12:40:10 hno Exp $
*/
#ifdef SQUID_SNMP
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
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/include/config.h.in 1 Aug 2000 00:05:18 -0000 1.1.1.3.4.1
+++ squid/include/config.h.in 6 Jan 2001 12:40:10 -0000 1.1.1.3.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: config.h.in,v 1.1.1.3.4.1 2000/08/01 00:05:18 hno Exp $
+ * $Id: config.h.in,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* AUTHOR: Duane Wessels
*
Index: squid/include/hash.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/hash.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.42.1
diff -u -r1.1.1.1 -r1.1.1.1.42.1
--- squid/include/hash.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/hash.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.42.1
@@ -1,5 +1,5 @@
/*
- * $Id: hash.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: hash.h,v 1.1.1.1.42.1 2001/01/06 12:40:10 hno Exp $
*/
typedef void HASHFREE(void *);
Index: squid/include/heap.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/heap.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- squid/include/heap.h 26 Jan 2000 03:25:00 -0000 1.1.1.1
+++ squid/include/heap.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: heap.h,v 1.1.1.1 2000/01/26 03:25:00 hno Exp $
+ * $Id: heap.h,v 1.1.1.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* AUTHOR: John Dilley, Hewlett Packard
*
Index: squid/include/md5.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/md5.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/md5.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/md5.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: md5.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: md5.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
#ifndef MD5_H
Index: squid/include/parse.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/parse.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/parse.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/parse.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: parse.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: parse.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
#ifndef _HAVE_PARSE_H_
Index: squid/include/radix.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/radix.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.42.1
diff -u -r1.1.1.1 -r1.1.1.1.42.1
--- squid/include/radix.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/radix.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.42.1
@@ -1,5 +1,5 @@
/*
- * $Id: radix.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: radix.h,v 1.1.1.1.42.1 2001/01/06 12:40:10 hno Exp $
*/
/*
@@ -154,5 +154,5 @@
*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))
+//#define min(x,y) ((x)<(y)? (x) : (y))
#endif /* _RADIX_H_ */
Index: squid/include/rfc1035.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/rfc1035.h,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/include/rfc1035.h 15 Jul 2000 20:50:07 -0000 1.1.1.1.4.1
+++ squid/include/rfc1035.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: rfc1035.h,v 1.1.1.1.4.1 2000/07/15 20:50:07 hno Exp $
+ * $Id: rfc1035.h,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* AUTHOR: Harvest Derived
*
Index: squid/include/snmp-internal.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp-internal.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp-internal.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp-internal.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -24,7 +24,7 @@
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*
- * $Id: snmp-internal.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp-internal.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
**********************************************************************/
Index: squid/include/snmp-mib.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp-mib.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp-mib.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp-mib.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -26,7 +26,7 @@
*
* Author: Ryan Troll
*
- * $Id: snmp-mib.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp-mib.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
***************************************************************************/
Index: squid/include/snmp.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -27,7 +27,7 @@
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*
- * $Id: snmp.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
**********************************************************************/
Index: squid/include/snmp_api.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_api.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_api.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_api.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: snmp_api.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_api.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
#ifndef _SNMP_API_H_
Index: squid/include/snmp_api_error.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_api_error.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_api_error.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_api_error.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -26,7 +26,7 @@
*
* Author: Ryan Troll
*
- * $Id: snmp_api_error.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_api_error.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
***************************************************************************/
Index: squid/include/snmp_api_util.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_api_util.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_api_util.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_api_util.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: snmp_api_util.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_api_util.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
#ifndef _SNMP_API_UTIL_H_
Index: squid/include/snmp_client.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_client.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_client.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_client.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: snmp_client.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_client.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
#ifndef _SNMP_CLIENT_H_
Index: squid/include/snmp_coexist.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_coexist.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_coexist.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_coexist.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -26,7 +26,7 @@
*
* Author: Ryan Troll
*
- * $Id: snmp_coexist.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_coexist.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
**********************************************************************/
Index: squid/include/snmp_compat.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/Attic/snmp_compat.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_compat.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_compat.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -26,7 +26,7 @@
*
* Author: Ryan Troll
*
- * $Id: snmp_compat.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_compat.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
***************************************************************************/
Index: squid/include/snmp_debug.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_debug.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.44.1
diff -u -r1.1.1.2 -r1.1.1.2.44.1
--- squid/include/snmp_debug.h 26 Jan 2000 03:23:10 -0000 1.1.1.2
+++ squid/include/snmp_debug.h 6 Jan 2001 12:40:10 -0000 1.1.1.2.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: snmp_debug.h,v 1.1.1.2 2000/01/26 03:23:10 hno Exp $
+ * $Id: snmp_debug.h,v 1.1.1.2.44.1 2001/01/06 12:40:10 hno Exp $
*/
#ifndef SNMP_DEBUG_H
Index: squid/include/snmp_error.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_error.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_error.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_error.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -24,7 +24,7 @@
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*
- * $Id: snmp_error.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_error.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
**********************************************************************/
Index: squid/include/snmp_impl.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_impl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_impl.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_impl.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: snmp_impl.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_impl.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
#ifndef _SNMP_IMPL_H_
Index: squid/include/snmp_msg.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_msg.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_msg.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_msg.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -26,7 +26,7 @@
*
* Author: Ryan Troll
*
- * $Id: snmp_msg.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_msg.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
**********************************************************************/
Index: squid/include/snmp_pdu.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_pdu.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_pdu.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_pdu.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -27,7 +27,7 @@
*
* Author: Ryan Troll
*
- * $Id: snmp_pdu.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_pdu.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
**********************************************************************/
Index: squid/include/snmp_session.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_session.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_session.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_session.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -24,7 +24,7 @@
* ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*
- * $Id: snmp_session.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_session.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*
**********************************************************************/
Index: squid/include/snmp_util.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_util.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snmp_util.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snmp_util.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: snmp_util.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snmp_util.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
#ifndef SNMP_UTIL_H
Index: squid/include/snmp_vars.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snmp_vars.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.30.1
diff -u -r1.1.1.2 -r1.1.1.2.30.1
--- squid/include/snmp_vars.h 26 Jan 2000 03:25:00 -0000 1.1.1.2
+++ squid/include/snmp_vars.h 6 Jan 2001 12:40:10 -0000 1.1.1.2.30.1
@@ -26,7 +26,7 @@
*
* Author: Ryan Troll
*
- * $Id: snmp_vars.h,v 1.1.1.2 2000/01/26 03:25:00 hno Exp $
+ * $Id: snmp_vars.h,v 1.1.1.2.30.1 2001/01/06 12:40:10 hno Exp $
*
**********************************************************************/
Index: squid/include/snprintf.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/snprintf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/snprintf.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/snprintf.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: snprintf.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: snprintf.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
/* if you have configure you can use this */
Index: squid/include/splay.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/splay.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.2.1
diff -u -r1.1.1.2 -r1.1.1.2.2.1
--- squid/include/splay.h 26 Jan 2000 03:25:00 -0000 1.1.1.2
+++ squid/include/splay.h 6 Jan 2001 12:40:10 -0000 1.1.1.2.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: splay.h,v 1.1.1.2 2000/01/26 03:25:00 hno Exp $
+ * $Id: splay.h,v 1.1.1.2.2.1 2001/01/06 12:40:10 hno Exp $
*/
Index: squid/include/tempnam.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/tempnam.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/tempnam.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/tempnam.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: tempnam.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: tempnam.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
Index: squid/include/tree.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/Attic/tree.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/include/tree.h 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/include/tree.h 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -3,7 +3,7 @@
* vix 22jan93 [revisited; uses RCS, ANSI, POSIX; has bug fixes]
* vix 27jun86 [broken out of tree.c]
*
- * $Id: tree.h,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: tree.h,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
Index: squid/include/util.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/util.h,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/include/util.h 31 Dec 2000 05:24:16 -0000 1.1.1.3.4.1
+++ squid/include/util.h 6 Jan 2001 12:40:10 -0000 1.1.1.3.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: util.h,v 1.1.1.3.4.1 2000/12/31 05:24:16 hno Exp $
+ * $Id: util.h,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* AUTHOR: Harvest Derived
*
Index: squid/include/version.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/version.h,v
retrieving revision 1.1.1.3.4.4
retrieving revision 1.1.1.3.4.4.2.1
diff -u -r1.1.1.3.4.4 -r1.1.1.3.4.4.2.1
--- squid/include/version.h 1 Aug 2000 00:05:18 -0000 1.1.1.3.4.4
+++ squid/include/version.h 6 Jan 2001 12:40:10 -0000 1.1.1.3.4.4.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: version.h,v 1.1.1.3.4.4 2000/08/01 00:05:18 hno Exp $
+ * $Id: version.h,v 1.1.1.3.4.4.2.1 2001/01/06 12:40:10 hno Exp $
*
* SQUID_VERSION - String for version id of this distribution
*/
@@ -8,5 +8,5 @@
#endif
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME squid_curtime
+#define SQUID_RELEASE_TIME 974851223
#endif
Index: squid/lib/Array.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/Array.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/lib/Array.c 17 Apr 2000 00:56:52 -0000 1.1.1.2.4.1
+++ squid/lib/Array.c 6 Jan 2001 12:40:10 -0000 1.1.1.2.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: Array.c,v 1.1.1.2.4.1 2000/04/17 00:56:52 hno Exp $
+ * $Id: Array.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* AUTHOR: Alex Rousskov
*
@@ -55,7 +55,7 @@
Array *
arrayCreate()
{
- Array *a = xmalloc(sizeof(Array));
+ Array *a =(Array *) xmalloc(sizeof(Array));
arrayInit(a);
return a;
}
@@ -118,8 +118,8 @@
assert(delta > 0);
a->capacity += delta;
a->items = a->items ?
- xrealloc(a->items, a->capacity * sizeof(void *)) :
- xmalloc(a->capacity * sizeof(void *));
+ (void**)xrealloc(a->items, a->capacity * sizeof(void *)) :
+ (void**)xmalloc(a->capacity * sizeof(void *));
/* reset, just in case */
memset(a->items + a->count, 0, (a->capacity - a->count) * sizeof(void *));
}
Index: squid/lib/GNUregex.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/GNUregex.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.42.1
diff -u -r1.1.1.1 -r1.1.1.1.42.1
--- squid/lib/GNUregex.c 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/lib/GNUregex.c 6 Jan 2001 12:40:10 -0000 1.1.1.1.42.1
@@ -1,5 +1,5 @@
/*
- * $Id: GNUregex.c,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: GNUregex.c,v 1.1.1.1.42.1 2001/01/06 12:40:10 hno Exp $
*/
/* Extended regular expression matching and search library,
Index: squid/lib/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/Attic/Makefile.in,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/lib/Makefile.in 31 Dec 2000 05:24:16 -0000 1.1.1.2.4.1
+++ squid/lib/Makefile.in 6 Jan 2001 12:40:10 -0000 1.1.1.2.4.1.2.1
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.in,v 1.1.1.2.4.1 2000/12/31 05:24:16 hno Exp $
+# $Id: Makefile.in,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:10 hno Exp $
#
prefix = @prefix@
top_srcdir = @top_srcdir@
Index: squid/lib/Stack.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/Stack.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/lib/Stack.c 17 Apr 2000 00:56:52 -0000 1.1.1.2.4.1
+++ squid/lib/Stack.c 6 Jan 2001 12:40:10 -0000 1.1.1.2.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: Stack.c,v 1.1.1.2.4.1 2000/04/17 00:56:52 hno Exp $
+ * $Id: Stack.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* AUTHOR: Alex Rousskov
*
Index: squid/lib/base64.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/base64.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.40.1
diff -u -r1.1.1.1 -r1.1.1.1.40.1
--- squid/lib/base64.c 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/lib/base64.c 6 Jan 2001 12:40:10 -0000 1.1.1.1.40.1
@@ -1,5 +1,5 @@
/*
- * $Id: base64.c,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: base64.c,v 1.1.1.1.40.1 2001/01/06 12:40:10 hno Exp $
*/
#include "config.h"
Index: squid/lib/dlmalloc.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/dlmalloc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/lib/dlmalloc.c 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/lib/dlmalloc.c 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: dlmalloc.c,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: dlmalloc.c,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
/* ---------- To make a malloc.h, start cutting here ------------ */
@@ -319,7 +319,7 @@
*/
/* #define WIN32 */
-#ifdef WIN32
+#ifdef _SQUID_MSWIN_
#define MORECORE wsbrk
#define HAVE_MMAP 0
#endif
@@ -897,7 +897,7 @@
*/
-#ifdef WIN32
+#ifdef _SQUID_MSWIN_
#define AlignPage(add) (((add) + (malloc_getpagesize-1)) &
~(malloc_getpagesize-1))
Index: squid/lib/getfullhostname.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/getfullhostname.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/lib/getfullhostname.c 17 Apr 2000 00:56:52 -0000 1.1.1.1.4.1
+++ squid/lib/getfullhostname.c 6 Jan 2001 12:40:10 -0000 1.1.1.1.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: getfullhostname.c,v 1.1.1.1.4.1 2000/04/17 00:56:52 hno Exp $
+ * $Id: getfullhostname.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* DEBUG:
* AUTHOR: Harvest Derived
Index: squid/lib/hash.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/hash.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/lib/hash.c 17 Apr 2000 00:56:52 -0000 1.1.1.3.4.1
+++ squid/lib/hash.c 6 Jan 2001 12:40:10 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: hash.c,v 1.1.1.3.4.1 2000/04/17 00:56:52 hno Exp $
+ * $Id: hash.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* DEBUG: section 0 Hash Tables
* AUTHOR: Harvest Derived
Index: squid/lib/heap.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/heap.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/lib/heap.c 17 Apr 2000 00:56:52 -0000 1.1.1.1.4.1
+++ squid/lib/heap.c 6 Jan 2001 12:40:10 -0000 1.1.1.1.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: heap.c,v 1.1.1.1.4.1 2000/04/17 00:56:52 hno Exp $
+ * $Id: heap.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* AUTHOR: John Dilley, Hewlett Packard
*
Index: squid/lib/iso3307.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/iso3307.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/lib/iso3307.c 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/lib/iso3307.c 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: iso3307.c,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: iso3307.c,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
#include "config.h"
Index: squid/lib/md5-test.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/md5-test.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/lib/md5-test.c 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/lib/md5-test.c 6 Jan 2001 12:40:10 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: md5-test.c,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: md5-test.c,v 1.1.1.1.44.1 2001/01/06 12:40:10 hno Exp $
*/
/*
Index: squid/lib/md5.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/md5.c,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.30.1
diff -u -r1.1.1.2 -r1.1.1.2.30.1
--- squid/lib/md5.c 26 Jan 2000 03:25:00 -0000 1.1.1.2
+++ squid/lib/md5.c 6 Jan 2001 12:40:10 -0000 1.1.1.2.30.1
@@ -1,5 +1,5 @@
/*
- * $Id: md5.c,v 1.1.1.2 2000/01/26 03:25:00 hno Exp $
+ * $Id: md5.c,v 1.1.1.2.30.1 2001/01/06 12:40:10 hno Exp $
*/
/* taken from RFC-1321/Appendix A.3 */
Index: squid/lib/radix.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/radix.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/lib/radix.c 17 Apr 2000 00:56:52 -0000 1.1.1.2.4.1
+++ squid/lib/radix.c 6 Jan 2001 12:40:10 -0000 1.1.1.2.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: radix.c,v 1.1.1.2.4.1 2000/04/17 00:56:52 hno Exp $
+ * $Id: radix.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* DEBUG: section 53 Radix tree data structure implementation
* AUTHOR: NetBSD Derived
Index: squid/lib/rfc1035.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/rfc1035.c,v
retrieving revision 1.1.1.1.4.3
retrieving revision 1.1.1.1.4.3.2.1
diff -u -r1.1.1.1.4.3 -r1.1.1.1.4.3.2.1
--- squid/lib/rfc1035.c 15 Jul 2000 20:50:08 -0000 1.1.1.1.4.3
+++ squid/lib/rfc1035.c 6 Jan 2001 12:40:10 -0000 1.1.1.1.4.3.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: rfc1035.c,v 1.1.1.1.4.3 2000/07/15 20:50:08 hno Exp $
+ * $Id: rfc1035.c,v 1.1.1.1.4.3.2.1 2001/01/06 12:40:10 hno Exp $
*
* Low level DNS protocol routines
* AUTHOR: Duane Wessels
Index: squid/lib/rfc1123.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/rfc1123.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/lib/rfc1123.c 17 Apr 2000 00:56:52 -0000 1.1.1.3.4.1
+++ squid/lib/rfc1123.c 6 Jan 2001 12:40:10 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: rfc1123.c,v 1.1.1.3.4.1 2000/04/17 00:56:52 hno Exp $
+ * $Id: rfc1123.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* DEBUG:
* AUTHOR: Harvest Derived
Index: squid/lib/rfc1738.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/rfc1738.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/lib/rfc1738.c 17 Apr 2000 00:56:52 -0000 1.1.1.2.4.1
+++ squid/lib/rfc1738.c 6 Jan 2001 12:40:10 -0000 1.1.1.2.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: rfc1738.c,v 1.1.1.2.4.1 2000/04/17 00:56:52 hno Exp $
+ * $Id: rfc1738.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* DEBUG:
* AUTHOR: Harvest Derived
@@ -97,7 +97,7 @@
if (buf == NULL || strlen(url) * 3 > bufsize) {
xfree(buf);
bufsize = strlen(url) * 3 + 1;
- buf = xcalloc(bufsize, 1);
+ buf = (char* )xcalloc(bufsize, 1);
}
for (p = url, q = buf; *p != '\0'; p++, q++) {
do_escape = 0;
Index: squid/lib/safe_inet_addr.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/safe_inet_addr.c,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.30.1
diff -u -r1.1.1.3 -r1.1.1.3.30.1
--- squid/lib/safe_inet_addr.c 26 Jan 2000 03:25:00 -0000 1.1.1.3
+++ squid/lib/safe_inet_addr.c 6 Jan 2001 12:40:10 -0000 1.1.1.3.30.1
@@ -1,6 +1,6 @@
/*
- * $Id: safe_inet_addr.c,v 1.1.1.3 2000/01/26 03:25:00 hno Exp $
+ * $Id: safe_inet_addr.c,v 1.1.1.3.30.1 2001/01/06 12:40:10 hno Exp $
*/
#include "config.h"
Index: squid/lib/snprintf.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/snprintf.c,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.30.1
diff -u -r1.1.1.3 -r1.1.1.3.30.1
--- squid/lib/snprintf.c 26 Jan 2000 03:25:00 -0000 1.1.1.3
+++ squid/lib/snprintf.c 6 Jan 2001 12:40:10 -0000 1.1.1.3.30.1
@@ -1,5 +1,5 @@
/*
- * $Id: snprintf.c,v 1.1.1.3 2000/01/26 03:25:00 hno Exp $
+ * $Id: snprintf.c,v 1.1.1.3.30.1 2001/01/06 12:40:10 hno Exp $
*/
/* ====================================================================
Index: squid/lib/splay.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/splay.c,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.2.1
diff -u -r1.1.1.2 -r1.1.1.2.2.1
--- squid/lib/splay.c 26 Jan 2000 03:25:00 -0000 1.1.1.2
+++ squid/lib/splay.c 6 Jan 2001 12:40:10 -0000 1.1.1.2.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: splay.c,v 1.1.1.2 2000/01/26 03:25:00 hno Exp $
+ * $Id: splay.c,v 1.1.1.2.2.1 2001/01/06 12:40:10 hno Exp $
*/
#include "config.h"
Index: squid/lib/strerror.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/strerror.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/lib/strerror.c 17 Apr 2000 00:56:52 -0000 1.1.1.1.4.1
+++ squid/lib/strerror.c 6 Jan 2001 12:40:10 -0000 1.1.1.1.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: strerror.c,v 1.1.1.1.4.1 2000/04/17 00:56:52 hno Exp $
+ * $Id: strerror.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:10 hno Exp $
*
* DEBUG:
* AUTHOR: Duane Wessels
Index: squid/lib/stub_memaccount.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/stub_memaccount.c,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.30.1
diff -u -r1.1.1.2 -r1.1.1.2.30.1
--- squid/lib/stub_memaccount.c 26 Jan 2000 03:25:00 -0000 1.1.1.2
+++ squid/lib/stub_memaccount.c 6 Jan 2001 12:40:10 -0000 1.1.1.2.30.1
@@ -1,5 +1,5 @@
/*
- * $Id: stub_memaccount.c,v 1.1.1.2 2000/01/26 03:25:00 hno Exp $
+ * $Id: stub_memaccount.c,v 1.1.1.2.30.1 2001/01/06 12:40:10 hno Exp $
*/
/* Stub function for programs not implementing statMemoryAccounted */
Index: squid/lib/tempnam.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/tempnam.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/lib/tempnam.c 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/lib/tempnam.c 6 Jan 2001 12:40:11 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: tempnam.c,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: tempnam.c,v 1.1.1.1.44.1 2001/01/06 12:40:11 hno Exp $
*/
/* A reasonably functional tmpnam. */
Index: squid/lib/util.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/util.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/lib/util.c 1 Aug 2000 00:05:18 -0000 1.1.1.3.4.2
+++ squid/lib/util.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: util.c,v 1.1.1.3.4.2 2000/08/01 00:05:18 hno Exp $
+ * $Id: util.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG:
* AUTHOR: Harvest Derived
@@ -581,7 +581,7 @@
}
/* copy string, including terminating character */
sz = strlen(s) + 1;
- return memcpy(xmalloc(sz), s, sz);
+ return (char *)memcpy(xmalloc(sz), s, sz);
}
/*
@@ -596,7 +596,7 @@
sz = strlen(s) + 1;
if (sz > n)
sz = n;
- return xstrncpy(xmalloc(sz), s, sz);
+ return (char *)xstrncpy((char *)xmalloc(sz), s, sz);
}
/*
Index: squid/lib/uudecode.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/uudecode.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/lib/uudecode.c 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/lib/uudecode.c 6 Jan 2001 12:40:11 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
/*
- * $Id: uudecode.c,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: uudecode.c,v 1.1.1.1.44.1 2001/01/06 12:40:11 hno Exp $
*/
#include "config.h"
@@ -45,7 +45,7 @@
nprbytes = (char *) bufin - bufcoded - 1;
nbytesdecoded = ((nprbytes + 3) / 4) * 3;
- bufplain = xmalloc(nbytesdecoded + 1);
+ bufplain = (char*)xmalloc(nbytesdecoded + 1);
bufout = (unsigned char *) bufplain;
bufin = (const unsigned char *) bufcoded;
Index: squid/scripts/RunAccel.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/scripts/Attic/RunAccel.in,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.44.1
diff -u -r1.1.1.2 -r1.1.1.2.44.1
--- squid/scripts/RunAccel.in 26 Jan 2000 03:23:10 -0000 1.1.1.2
+++ squid/scripts/RunAccel.in 6 Jan 2001 12:40:11 -0000 1.1.1.2.44.1
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: RunAccel.in,v 1.1.1.2 2000/01/26 03:23:10 hno Exp $
+# $Id: RunAccel.in,v 1.1.1.2.44.1 2001/01/06 12:40:11 hno Exp $
# enable HTTP requests on port 80
port="-a 80"
Index: squid/scripts/RunCache.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/scripts/RunCache.in,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.44.1
diff -u -r1.1.1.2 -r1.1.1.2.44.1
--- squid/scripts/RunCache.in 26 Jan 2000 03:23:10 -0000 1.1.1.2
+++ squid/scripts/RunCache.in 6 Jan 2001 12:40:11 -0000 1.1.1.2.44.1
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: RunCache.in,v 1.1.1.2 2000/01/26 03:23:10 hno Exp $
+# $Id: RunCache.in,v 1.1.1.2.44.1 2001/01/06 12:40:11 hno Exp $
prefix=@prefix@
exec_prefix=@exec_prefix@
Index: squid/scripts/check_cache.pl
===================================================================
RCS file: /cvsroot/squid-sf//squid/scripts/check_cache.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/scripts/check_cache.pl 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/scripts/check_cache.pl 6 Jan 2001 12:40:11 -0000 1.1.1.1.44.1
@@ -8,7 +8,7 @@
# Check the Squid-1.1.x cache directory for stale objects - i.e. those
# which exist on disk but aren't listed in cached's log file.
-# $Id: check_cache.pl,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+# $Id: check_cache.pl,v 1.1.1.1.44.1 2001/01/06 12:40:11 hno Exp $
require "getopts.pl";
&Getopts("c:drt:vh");
Index: squid/scripts/fileno-to-pathname.pl
===================================================================
RCS file: /cvsroot/squid-sf//squid/scripts/fileno-to-pathname.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/scripts/fileno-to-pathname.pl 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/scripts/fileno-to-pathname.pl 6 Jan 2001 12:40:11 -0000 1.1.1.1.44.1
@@ -1,6 +1,6 @@
#!/usr/local/bin/perl
-# $Id: fileno-to-pathname.pl,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+# $Id: fileno-to-pathname.pl,v 1.1.1.1.44.1 2001/01/06 12:40:11 hno Exp $
# Convert hexadecimal cache file numbers (from swap log) into full pathnames.
# Duane Wessels 6/30/97
Index: squid/scripts/flag_truncs.pl
===================================================================
RCS file: /cvsroot/squid-sf//squid/scripts/flag_truncs.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/scripts/flag_truncs.pl 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/scripts/flag_truncs.pl 6 Jan 2001 12:40:11 -0000 1.1.1.1.44.1
@@ -6,7 +6,7 @@
# - i.e. those for which there is a "Content-length:" HTTP header,
# and this does not match the size of the cached object
-# $Id: flag_truncs.pl,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+# $Id: flag_truncs.pl,v 1.1.1.1.44.1 2001/01/06 12:40:11 hno Exp $
require "getopts.pl";
require "stat.pl";
Index: squid/scripts/upgrade-1.0-store.pl
===================================================================
RCS file: /cvsroot/squid-sf//squid/scripts/upgrade-1.0-store.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/scripts/upgrade-1.0-store.pl 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/scripts/upgrade-1.0-store.pl 6 Jan 2001 12:40:11 -0000 1.1.1.1.44.1
@@ -1,6 +1,6 @@
#!/usr/local/bin/perl
-# $Id: upgrade-1.0-store.pl,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+# $Id: upgrade-1.0-store.pl,v 1.1.1.1.44.1 2001/01/06 12:40:11 hno Exp $
select(STDERR); $|=1;
select(STDOUT); $|=1;
Index: squid/src/CacheDigest.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/CacheDigest.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/CacheDigest.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1
+++ squid/src/CacheDigest.c 6 Jan 2001 12:40:11 -0000 1.1.1.2.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: CacheDigest.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: CacheDigest.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 70 Cache Digest
* AUTHOR: Alex Rousskov
Index: squid/src/ETag.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/ETag.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/ETag.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1
+++ squid/src/ETag.c 6 Jan 2001 12:40:11 -0000 1.1.1.1.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: ETag.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: ETag.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* AUTHOR: Alex Rousskov
*
Index: squid/src/HttpBody.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpBody.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/HttpBody.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1
+++ squid/src/HttpBody.c 6 Jan 2001 12:40:11 -0000 1.1.1.1.4.1.2.1
@@ -2,7 +2,7 @@
/*
- * $Id: HttpBody.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: HttpBody.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 56 HTTP Message Body
* AUTHOR: Alex Rousskov
Index: squid/src/HttpHdrCc.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpHdrCc.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/HttpHdrCc.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/HttpHdrCc.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: HttpHdrCc.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: HttpHdrCc.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 65 HTTP Cache Control Header
* AUTHOR: Alex Rousskov
Index: squid/src/HttpHdrContRange.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpHdrContRange.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/HttpHdrContRange.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/HttpHdrContRange.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: HttpHdrContRange.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: HttpHdrContRange.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 68 HTTP Content-Range Header
* AUTHOR: Alex Rousskov
Index: squid/src/HttpHdrExtField.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpHdrExtField.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/HttpHdrExtField.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/HttpHdrExtField.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: HttpHdrExtField.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: HttpHdrExtField.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 69 HTTP Header: Extension Field
* AUTHOR: Alex Rousskov
Index: squid/src/HttpHdrRange.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpHdrRange.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/HttpHdrRange.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/HttpHdrRange.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: HttpHdrRange.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: HttpHdrRange.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 64 HTTP Range Header
* AUTHOR: Alex Rousskov
Index: squid/src/HttpHeader.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpHeader.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/HttpHeader.c 31 Dec 2000 05:24:17 -0000 1.1.1.3.4.2
+++ squid/src/HttpHeader.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: HttpHeader.c,v 1.1.1.3.4.2 2000/12/31 05:24:17 hno Exp $
+ * $Id: HttpHeader.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 55 HTTP Header
* AUTHOR: Alex Rousskov
Index: squid/src/HttpHeaderTools.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpHeaderTools.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/HttpHeaderTools.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/HttpHeaderTools.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: HttpHeaderTools.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: HttpHeaderTools.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 66 HTTP Header Tools
* AUTHOR: Alex Rousskov
Index: squid/src/HttpMsg.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpMsg.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/HttpMsg.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1
+++ squid/src/HttpMsg.c 6 Jan 2001 12:40:11 -0000 1.1.1.1.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: HttpMsg.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: HttpMsg.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 74 HTTP Message
* AUTHOR: Alex Rousskov
Index: squid/src/HttpReply.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpReply.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/HttpReply.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/HttpReply.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: HttpReply.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: HttpReply.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 58 HTTP Reply (Response)
* AUTHOR: Alex Rousskov
Index: squid/src/HttpRequest.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpRequest.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/HttpRequest.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/HttpRequest.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: HttpRequest.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: HttpRequest.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 73 HTTP Request
* AUTHOR: Duane Wessels
Index: squid/src/HttpStatusLine.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpStatusLine.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/HttpStatusLine.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/HttpStatusLine.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: HttpStatusLine.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: HttpStatusLine.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 57 HTTP Status-line
* AUTHOR: Alex Rousskov
Index: squid/src/Makefile.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/Makefile.in,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.14.1
diff -u -r1.1.1.3 -r1.1.1.3.14.1
--- squid/src/Makefile.in 26 Jan 2000 03:25:01 -0000 1.1.1.3
+++ squid/src/Makefile.in 6 Jan 2001 12:40:11 -0000 1.1.1.3.14.1
@@ -1,7 +1,7 @@
#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.1.1.3 2000/01/26 03:25:01 hno Exp $
+# $Id: Makefile.in,v 1.1.1.3.14.1 2001/01/06 12:40:11 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
Index: squid/src/MemBuf.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/MemBuf.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/MemBuf.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1
+++ squid/src/MemBuf.c 6 Jan 2001 12:40:11 -0000 1.1.1.2.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: MemBuf.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: MemBuf.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 59 auto-growing Memory Buffer with printf
* AUTHOR: Alex Rousskov
Index: squid/src/MemPool.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/MemPool.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/MemPool.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/MemPool.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: MemPool.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: MemPool.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 63 Low Level Memory Pool Management
* AUTHOR: Alex Rousskov
Index: squid/src/Packer.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Packer.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/Packer.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1
+++ squid/src/Packer.c 6 Jan 2001 12:40:11 -0000 1.1.1.2.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: Packer.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: Packer.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 60 Packer: A uniform interface to store-like modules
* AUTHOR: Alex Rousskov
Index: squid/src/StatHist.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/StatHist.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/StatHist.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1
+++ squid/src/StatHist.c 6 Jan 2001 12:40:11 -0000 1.1.1.2.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: StatHist.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: StatHist.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 62 Generic Histogram
* AUTHOR: Duane Wessels
Index: squid/src/String.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/String.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/String.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1
+++ squid/src/String.c 6 Jan 2001 12:40:11 -0000 1.1.1.1.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: String.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: String.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 67 String
* AUTHOR: Duane Wessels
Index: squid/src/access_log.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/access_log.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/access_log.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/access_log.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Id: access_log.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: access_log.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 46 Access Log
* AUTHOR: Duane Wessels
@@ -290,11 +290,19 @@
if (Config.onoff.log_mime_hdrs) {
char *ereq = log_quote(al->headers.request);
char *erep = log_quote(al->headers.reply);
+#ifdef _SQUID_MSWIN_
+ memBufPrintf(&mb, " [%s] [%s]\r\n", ereq, erep);
+#else
memBufPrintf(&mb, " [%s] [%s]\n", ereq, erep);
+#endif
safe_free(ereq);
safe_free(erep);
} else {
+#ifdef _SQUID_MSWIN_
+ memBufPrintf(&mb, "\r\n");
+#else
memBufPrintf(&mb, "\n");
+#endif
}
file_write_mbuf(LogfileFD, -1, mb, NULL, NULL);
#if MULTICAST_MISS_STREAM
@@ -392,7 +400,11 @@
mcast_miss_to.sin_port = htons(Config.mcast_miss.port);
mcast_miss_to.sin_addr.s_addr = Config.mcast_miss.addr.s_addr;
mcast_miss_fd = comm_open(SOCK_DGRAM,
- 0,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_UDP,
+#else
+ 0,
+#endif
Config.Addrs.udp_incoming,
Config.mcast_miss.port,
COMM_NONBLOCKING,
Index: squid/src/acl.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/acl.c,v
retrieving revision 1.1.1.3.4.3
retrieving revision 1.1.1.3.4.3.2.1
diff -u -r1.1.1.3.4.3 -r1.1.1.3.4.3.2.1
--- squid/src/acl.c 31 Dec 2000 05:24:17 -0000 1.1.1.3.4.3
+++ squid/src/acl.c 6 Jan 2001 12:40:11 -0000 1.1.1.3.4.3.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: acl.c,v 1.1.1.3.4.3 2000/12/31 05:24:17 hno Exp $
+ * $Id: acl.c,v 1.1.1.3.4.3.2.1 2001/01/06 12:40:11 hno Exp $
*
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
Index: squid/src/aiops.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/aiops.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/aiops.c 1 Aug 2000 00:05:18 -0000 1.1.1.3.4.2
+++ squid/src/aiops.c 6 Jan 2001 12:40:12 -0000 1.1.1.3.4.2.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: aiops.c,v 1.1.1.3.4.2 2000/08/01 00:05:18 hno Exp $
+ * $Id: aiops.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: section 43 AIOPS
* AUTHOR: Stewart Forster
Index: squid/src/asn.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/asn.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/asn.c 22 May 2000 11:00:39 -0000 1.1.1.3.4.2
+++ squid/src/asn.c 6 Jan 2001 12:40:12 -0000 1.1.1.3.4.2.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: asn.c,v 1.1.1.3.4.2 2000/05/22 11:00:39 hno Exp $
+ * $Id: asn.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: section 53 AS Number handling
* AUTHOR: Duane Wessels, Kostas Anagnostakis
Index: squid/src/async_io.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/async_io.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/async_io.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.2
+++ squid/src/async_io.c 6 Jan 2001 12:40:12 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: async_io.c,v 1.1.1.3.4.2 2000/04/17 00:56:53 hno Exp $
+ * $Id: async_io.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: section 32 Asynchronous Disk I/O
* AUTHOR: Pete Bentley
Index: squid/src/authenticate.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/authenticate.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/authenticate.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/authenticate.c 6 Jan 2001 12:40:12 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: authenticate.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: authenticate.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: section 29 Authenticator
* AUTHOR: Duane Wessels
@@ -43,7 +43,26 @@
static HLPCB authenticateHandleReply;
static void authenticateStateFree(authenticateStateData * r);
-static helper *authenticators = NULL;
+#ifdef _SQUID_MSWIN_
+ typedef int ( * PFAuthenticate)(char *, char *, authenticateStateData *, HLPCB);
+ typedef int ( * PFInit)(char *);
+
+ typedef struct {
+ HINSTANCE hnd;
+ PFAuthenticate Authenticate;
+ PFInit Init;
+ struct {
+ int requests;
+ int replies;
+ int queue_size;
+ int avg_svc_time;
+ } stats;
+ } AuthPlugin;
+
+ static AuthPlugin *authenticators = NULL;
+#else
+ static helper *authenticators = NULL;
+#endif
static void
authenticateHandleReply(void *data, char *reply)
@@ -75,7 +94,14 @@
authenticateStats(StoreEntry * sentry)
{
storeAppendPrintf(sentry, "Authenticator Statistics:\n");
+#ifdef _SQUID_MSWIN_
+ storeAppendPrintf(sentry, "requests sent: %d\n",
+ authenticators->stats.requests);
+ storeAppendPrintf(sentry, "replies received: %d\n",
+ authenticators->stats.replies);
+#else
helperStats(sentry, authenticators);
+#endif
}
/**** PUBLIC FUNCTIONS ****/
@@ -85,14 +111,16 @@
authenticateStart(acl_proxy_auth_user * auth_user, RH * handler, void *data)
{
authenticateStateData *r = NULL;
+#ifndef _SQUID_MSWIN_
char buf[8192];
+#endif
assert(auth_user);
assert(handler);
debug(29, 5) ("authenticateStart: '%s:%s'\n", auth_user->user,
auth_user->passwd);
if (Config.Program.authenticate == NULL) {
- handler(data, NULL);
- return;
+ handler(data, NULL);
+ return;
}
r = xcalloc(1, sizeof(authenticateStateData));
cbdataAdd(r, cbdataXfree, 0);
@@ -100,8 +128,14 @@
cbdataLock(data);
r->data = data;
r->auth_user = auth_user;
+#ifdef _SQUID_MSWIN_
+ authenticators->stats.requests++;
+ authenticators->Authenticate(r->auth_user->user, r->auth_user->passwd, r, authenticateHandleReply);
+ authenticators->stats.replies++;
+#else
snprintf(buf, 8192, "%s %s\n", r->auth_user->user, r->auth_user->passwd);
helperSubmit(authenticators, buf, authenticateHandleReply, r);
+#endif
}
void
@@ -110,12 +144,55 @@
static int init = 0;
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) {
+ 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) {
+ 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) {
+ 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) {
+ 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;
+#else
if (authenticators == NULL)
- authenticators = helperCreate("authenticator");
+ authenticators = helperCreate("authenticator");
authenticators->cmdline = Config.Program.authenticate;
authenticators->n_to_start = Config.authenticateChildren;
authenticators->ipc_type = IPC_TCP_SOCKET;
helperOpenServers(authenticators);
+#endif
if (!init) {
cachemgrRegister("authenticator",
"User Authenticator Stats",
@@ -128,10 +205,15 @@
authenticateShutdown(void)
{
if (!authenticators)
- return;
+ return;
+#ifdef _SQUID_MSWIN_
+ FreeLibrary(authenticators->hnd);
+ xfree(authenticators);
+#else
helperShutdown(authenticators);
if (!shutting_down)
- return;
+ return;
helperFree(authenticators);
+#endif
authenticators = NULL;
}
Index: squid/src/cache_cf.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cache_cf.c,v
retrieving revision 1.1.1.3.4.4
retrieving revision 1.1.1.3.4.4.2.1
diff -u -r1.1.1.3.4.4 -r1.1.1.3.4.4.2.1
--- squid/src/cache_cf.c 1 Jul 2000 12:05:14 -0000 1.1.1.3.4.4
+++ squid/src/cache_cf.c 6 Jan 2001 12:40:12 -0000 1.1.1.3.4.4.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: cache_cf.c,v 1.1.1.3.4.4 2000/07/01 12:05:14 hno Exp $
+ * $Id: cache_cf.c,v 1.1.1.3.4.4.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: section 3 Configuration File Parsing
* AUTHOR: Harvest Derived
@@ -328,9 +328,11 @@
#if USE_DNSSERVERS
requirePathnameExists("cache_dns_program", Config.Program.dnsserver);
#endif
+#ifndef _SQUID_MSWIN_
requirePathnameExists("unlinkd_program", Config.Program.unlinkd);
if (Config.Program.redirect)
requirePathnameExists("redirect_program", Config.Program.redirect->key);
+#endif
if (Config.Program.authenticate)
requirePathnameExists("authenticate_program", Config.Program.authenticate->key);
requirePathnameExists("Icon Directory", Config.icons.directory);
@@ -362,6 +364,7 @@
}
if (aclPurgeMethodInUse(Config.accessList.http))
Config2.onoff.enable_purge = 1;
+#ifndef _SQUID_MSWIN_
if (NULL != Config.effectiveUser) {
struct passwd *pwd = getpwnam(Config.effectiveUser);
if (NULL == pwd)
@@ -387,6 +390,7 @@
xstrerror());
Config2.effectiveGroupID = grp->gr_gid;
}
+#endif
}
/* Parse a time specification from the config file. Store the
Index: squid/src/cache_diff.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cache_diff.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/cache_diff.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1
+++ squid/src/cache_diff.c 6 Jan 2001 12:40:12 -0000 1.1.1.1.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: cache_diff.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: cache_diff.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:12 hno Exp $
*
* AUTHOR: Alex Rousskov
*
Index: squid/src/cache_manager.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cache_manager.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/cache_manager.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1
+++ squid/src/cache_manager.c 6 Jan 2001 12:40:12 -0000 1.1.1.2.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: cache_manager.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: cache_manager.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: section 16 Cache Manager Objects
* AUTHOR: Duane Wessels
Index: squid/src/cachemgr.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/cachemgr.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/cachemgr.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/cachemgr.c 6 Jan 2001 12:40:12 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: cachemgr.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: cachemgr.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: section 0 CGI Cache Manager
* AUTHOR: Duane Wessels
@@ -129,6 +129,49 @@
#include "util.h"
#include "snprintf.h"
+#ifdef _SQUID_MSWIN_
+static int s_iInitCount = 0;
+int Win32SockInit(void)
+{
+ int iVersionRequested;
+ WSADATA wsaData;
+ int err;
+
+ if (s_iInitCount > 0) {
+ s_iInitCount++;
+ return (0);
+ }
+ else if (s_iInitCount < 0)
+ return (s_iInitCount);
+
+ /* s_iInitCount == 0. Do the initailization */
+ iVersionRequested = MAKEWORD(2, 0);
+ err = WSAStartup((WORD) iVersionRequested, &wsaData);
+ if (err) {
+ s_iInitCount = -1;
+ return (s_iInitCount);
+ }
+ if (LOBYTE(wsaData.wVersion) != 2 ||
+ HIBYTE(wsaData.wVersion) != 0) {
+ s_iInitCount = -2;
+ WSACleanup();
+ return (s_iInitCount);
+ }
+ s_iInitCount++;
+ return (s_iInitCount);
+
+}
+
+
+void Win32SockCleanup(void)
+{
+ if (--s_iInitCount == 0)
+ WSACleanup();
+ return;
+}
+
+#endif
+
typedef struct {
char *hostname;
int port;
@@ -169,7 +212,11 @@
static void error_html(const char *msg);
static char *menu_url(cachemgr_request * req, const char *action);
static int parse_status_line(const char *sline, const char **statusStr);
+#ifdef _SQUID_MSWIN_
+static cachemgr_request *read_request(char *);
+#else
static cachemgr_request *read_request(void);
+#endif
static char *read_get_request(void);
static char *read_post_request(void);
@@ -398,7 +445,12 @@
read_reply(int s, cachemgr_request * req)
{
char buf[4 * 1024];
- FILE *fp = fdopen(s, "r");
+ #ifdef _SQUID_MSWIN_
+ int reply;
+ FILE*fp=tmpfile();
+#else
+ FILE *fp = fdopen(s, "r");
+#endif
/* interpretation states */
enum {
isStatusLine, isHeaders, isBodyStart, isBody, isForward, isEof, isForwardEof, isSuccess, isError
@@ -415,7 +467,12 @@
perror("fdopen");
return 1;
}
- if (parse_menu)
+ #ifdef _SQUID_MSWIN_
+ while ((reply=recv(s,buf,sizeof(buf),0))>0)
+ fwrite(buf,1,reply,fp);
+ rewind(fp);
+#endif
+ if (parse_menu)
action = "menu";
/* read reply interpreting one line at a time depending on state */
while (istate < isEof) {
@@ -507,6 +564,9 @@
static struct sockaddr_in S;
int s;
int l;
+#ifdef _SQUID_MSWIN_
+ int answer;
+#endif
static char buf[2 * 1024];
if (req == NULL) {
auth_html(CACHEMGR_HOSTNAME, CACHE_HTTP_PORT, "");
@@ -555,9 +615,19 @@
req->hostname,
req->action,
make_auth_header(req));
+#ifdef _SQUID_MSWIN_
+ send(s, buf, l,0);
+#else
write(s, buf, l);
+#endif
debug(1) fprintf(stderr, "wrote request: '%s'\n", buf);
+#ifdef _SQUID_MSWIN_
+ answer=read_reply(s, req);
+ closesocket(s);
+ return answer;
+#else
return read_reply(s, req);
+#endif
}
int
@@ -565,16 +635,31 @@
{
char *s;
cachemgr_request *req;
+#ifdef _SQUID_MSWIN_
+ int answer;
+#endif
safe_inet_addr("255.255.255.255", &no_addr);
now = time(NULL);
- if ((s = strrchr(argv[0], '/')))
+#ifdef _SQUID_MSWIN_
+ Win32SockInit();
+ if ((s = strrchr(argv[0], '\\')))
+#else
+ if ((s = strrchr(argv[0], '/')))
+#endif
progname = xstrdup(s + 1);
else
progname = xstrdup(argv[0]);
if ((s = getenv("SCRIPT_NAME")) != NULL)
script_name = xstrdup(s);
+#ifdef _SQUID_MSWIN_
+ req = read_request(NULL);
+ answer=process_request(req);
+ Win32SockCleanup();
+ return answer;
+#else
req = read_request();
return process_request(req);
+#endif
}
static char *
@@ -606,21 +691,33 @@
return xstrdup(s);
}
+#ifdef _SQUID_MSWIN_
+static cachemgr_request *
+read_request(char* buf)
+{
+#else
static cachemgr_request *
read_request(void)
{
char *buf;
+#endif
cachemgr_request *req;
char *s;
char *t;
char *q;
- if ((buf = read_post_request()) != NULL)
- (void) 0;
- else if ((buf = read_get_request()) != NULL)
- (void) 0;
- else
- return NULL;
+#ifndef _DEBUG
+ if ((buf = read_post_request()) != NULL)
+ (void) 0;
+ else if ((buf = read_get_request()) != NULL)
+ (void) 0;
+ else
+ return NULL;
+#endif
+#ifdef _SQUID_MSWIN_
+ if (strlen(buf) == 0 || strlen(buf) == 4000)
+#else
if (strlen(buf) == 0)
+#endif
return NULL;
req = xcalloc(1, sizeof(cachemgr_request));
for (s = strtok(buf, "&"); s != NULL; s = strtok(NULL, "&")) {
@@ -740,3 +837,4 @@
"Proxy-Authorization: Basic %s\r\n", str64);
return buf;
}
+
Index: squid/src/carp.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/carp.c,v
retrieving revision 1.1.1.1.4.4
retrieving revision 1.1.1.1.4.4.2.1
diff -u -r1.1.1.1.4.4 -r1.1.1.1.4.4.2.1
--- squid/src/carp.c 15 Aug 2000 05:52:35 -0000 1.1.1.1.4.4
+++ squid/src/carp.c 6 Jan 2001 12:40:12 -0000 1.1.1.1.4.4.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: carp.c,v 1.1.1.1.4.4 2000/08/15 05:52:35 hno Exp $
+ * $Id: carp.c,v 1.1.1.1.4.4.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: section 39 Cache Array Routing Protocol
* AUTHOR: Eric Stern
Index: squid/src/cbdata.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cbdata.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/cbdata.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1
+++ squid/src/cbdata.c 6 Jan 2001 12:40:12 -0000 1.1.1.2.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: cbdata.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: cbdata.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: section 45 Callback Data Registry
* AUTHOR: Duane Wessels
Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cf.data.pre,v
retrieving revision 1.1.1.3.4.3
retrieving revision 1.1.1.3.4.3.2.1
diff -u -r1.1.1.3.4.3 -r1.1.1.3.4.3.2.1
--- squid/src/cf.data.pre 1 Jul 2000 12:05:14 -0000 1.1.1.3.4.3
+++ squid/src/cf.data.pre 6 Jan 2001 12:40:12 -0000 1.1.1.3.4.3.2.1
@@ -1,6 +1,6 @@
#
-# $Id: cf.data.pre,v 1.1.1.3.4.3 2000/07/01 12:05:14 hno Exp $
+# $Id: cf.data.pre,v 1.1.1.3.4.3.2.1 2001/01/06 12:40:12 hno Exp $
#
#
# SQUID Internet Object Cache http://squid.nlanr.net/Squid/
Index: squid/src/cf_gen.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cf_gen.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/cf_gen.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/cf_gen.c 6 Jan 2001 12:40:12 -0000 1.1.1.3.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: cf_gen.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: cf_gen.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: none
* AUTHOR: Max Okumoto
Index: squid/src/client.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/client.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/client.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/client.c 6 Jan 2001 12:40:12 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: client.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: client.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: section 0 WWW Client
* AUTHOR: Harvest Derived
Index: squid/src/client_db.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_db.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/client_db.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/client_db.c 6 Jan 2001 12:40:12 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: client_db.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: client_db.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:12 hno Exp $
*
* DEBUG: section 0 Client Database
* AUTHOR: Duane Wessels
Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.1.1.3.4.6
retrieving revision 1.1.1.3.4.6.2.1
diff -u -r1.1.1.3.4.6 -r1.1.1.3.4.6.2.1
--- squid/src/client_side.c 21 Oct 2000 14:44:59 -0000 1.1.1.3.4.6
+++ squid/src/client_side.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.6.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: client_side.c,v 1.1.1.3.4.6 2000/10/21 14:44:59 hno Exp $
+ * $Id: client_side.c,v 1.1.1.3.4.6.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 33 Client-side Routines
* AUTHOR: Duane Wessels
@@ -32,7 +32,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#define CLIENT_SIDE_C
#include "squid.h"
#if IPF_TRANSPARENT
@@ -2329,11 +2329,19 @@
clientHttpRequest **H = NULL;
char *prefix = NULL;
ErrorState *err = NULL;
+#ifdef _SQUID_MSWIN_
+ sde *F = &sd_table[fd];
+#else
fde *F = &fd_table[fd];
+#endif
int len = conn->in.size - conn->in.offset - 1;
debug(33, 4) ("clientReadRequest: FD %d: reading request...\n", fd);
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ size = recv(fd, conn->in.buf + conn->in.offset, len);
+#else
size = read(fd, conn->in.buf + conn->in.offset, len);
+#endif
if (size > 0) {
fd_bytes(fd, size, FD_READ);
kb_incr(&Counter.client_http.kbytes_in, size);
@@ -2363,7 +2371,11 @@
conn->defer.n++;
fd_note(fd, "half-closed");
return;
+#ifdef _SQUID_MSWIN_
+ } else if (size ==SOCKET_ERROR) {
+#else
} else if (size < 0) {
+#endif
if (!ignoreErrno(errno)) {
debug(50, 2) ("clientReadRequest: FD %d: %s\n", fd, xstrerror());
comm_close(fd);
@@ -2641,7 +2653,11 @@
while (max-- && !httpAcceptDefer(sock, NULL)) {
memset(&peer, '\0', sizeof(struct sockaddr_in));
memset(&me, '\0', sizeof(struct sockaddr_in));
+#ifdef _SQUID_MSWIN_
+ if ((fd = comm_accept(sock, &peer, &me)) ==INVALID_SOCKET ) {
+#else
if ((fd = comm_accept(sock, &peer, &me)) < 0) {
+#endif
if (!ignoreErrno(errno))
debug(50, 1) ("httpAccept: FD %d: accept failure: %s\n",
sock, xstrerror());
@@ -2813,7 +2829,11 @@
}
enter_suid();
fd = comm_open(SOCK_STREAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_TCP,
+#else
0,
+#endif
s->s.sin_addr,
ntohs(s->s.sin_port),
COMM_NONBLOCKING,
@@ -2851,3 +2871,4 @@
}
NHttpSockets = 0;
}
+#undef CLIENT_SIDE_C
Index: squid/src/comm.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/comm.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/comm.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/comm.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: comm.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: comm.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 5 Socket Functions
* AUTHOR: Harvest Derived
@@ -32,7 +32,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#define COMM_C
#include "squid.h"
#ifdef HAVE_NETINET_TCP_H
@@ -70,13 +70,44 @@
static int commResetFD(ConnectStateData * cs);
static int commRetryConnect(ConnectStateData * cs);
+#ifdef _SQUID_MSWIN_
+void
+commSetSelectS(int sd, unsigned int type, PF * handler, void *client_data, time_t timeout)
+{
+ sde *F = &sd_table[sd];
+ assert(sd >= 0);
+ assert(F->flags.open);
+ debug(5, 5) ("commSetSelect: SD %d type %d\n", sd, type);
+ if (type & COMM_SELECT_READ) {
+ F->read_handler = handler;
+ F->read_data = client_data;
+ commUpdateReadBitsS(sd, handler);
+ }
+ if (type & COMM_SELECT_WRITE) {
+ F->write_handler = handler;
+ F->write_data = client_data;
+ commUpdateWriteBitsS(sd, handler);
+ }
+ if (timeout)
+ F->timeout = squid_curtime + timeout;
+}
+#endif
+
static void
CommWriteStateCallbackAndFree(int fd, int code)
{
+#ifdef _SQUID_MSWIN_
+ CommWriteStateData *CommWriteState = sd_table[fd].rwstate;
+#else
CommWriteStateData *CommWriteState = fd_table[fd].rwstate;
+#endif
CWCB *callback = NULL;
void *data;
+#ifdef _SQUID_MSWIN_
+ sd_table[fd].rwstate = NULL;
+#else
fd_table[fd].rwstate = NULL;
+#endif
if (CommWriteState == NULL)
return;
if (CommWriteState->free_func) {
@@ -98,7 +129,11 @@
{
struct sockaddr_in addr;
socklen_t addr_len = 0;
+#ifdef _SQUID_MSWIN_
+ sde *F = &sd_table[fd];
+#else
fde *F = &fd_table[fd];
+#endif
/* If the fd is closed already, just return */
if (!F->flags.open) {
@@ -148,10 +183,24 @@
const char *note)
{
int new_socket;
+#ifdef _SQUID_MSWIN_
+ sde *F = NULL;
+ int err;
+#else
fde *F = NULL;
+#endif
/* Create socket for accepting new connections. */
Counter.syscalls.sock.sockets++;
+#ifdef _SQUID_MSWIN_
+ if ((new_socket = socket(AF_INET, sock_type, proto)) == INVALID_SOCKET) {
+ /* Increase the number of reserved fd's if calls to socket()
+ * are failing because the open file table is full. This
+ * limits the number of simultaneous clients */
+ err=WSAGetLastError();
+ switch (err) {
+ case WSAEMFILE:
+#else
if ((new_socket = socket(AF_INET, sock_type, proto)) < 0) {
/* Increase the number of reserved fd's if calls to socket()
* are failing because the open file table is full. This
@@ -159,6 +208,7 @@
switch (errno) {
case ENFILE:
case EMFILE:
+#endif
debug(50, 1) ("comm_open: socket failure: %s\n", xstrerror());
fdAdjustReserved();
break;
@@ -170,7 +220,11 @@
/* update fdstat */
debug(5, 5) ("comm_open: FD %d is a new socket\n", new_socket);
fd_open(new_socket, FD_SOCKET, note);
- F = &fd_table[new_socket];
+#ifdef _SQUID_MSWIN_
+ F = &sd_table[new_socket];
+#else
+ F = &fd_table[new_socket];
+#endif
if (!(flags & COMM_NOCLOEXEC))
commSetCloseOnExec(new_socket);
if ((flags & COMM_REUSEADDR))
@@ -294,26 +348,52 @@
static int
commResetFD(ConnectStateData * cs)
{
+#ifdef _SQUID_MSWIN_
+ int err;
+#endif
int fd2;
if (!cbdataValid(cs->data))
return 0;
+#ifdef _SQUID_MSWIN_
+ closesocket(cs->fd);
+ return 0;
+#endif
Counter.syscalls.sock.sockets++;
fd2 = socket(AF_INET, SOCK_STREAM, 0);
Counter.syscalls.sock.sockets++;
if (fd2 < 0) {
- debug(5, 0) ("commResetFD: socket: %s\n", xstrerror());
- if (ENFILE == errno || EMFILE == errno)
+#ifdef _SQUID_MSWIN_
+ err=WSAGetLastError();
+#endif
+ debug(5, 0) ("commResetFD: socket: %s\n", xstrerror());
+#ifdef _SQUID_MSWIN_
+ if (WSAEMFILE == errno)
+#else
+ if (ENFILE == errno || EMFILE == errno)
+#endif
fdAdjustReserved();
- return 0;
+ return 0;
}
if (dup2(fd2, cs->fd) < 0) {
+#ifdef _SQUID_MSWIN_
+ err=WSAGetLastError();
+#endif
debug(5, 0) ("commResetFD: dup2: %s\n", xstrerror());
+#ifdef _SQUID_MSWIN_
+ if (WSAEMFILE == err)
+#else
if (ENFILE == errno || EMFILE == errno)
+#endif
fdAdjustReserved();
return 0;
}
+#ifdef _SQUID_MSWIN_
+ closesocket(fd2);
+ sd_table[cs->fd].flags.called_connect = 0;
+#else
close(fd2);
- fd_table[cs->fd].flags.called_connect = 0;
+ fd_table[cs->fd].flags.called_connect = 0;
+#endif
/*
* yuck, this has assumptions about comm_open() arguments for
* the original socket
@@ -364,7 +444,11 @@
switch (comm_connect_addr(fd, &cs->S)) {
case COMM_INPROGRESS:
debug(5, 5) ("commConnectHandle: FD %d: COMM_INPROGRESS\n", fd);
+#ifdef _SQUID_MSWIN_
+ commSetSelectS(fd, COMM_SELECT_WRITE, commConnectHandle, cs, 0);
+#else
commSetSelect(fd, COMM_SELECT_WRITE, commConnectHandle, cs, 0);
+#endif
break;
case COMM_OK:
ipcacheMarkGoodAddr(cs->host, cs->S.sin_addr);
@@ -388,11 +472,19 @@
int
commSetTimeout(int fd, int timeout, PF * handler, void *data)
{
+#ifdef _SQUID_MSWIN_
+ sde *F;
+#else
fde *F;
+#endif
debug(5, 3) ("commSetTimeout: FD %d timeout %d\n", fd, timeout);
assert(fd >= 0);
assert(fd < Squid_MaxFD);
- F = &fd_table[fd];
+#ifdef _SQUID_MSWIN_
+ F = &sd_table[fd];
+#else
+ F = &fd_table[fd];
+#endif
assert(F->flags.open);
if (timeout < 0) {
F->timeout_handler = NULL;
@@ -411,7 +503,11 @@
comm_connect_addr(int sock, const struct sockaddr_in *address)
{
int status = COMM_OK;
+#ifdef _SQUID_MSWIN_
+ sde *F = &sd_table[sock];
+#else
fde *F = &fd_table[sock];
+#endif
int x;
int err = 0;
socklen_t errlen;
@@ -423,7 +519,12 @@
Counter.syscalls.sock.connects++;
x = connect(sock, (struct sockaddr *) address, sizeof(*address));
if (x < 0)
+#ifdef _SQUID_MSWIN_
+ err=WSAGetLastError();
+ debug(5, 9) ("connect FD %d: %d\n", sock, err);
+#else
debug(5, 9) ("connect FD %d: %s\n", sock, xstrerror());
+#endif
} else {
#if defined(_SQUID_NEWSOS6_)
/* Makoto MATSUSHITA */
@@ -436,7 +537,11 @@
}
#else
errlen = sizeof(err);
+#ifdef _SQUID_MSWIN_
+ x = getsockopt(sock, SOL_SOCKET, SO_ERROR, (char*)&err,(int*) &errlen);
+#else
x = getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &errlen);
+#endif
if (x == 0)
errno = err;
#if defined(_SQUID_SOLARIS_)
@@ -451,9 +556,15 @@
#endif
#endif
}
+#ifdef _SQUID_MSWIN_
+ if (err == 0 || err == WSAEISCONN)
+ status = COMM_OK;
+ else if (ignoreErrno(err))
+#else
if (errno == 0 || errno == EISCONN)
status = COMM_OK;
else if (ignoreErrno(errno))
+#endif
status = COMM_INPROGRESS;
else
return COMM_ERROR;
@@ -477,14 +588,26 @@
struct sockaddr_in P;
struct sockaddr_in M;
socklen_t Slen;
+#ifdef _SQUID_MSWIN_
+ sde *F = NULL;
+#else
fde *F = NULL;
+#endif
Slen = sizeof(P);
Counter.syscalls.sock.accepts++;
+#ifdef _SQUID_MSWIN_
+ if ((sock = WSAAccept(fd, (struct sockaddr *) &P,(int*) &Slen,NULL,0)) ==INVALID_SOCKET ) {
+#else
if ((sock = accept(fd, (struct sockaddr *) &P, &Slen)) < 0) {
+#endif
if (ignoreErrno(errno)) {
debug(50, 5) ("comm_accept: FD %d: %s\n", fd, xstrerror());
return COMM_NOMESSAGE;
+#ifdef _SQUID_MSWIN_
+ } else if (WSAEMFILE == WSAGetLastError()) {
+#else
} else if (ENFILE == errno || EMFILE == errno) {
+#endif
debug(50, 3) ("comm_accept: FD %d: %s\n", fd, xstrerror());
return COMM_ERROR;
} else {
@@ -502,7 +625,11 @@
commSetCloseOnExec(sock);
/* fdstat update */
fd_open(sock, FD_SOCKET, "HTTP Request");
- F = &fd_table[sock];
+#ifdef _SQUID_MSWIN_
+ F = &sd_table[sock];
+#else
+ F = &fd_table[sock];
+#endif
xstrncpy(F->ipaddr, inet_ntoa(P.sin_addr), 16);
F->remote_port = htons(P.sin_port);
F->local_port = htons(M.sin_port);
@@ -513,7 +640,11 @@
void
commCallCloseHandlers(int fd)
{
+#ifdef _SQUID_MSWIN_
+ sde *F = &sd_table[fd];
+#else
fde *F = &fd_table[fd];
+#endif
close_handler *ch;
debug(5, 5) ("commCallCloseHandlers: FD %d\n", fd);
while ((ch = F->close_handler) != NULL) {
@@ -532,7 +663,11 @@
{
LOCAL_ARRAY(char, buf, 1024);
int n;
+#ifdef _SQUID_MSWIN_
+ n = recv(fd, buf, 1024);
+#else
n = read(fd, buf, 1024);
+#endif
if (n < 0)
debug(5, 3) ("commLingerClose: FD %d read: %s\n", fd, xstrerror());
comm_close(fd);
@@ -557,18 +692,30 @@
}
fd_note(fd, "lingering close");
commSetTimeout(fd, 10, commLingerTimeout, NULL);
+#ifdef _SQUID_MSWIN_
+ commSetSelectS(fd, COMM_SELECT_READ, commLingerClose, NULL, 0);
+#else
commSetSelect(fd, COMM_SELECT_READ, commLingerClose, NULL, 0);
+#endif
}
#endif
void
comm_close(int fd)
{
+#ifdef _SQUID_MSWIN_
+ sde *F = NULL;
+#else
fde *F = NULL;
+#endif
debug(5, 5) ("comm_close: FD %d\n", fd);
assert(fd >= 0);
assert(fd < Squid_MaxFD);
- F = &fd_table[fd];
+#ifdef _SQUID_MSWIN_
+ F = &sd_table[fd];
+#else
+ F = &fd_table[fd];
+#endif
if (F->flags.closing)
return;
if (shutting_down && (!F->flags.open || F->type == FD_FILE))
@@ -581,7 +728,11 @@
if (F->uses) /* assume persistent connect count */
pconnHistCount(1, F->uses);
fd_close(fd); /* update fdstat */
+#ifdef _SQUID_MSWIN_
+ closesocket(fd);
+#else
close(fd);
+#endif
Counter.syscalls.sock.closes++;
}
@@ -613,7 +764,11 @@
void
commSetDefer(int fd, DEFER * func, void *data)
{
+#ifdef _SQUID_MSWIN_
+ sde *F = &sd_table[fd];
+#else
fde *F = &fd_table[fd];
+#endif
F->defer_check = func;
F->defer_data = data;
}
@@ -646,12 +801,21 @@
close_handler *c;
debug(5, 5) ("comm_add_close_handler: FD %d, handler=%p, data=%p\n",
fd, handler, data);
+#ifdef _SQUID_MSWIN_
+ for (c = sd_table[fd].close_handler; c; c = c->next)
+ assert(c->handler != handler || c->data != data);
+ new->handler = handler;
+ new->data = data;
+ new->next = sd_table[fd].close_handler;
+ sd_table[fd].close_handler = new;
+#else
for (c = fd_table[fd].close_handler; c; c = c->next)
assert(c->handler != handler || c->data != data);
new->handler = handler;
new->data = data;
new->next = fd_table[fd].close_handler;
fd_table[fd].close_handler = new;
+#endif
cbdataLock(data);
}
@@ -663,7 +827,11 @@
/* Find handler in list */
debug(5, 5) ("comm_remove_close_handler: FD %d, handler=%p, data=%p\n",
fd, handler, data);
- for (p = fd_table[fd].close_handler; p != NULL; last = p, p = p->next)
+#ifdef _SQUID_MSWIN_
+ for (p = sd_table[fd].close_handler; p != NULL; last = p, p = p->next)
+#else
+ for (p = fd_table[fd].close_handler; p != NULL; last = p, p = p->next)
+#endif
if (p->handler == handler && p->data == data)
break; /* This is our handler */
assert(p != NULL);
@@ -671,7 +839,11 @@
if (last)
last->next = p->next;
else
+#ifdef _SQUID_MSWIN_
+ sd_table[fd].close_handler = p->next;
+#else
fd_table[fd].close_handler = p->next;
+#endif
cbdataUnlock(p->data);
safe_free(p);
}
@@ -683,8 +855,13 @@
L.l_onoff = 0; /* off */
L.l_linger = 0;
if (setsockopt(fd, SOL_SOCKET, SO_LINGER, (char *) &L, sizeof(L)) < 0)
+#ifdef _SQUID_MSWIN_
+ debug(50, 0) ("commSetNoLinger: FD %d: %d\n", fd, WSAGetLastError());
+ sd_table[fd].flags.nolinger = 1;
+#else
debug(50, 0) ("commSetNoLinger: FD %d: %s\n", fd, xstrerror());
- fd_table[fd].flags.nolinger = 1;
+ fd_table[fd].flags.nolinger = 1;
+#endif
}
static void
@@ -708,6 +885,14 @@
{
int flags;
int dummy = 0;
+#ifdef _SQUID_MSWIN_
+ int nonblocking=1;
+ if (ioctlsocket(fd, FIONBIO, (unsigned long*)&nonblocking) ==SOCKET_ERROR) {
+ debug(50, 0) ("commSetNonBlocking: FD %d: %d\n", fd, WSAGetLastError());
+ return COMM_ERROR;
+ }
+ sd_table[fd].flags.nonblocking = 1;
+#else
if ((flags = fcntl(fd, F_GETFL, dummy)) < 0) {
debug(50, 0) ("FD %d: fcntl F_GETFL: %s\n", fd, xstrerror());
return COMM_ERROR;
@@ -717,6 +902,7 @@
return COMM_ERROR;
}
fd_table[fd].flags.nonblocking = 1;
+#endif
return 0;
}
@@ -725,6 +911,14 @@
{
int flags;
int dummy = 0;
+#ifdef _SQUID_MSWIN_
+ int nonblocking=0;
+ if (ioctlsocket(fd, FIONBIO, (unsigned long*)&nonblocking) ==SOCKET_ERROR) {
+ debug(50, 0) ("commSetNonBlocking: FD %d: %d\n", fd, WSAGetLastError());
+ return COMM_ERROR;
+ }
+ sd_table[fd].flags.nonblocking = 0;
+#else
if ((flags = fcntl(fd, F_GETFL, dummy)) < 0) {
debug(50, 0) ("FD %d: fcntl F_GETFL: %s\n", fd, xstrerror());
return COMM_ERROR;
@@ -734,6 +928,7 @@
return COMM_ERROR;
}
fd_table[fd].flags.nonblocking = 0;
+#endif
return 0;
}
@@ -766,6 +961,9 @@
void
comm_init(void)
{
+#ifdef _SQUID_MSWIN_
+ sd_table =(sde*) xcalloc(Squid_MaxFD, sizeof(sde));
+#endif
fd_table = xcalloc(Squid_MaxFD, sizeof(fde));
/* XXX account fd_table */
/* Keep a few file descriptors free so that we don't run out of FD's
@@ -786,7 +984,11 @@
fd, (int) state->offset, state->size);
nleft = state->size - state->offset;
+#ifdef _SQUID_MSWIN_
+ len = send(fd, state->buf + state->offset, nleft);
+#else
len = write(fd, state->buf + state->offset, nleft);
+#endif
debug(5, 5) ("commHandleWrite: write() returns %d\n", len);
fd_bytes(fd, len, FD_WRITE);
Counter.syscalls.sock.writes++;
@@ -799,10 +1001,27 @@
CommWriteStateCallbackAndFree(fd, nleft ? COMM_ERROR : COMM_OK);
} else if (len < 0) {
/* An error */
- if (fd_table[fd].flags.socket_eof) {
+#ifdef _SQUID_MSWIN_
+ if (sd_table[fd].flags.socket_eof) {
+ debug(50, 2) ("commHandleWrite: FD %d: write failure: %d.\n",
+ fd, WSAGetLastError());
+#else
+ if (fd_table[fd].flags.socket_eof) {
debug(50, 2) ("commHandleWrite: FD %d: write failure: %s.\n",
fd, xstrerror());
+#endif
CommWriteStateCallbackAndFree(fd, COMM_ERROR);
+#ifdef _SQUID_MSWIN_
+ } else if (ignoreErrno(errno)) {
+ debug(50, 2) ("commHandleWrite: FD %d: write failure: %d.\n",
+ fd, WSAGetLastError());
+ commSetSelectS(fd,COMM_SELECT_WRITE, commHandleWrite,state, 0);
+ } else {
+ debug(50, 2) ("commHandleWrite: FD %d: write failure: %d.\n",
+ fd, WSAGetLastError());
+ CommWriteStateCallbackAndFree(fd, COMM_ERROR);
+ }
+#else
} else if (ignoreErrno(errno)) {
debug(50, 10) ("commHandleWrite: FD %d: write failure: %s.\n",
fd, xstrerror());
@@ -816,16 +1035,21 @@
fd, xstrerror());
CommWriteStateCallbackAndFree(fd, COMM_ERROR);
}
+#endif
} else {
/* A successful write, continue */
state->offset += len;
if (state->offset < state->size) {
/* Not done, reinstall the write handler and write some more */
+#ifdef _SQUID_MSWIN_
+ commSetSelectS(fd,COMM_SELECT_WRITE, commHandleWrite,state,0);
+#else
commSetSelect(fd,
COMM_SELECT_WRITE,
commHandleWrite,
state,
0);
+#endif
} else {
CommWriteStateCallbackAndFree(fd, COMM_OK);
}
@@ -839,16 +1063,28 @@
void
comm_write(int fd, char *buf, int size, CWCB * handler, void *handler_data, FREE * free_func)
{
- CommWriteStateData *state = fd_table[fd].rwstate;
+#ifdef _SQUID_MSWIN_
+ CommWriteStateData *state = sd_table[fd].rwstate;
+#else
+ CommWriteStateData *state = fd_table[fd].rwstate;
+#endif
debug(5, 5) ("comm_write: FD %d: sz %d: hndl %p: data %p.\n",
fd, size, handler, handler_data);
if (NULL != state) {
debug(5, 1) ("comm_write: fd_table[%d].rwstate != NULL\n", fd);
safe_free(state);
+#ifdef _SQUID_MSWIN_
+ sd_table[fd].rwstate = NULL;
+#else
fd_table[fd].rwstate = NULL;
+#endif
}
assert(state == NULL);
- fd_table[fd].rwstate = state = xcalloc(1, sizeof(CommWriteStateData));
+#ifdef _SQUID_MSWIN_
+ sd_table[fd].rwstate = state = (CommWriteStateData*)xcalloc(1, sizeof(CommWriteStateData));
+#else
+ fd_table[fd].rwstate = state = xcalloc(1, sizeof(CommWriteStateData));
+#endif
state->buf = buf;
state->size = size;
state->offset = 0;
@@ -856,7 +1092,11 @@
state->handler_data = handler_data;
state->free_func = free_func;
cbdataLock(handler_data);
+#ifdef _SQUID_MSWIN_
+ commSetSelectS(fd, COMM_SELECT_WRITE, commHandleWrite, state, 0);
+#else
commSetSelect(fd, COMM_SELECT_WRITE, commHandleWrite, state, 0);
+#endif
}
/* a wrapper around comm_write to allow for MemBuf to be comm_written in a snap */
@@ -870,6 +1110,27 @@
* hm, this might be too general-purpose for all the places we'd
* like to use it.
*/
+#ifdef _SQUID_MSWIN_
+int
+WSAignoreErrno(int err)
+{
+ err=WSAGetLastError();
+ switch (err) {
+ case WSAEINPROGRESS:
+ case WSAEWOULDBLOCK:
+ case WSAEALREADY:
+ case WSATRY_AGAIN:
+// case WSAETIMEDOUT:
+// case WSAECONNRESET:
+ return 1;
+ default:
+ return 0;
+ }
+ /* NOTREACHED */
+}
+
+#else
+
int
ignoreErrno(int ierrno)
{
@@ -890,15 +1151,24 @@
}
/* NOTREACHED */
}
+#endif
void
commCloseAllSockets(void)
{
int fd;
+#ifdef _SQUID_MSWIN_
+ sde *F = NULL;
+#else
fde *F = NULL;
+#endif
PF *callback;
for (fd = 0; fd <= Biggest_FD; fd++) {
+#ifdef _SQUID_MSWIN_
+ F = &sd_table[fd];
+#else
F = &fd_table[fd];
+#endif
if (!F->flags.open)
continue;
if (F->type != FD_SOCKET)
@@ -917,3 +1187,4 @@
}
}
}
+#undef COMM_C
Index: squid/src/comm_select.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/comm_select.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/comm_select.c 22 May 2000 11:07:55 -0000 1.1.1.3.4.2
+++ squid/src/comm_select.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: comm_select.c,v 1.1.1.3.4.2 2000/05/22 11:07:55 hno Exp $
+ * $Id: comm_select.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 5 Socket Functions
*
@@ -31,7 +31,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#ifndef COMM_SELECT_C
+#define COMM_SELECT_C
#include "squid.h"
#if USE_ASYNC_IO
@@ -67,9 +68,21 @@
static void comm_select_dns_incoming(void);
#endif
+
static struct timeval zero_tv;
+#ifdef _SQUID_MSWIN_
+static fd_set global_readsds;
+static fd_set global_writesds;
+static fd_set readsds;
+static fd_set writesds;
+static fd_set errsds;
+static int nreadsds;
+static int nwritesds;
+#endif
static fd_set global_readfds;
static fd_set global_writefds;
+static fd_set readfds;
+static fd_set writefds;
static int nreadfds;
static int nwritefds;
@@ -137,7 +150,11 @@
static int
commDeferRead(int fd)
{
+#ifdef _SQUID_MSWIN_
fde *F = &fd_table[fd];
+#else
+ sde *F = &sd_table[fd];
+#endif
if (F->defer_check == NULL)
return 0;
return F->defer_check(fd, F->defer_data);
@@ -533,13 +550,23 @@
FD_ZERO(&write_mask);
for (i = 0; i < nfds; i++) {
fd = fds[i];
+#ifdef _SQUID_MSWIN_
+ if (sd_table[fd].read_handler) {
+ FD_SET((SOCKET) fd, &read_mask);
+#else
if (fd_table[fd].read_handler) {
FD_SET(fd, &read_mask);
+#endif
if (fd > maxfd)
maxfd = fd;
}
+#ifdef _SQUID_MSWIN_
+ if (sd_table[fd].write_handler) {
+ FD_SET((SOCKET) fd, &write_mask);
+#else
if (fd_table[fd].write_handler) {
FD_SET(fd, &write_mask);
+#endif
if (fd > maxfd)
maxfd = fd;
}
@@ -555,9 +582,15 @@
for (i = 0; i < nfds; i++) {
fd = fds[i];
if (FD_ISSET(fd, &read_mask)) {
+#ifdef _SQUID_MSWIN_
+ if ((hdl = sd_table[fd].read_handler) != NULL) {
+ sd_table[fd].read_handler = NULL;
+ commUpdateReadBitsS(fd, NULL);
+#else
if ((hdl = fd_table[fd].read_handler) != NULL) {
fd_table[fd].read_handler = NULL;
commUpdateReadBits(fd, NULL);
+#endif
hdl(fd, &incame);
} else {
debug(5, 1) ("comm_select_incoming: FD %d NULL read handler\n",
@@ -565,9 +598,15 @@
}
}
if (FD_ISSET(fd, &write_mask)) {
+#ifdef _SQUID_MSWIN_
+ if ((hdl = sd_table[fd].write_handler) != NULL) {
+ sd_table[fd].write_handler = NULL;
+ commUpdateWriteBitsS(fd, NULL);
+#else
if ((hdl = fd_table[fd].write_handler) != NULL) {
fd_table[fd].write_handler = NULL;
commUpdateWriteBits(fd, NULL);
+#endif
hdl(fd, &incame);
} else {
debug(5, 1) ("comm_select_incoming: FD %d NULL write handler\n",
@@ -634,8 +673,12 @@
int
comm_select(int msec)
{
+#ifdef _SQUID_MSWIN_
+ int maxsd;
+#else
fd_set readfds;
fd_set writefds;
+#endif
#if DELAY_POOLS
fd_set slowfds;
#endif
@@ -656,7 +699,11 @@
static time_t last_timeout = 0;
struct timeval poll_time;
double timeout = current_dtime + (msec / 1000.0);
+#ifdef _SQUID_MSWIN_
+ sde *F;
+#else
fde *F;
+#endif
do {
#if !ALARM_UPDATES_TIME
getCurrentTime();
@@ -675,6 +722,19 @@
comm_select_http_incoming();
callicp = calldns = callhttp = 0;
maxfd = Biggest_FD + 1;
+#ifdef _SQUID_MSWIN_
+ FD_ZERO(&readsds);
+ FD_ZERO(&writesds);
+ FD_ZERO(&errsds);
+ xmemcpy(&readsds, &global_readsds,sizeof(global_readsds));
+ xmemcpy(&writesds, &global_writesds,sizeof(global_writesds));
+ xmemcpy(&errsds, &global_writesds,sizeof(global_writesds));
+ for (j = 0; j < (int) readsds.fd_count; j++) {
+ fd=readsds.fd_array[j];
+ if (commDeferRead(fd))
+ FD_CLR((SOCKET) fd, &readsds);
+ }
+#else
xmemcpy(&readfds, &global_readfds,
howmany(maxfd, FD_MASK_BITS) * FD_MASK_BYTES);
xmemcpy(&writefds, &global_writefds,
@@ -706,6 +766,7 @@
}
}
}
+#endif
#if DEBUG_FDBITS
for (i = 0; i < maxfd; i++) {
/* Check each open socket for a handler. */
@@ -721,7 +782,11 @@
}
}
#endif
+#ifdef _SQUID_MSWIN_
+ if (nreadsds + nwritesds == 0) {
+#else
if (nreadfds + nwritefds == 0) {
+#endif
assert(shutting_down);
return COMM_SHUTDOWN;
}
@@ -735,15 +800,23 @@
poll_time.tv_sec = msec / 1000;
poll_time.tv_usec = (msec % 1000) * 1000;
Counter.syscalls.selects++;
+#ifdef _SQUID_MSWIN_
+ num = select(maxfd, &readsds, &writesds, &errsds, &poll_time);
+#else
num = select(maxfd, &readfds, &writefds, NULL, &poll_time);
- Counter.select_loops++;
+#endif
+ Counter.select_loops++;
if (num >= 0)
break;
if (ignoreErrno(errno))
break;
debug(50, 0) ("comm_select: select failure: %s\n",
xstrerror());
+#ifdef _SQUID_MSWIN_
+ examine_select(&readsds, &writesds);
+#else
examine_select(&readfds, &writefds);
+#endif
return COMM_ERROR;
/* NOTREACHED */
}
@@ -761,6 +834,10 @@
if (num == 0)
continue;
/* Scan return fd masks for ready descriptors */
+#ifdef _SQUID_MSWIN_
+ for (j = 0; j < (int) readsds.fd_count; j++) {
+ fd=readsds.fd_array[j];
+#else
fdsp = (fd_mask *) & readfds;
maxindex = howmany(maxfd, FD_MASK_BITS);
for (j = 0; j < maxindex; j++) {
@@ -774,6 +851,7 @@
/* Found a set bit */
fd = (j * FD_MASK_BITS) + k;
EBIT_CLR(tmask, k); /* this will be done */
+#endif
#if DEBUG_FDBITS
debug(5, 9) ("FD %d bit set for reading\n", fd);
assert(FD_ISSET(fd, &readfds));
@@ -790,7 +868,11 @@
callhttp = 1;
continue;
}
+#ifdef _SQUID_MSWIN_
+ F = &sd_table[fd];
+#else
F = &fd_table[fd];
+#endif
debug(5, 6) ("comm_select: FD %d ready for reading\n", fd);
if (NULL == (hdl = F->read_handler))
(void) 0;
@@ -800,7 +882,11 @@
#endif
else {
F->read_handler = NULL;
+#ifdef _SQUID_MSWIN_
+ commUpdateReadBitsS(fd, NULL);
+#else
commUpdateReadBits(fd, NULL);
+#endif
hdl(fd, F->read_data);
Counter.select_fds++;
if (commCheckICPIncoming)
@@ -810,7 +896,21 @@
if (commCheckHTTPIncoming)
comm_select_http_incoming();
}
- }
+ }
+#ifdef _SQUID_MSWIN_
+ for (j = 0; j < (int) errsds.fd_count; j++) {
+ fd=errsds.fd_array[j];
+ F = &sd_table[fd];
+ if ((hdl = F->write_handler)) {
+ F->write_handler = NULL;
+ commUpdateWriteBitsS(fd, NULL);
+ hdl(fd, F->write_data);
+ Counter.select_fds++;
+ }
+ }
+ for (j = 0; j < (int) writesds.fd_count; j++) {
+ fd=writesds.fd_array[j];
+#else
}
fdsp = (fd_mask *) & writefds;
for (j = 0; j < maxindex; j++) {
@@ -824,6 +924,7 @@
/* Found a set bit */
fd = (j * FD_MASK_BITS) + k;
EBIT_CLR(tmask, k); /* this will be done */
+#endif
#if DEBUG_FDBITS
debug(5, 9) ("FD %d bit set for writing\n", fd);
assert(FD_ISSET(fd, &writefds));
@@ -840,11 +941,19 @@
callhttp = 1;
continue;
}
+#ifdef _SQUID_MSWIN_
+ F = &sd_table[fd];
+#else
F = &fd_table[fd];
+#endif
debug(5, 5) ("comm_select: FD %d ready for writing\n", fd);
if ((hdl = F->write_handler)) {
F->write_handler = NULL;
+#ifdef _SQUID_MSWIN_
+ commUpdateWriteBitsS(fd, NULL);
+#else
commUpdateWriteBits(fd, NULL);
+#endif
hdl(fd, F->write_data);
Counter.select_fds++;
if (commCheckICPIncoming)
@@ -853,8 +962,10 @@
comm_select_dns_incoming();
if (commCheckHTTPIncoming)
comm_select_http_incoming();
- }
+#ifndef _SQUID_MSWIN_
}
+#endif
+ }
}
if (callicp)
comm_select_icp_incoming();
@@ -864,7 +975,11 @@
comm_select_http_incoming();
#if DELAY_POOLS
while ((fd = commGetSlowFd()) != -1) {
- F = &fd_table[fd];
+#ifdef _SQUID_MSWIN_
+ F = &sd_table[fd];
+#else
+ F = &fd_table[fd];
+#endif
debug(5, 6) ("comm_select: slow FD %d selected for reading\n", fd);
if ((hdl = F->read_handler)) {
F->read_handler = NULL;
@@ -1004,10 +1119,42 @@
checkTimeouts(void)
{
int fd;
+#ifdef _SQUID_MSWIN_
+ sde *F = NULL;
+ int j;
+#else
fde *F = NULL;
+#endif
PF *callback;
+#ifdef _SQUID_MSWIN_
+ for (j = 0; j < (int) readsds.fd_count; j++) {
+ fd=readsds.fd_array[j];
+ F = &sd_table[fd];
+#else
for (fd = 0; fd <= Biggest_FD; fd++) {
F = &fd_table[fd];
+#endif
+ if (!F->flags.open)
+ continue;
+ if (F->timeout == 0)
+ continue;
+ if (F->timeout > squid_curtime)
+ continue;
+ debug(5, 5) ("checkTimeouts: FD %d Expired\n", fd);
+ if (F->timeout_handler) {
+ debug(5, 5) ("checkTimeouts: FD %d: Call timeout handler\n", fd);
+ callback = F->timeout_handler;
+ F->timeout_handler = NULL;
+ callback(fd, F->timeout_data);
+ } else {
+ debug(5, 5) ("checkTimeouts: FD %d: Forcing comm_close()\n", fd);
+ comm_close(fd);
+ }
+ }
+#ifdef _SQUID_MSWIN_
+ for (j = 0; j < (int) writesds.fd_count; j++) {
+ fd=writesds.fd_array[j];
+ F = &sd_table[fd];
if (!F->flags.open)
continue;
if (F->timeout == 0)
@@ -1025,6 +1172,7 @@
comm_close(fd);
}
}
+#endif
}
static void
@@ -1059,6 +1207,32 @@
statHistDump(&f->comm_http_incoming, sentry, statHistIntDumper);
}
+#ifdef _SQUID_MSWIN_
+void
+commUpdateReadBitsS(int sd, PF * handler)
+{
+ if (handler && !FD_ISSET(sd, &global_readsds)) {
+ FD_SET((SOCKET) sd, &global_readsds);
+ nreadsds++;
+ } else if (!handler && FD_ISSET(sd, &global_readsds)) {
+ FD_CLR((SOCKET) sd, &global_readsds);
+ nreadsds--;
+ }
+}
+
+void
+commUpdateWriteBitsS(int sd, PF * handler)
+{
+ if (handler && !FD_ISSET(sd, &global_writesds)) {
+ FD_SET((SOCKET) sd, &global_writesds);
+ nwritesds++;
+ } else if (!handler && FD_ISSET(sd, &global_writesds)) {
+ FD_CLR((SOCKET) sd, &global_writesds);
+ nwritesds--;
+ }
+}
+#endif
+
void
commUpdateReadBits(int fd, PF * handler)
{
@@ -1082,3 +1256,4 @@
nwritefds--;
}
}
+#endif COMM_SELECT_C
Index: squid/src/debug.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/debug.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/debug.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/debug.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: debug.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: debug.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 0 Debug Routines
* AUTHOR: Harvest Derived
@@ -214,10 +214,22 @@
snprintf(to, MAXPATHLEN, "%s.%d", debug_log_file, i);
rename(from, to);
}
+ /*
+ * You can't rename open files on Microsoft "operating systems"
+ * so we close before renaming.
+ */
+#ifdef _SQUID_MSWIN_
+ if (debug_log != stderr)
+ fclose(debug_log);
+#endif
/* Rotate the current log to .0 */
if (Config.Log.rotateNumber > 0) {
snprintf(to, MAXPATHLEN, "%s.%d", debug_log_file, 0);
+#ifdef _SQUID_MSWIN_
+ xrename(debug_log_file, to);
+#else
rename(debug_log_file, to);
+#endif
}
/* Close and reopen the log. It may have been renamed "manually"
* before HUP'ing us. */
Index: squid/src/defines.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/defines.h,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/defines.h 1 Aug 2000 00:05:19 -0000 1.1.1.3.4.2
+++ squid/src/defines.h 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: defines.h,v 1.1.1.3.4.2 2000/08/01 00:05:19 hno Exp $
+ * $Id: defines.h,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:13 hno Exp $
*
*
* SQUID Internet Object Cache http://squid.nlanr.net/Squid/
Index: squid/src/delay_pools.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/delay_pools.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/delay_pools.c 22 May 2000 11:00:39 -0000 1.1.1.3.4.2
+++ squid/src/delay_pools.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: delay_pools.c,v 1.1.1.3.4.2 2000/05/22 11:00:39 hno Exp $
+ * $Id: delay_pools.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 77 Delay Pools
* AUTHOR: David Luyer
Index: squid/src/disk.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/disk.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/disk.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/disk.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: disk.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: disk.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 6 Disk I/O Routines
* AUTHOR: Harvest Derived
@@ -60,17 +60,36 @@
file_open(const char *path, int mode)
{
int fd;
+#ifdef _SQUID_MSWIN_
+ char fmode[4]="";
+ FILE * fbuf;
+#endif
+
if (mode & O_WRONLY)
mode |= O_APPEND;
+#ifdef _SQUID_MSWIN_
+ mode |= _O_BINARY;
+ errno = 0;
+ if (mode & O_WRONLY)
+ strcpy(fmode,"a+b");
+ else
+ strcpy(fmode,"rb");
+ fbuf=fopen(path,fmode);
+ fd = fileno(fbuf);
+#else
mode |= SQUID_NONBLOCK;
errno = 0;
fd = open(path, mode, 0644);
+#endif
Counter.syscalls.disk.opens++;
if (fd < 0) {
debug(50, 3) ("file_open: error opening file %s: %s\n", path,
xstrerror());
fd = DISK_ERROR;
} else {
+#ifdef _SQUID_MSWIN_
+ fd_table[fd].fbuf=fbuf;
+#endif
debug(6, 5) ("file_open: FD %d\n", fd);
commSetCloseOnExec(fd);
fd_open(fd, FD_FILE, path);
@@ -83,7 +102,10 @@
void
file_close(int fd)
{
- fde *F = &fd_table[fd];
+#ifdef _SQUID_MSWIN_
+ FILE *fbuf;
+#endif
+ fde *F = &fd_table[fd];
PF *read_callback;
assert(fd >= 0);
assert(F->flags.open);
@@ -114,7 +136,13 @@
#if CALL_FSYNC_BEFORE_CLOSE
fsync(fd);
#endif
+#ifdef _SQUID_MSWIN_
+ fbuf=fd_table[fd].fbuf;
+ if (fbuf==NULL) close(fd);
+ else fclose(fbuf);
+#else
close(fd);
+#endif
debug(6, F->flags.close_request ? 2 : 5)
("file_close: FD %d, really closing\n", fd);
fd_close(fd);
@@ -187,9 +215,14 @@
debug(6, 3) ("diskHandleWrite: FD %d writing %d bytes\n",
fd, (int) (fdd->write_q->len - fdd->write_q->buf_offset));
errno = 0;
+#ifdef _SQUID_MSWIN_
+ len = fwrite(fdd->write_q->buf + fdd->write_q->buf_offset,1,
+ fdd->write_q->len - fdd->write_q->buf_offset,fd_table[fd].fbuf);
+#else
len = write(fd,
fdd->write_q->buf + fdd->write_q->buf_offset,
fdd->write_q->len - fdd->write_q->buf_offset);
+#endif
debug(6, 3) ("diskHandleWrite: FD %d len = %d\n", fd, len);
Counter.syscalls.disk.writes++;
fd_bytes(fd, len, FD_WRITE);
@@ -350,7 +383,11 @@
F->disk.offset = ctrl_dat->offset;
}
errno = 0;
+#ifdef _SQUID_MSWIN_
+ len = fread(ctrl_dat->buf, 1, ctrl_dat->req_len, fd_table[fd].fbuf);
+#else
len = read(fd, ctrl_dat->buf, ctrl_dat->req_len);
+#endif
if (len > 0)
F->disk.offset += len;
Counter.syscalls.disk.reads++;
@@ -393,3 +430,27 @@
cbdataLock(client_data);
diskHandleRead(fd, ctrl_dat);
}
+
+#ifdef _SQUID_MSWIN_
+int
+ignoreErrno(int ierrno)
+{
+ switch (ierrno) {
+ case EINPROGRESS:
+ case EWOULDBLOCK:
+#if EAGAIN != EWOULDBLOCK
+ case EAGAIN:
+#endif
+ case EALREADY:
+ case EINTR:
+#ifdef ERESTART
+ case ERESTART:
+#endif
+ return 1;
+ default:
+ return 0;
+ }
+ /* NOTREACHED */
+}
+#endif
+
Index: squid/src/dns.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/dns.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/dns.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/dns.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: dns.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: dns.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 34 Dnsserver interface
* AUTHOR: Harvest Derived
@@ -35,14 +35,40 @@
#include "squid.h"
-static helper *dnsservers = NULL;
+#ifdef _SQUID_MSWIN_
+typedef int ( * PFDNSLookup)(const char *, void *, HLPCB);
+typedef int ( * PFInit)();
+
+typedef struct {
+ HINSTANCE hnd;
+ PFDNSLookup DNSLookup;
+ PFInit Init;
+ struct {
+ int requests;
+ int replies;
+ int queue_size;
+ int avg_svc_time;
+ } stats;
+} DNSPlugin;
+static DNSPlugin *dnsservers = NULL;
+#else
+static helper *dnsservers = NULL;
+#endif
#if USE_DNSSERVERS
+
static void
dnsStats(StoreEntry * sentry)
{
storeAppendPrintf(sentry, "Dnsserver Statistics:\n");
+#ifdef _SQUID_MSWIN_
+ storeAppendPrintf(sentry, "requests sent: %d\n",
+ dnsservers->stats.requests);
+ storeAppendPrintf(sentry, "replies received: %d\n",
+ dnsservers->stats.replies);
+#else
helperStats(sentry, dnsservers);
+#endif
}
#endif
@@ -52,11 +78,47 @@
{
#if USE_DNSSERVERS
static int init = 0;
+#ifndef _SQUID_MSWIN_
wordlist *w;
+#endif
+
if (!Config.Program.dnsserver)
- return;
+ return;
+#ifdef _SQUID_MSWIN_
+ if (dnsservers == NULL)
+ dnsservers = xmalloc(sizeof(DNSPlugin));
+ debug(34, 0) ("dnsInit: Loading %s\n", Config.Program.dnsserver);
+ dnsservers->hnd = LoadLibrary(Config.Program.dnsserver);
+ if (dnsservers->hnd == NULL) {
+ debug(34, 0) ("dnsInit: Unable to load %s\n", Config.Program.dnsserver);
+ xfree(dnsservers);
+ Config.Program.dnsserver = 0;
+ return;
+ }
+ dnsservers->DNSLookup = (PFDNSLookup)GetProcAddress(dnsservers->hnd,"DNSLookup");
+ if (dnsservers->DNSLookup == NULL) {
+ debug(34, 0) ("dnsInit: Invalid DNS plugin %s\n", Config.Program.dnsserver);
+ FreeLibrary(dnsservers->hnd);
+ xfree(dnsservers);
+ Config.Program.dnsserver = NULL;
+ return;
+ }
+ dnsservers->Init = (PFInit)GetProcAddress(dnsservers->hnd,"Init");
+ if (dnsservers->Init == NULL) {
+ debug(34, 0) ("dnsInit: Invalid DNS plugin %s\n", Config.Program.dnsserver);
+ FreeLibrary(dnsservers->hnd);
+ xfree(dnsservers);
+ Config.Program.dnsserver = NULL;
+ return;
+ }
+ debug(34, 0) ("dnsInit: Initializing DNS plugin\n");
+ dnsservers->Init();
+
+ dnsservers->stats.requests=0;
+ dnsservers->stats.replies=0;
+#else
if (dnsservers == NULL)
- dnsservers = helperCreate("dnsserver");
+ dnsservers = helperCreate("dnsserver");
dnsservers->n_to_start = Config.dnsChildren;
dnsservers->ipc_type = IPC_TCP_SOCKET;
assert(dnsservers->cmdline == NULL);
@@ -68,6 +130,7 @@
wordlistAdd(&dnsservers->cmdline, w->key);
}
helperOpenServers(dnsservers);
+#endif
if (!init) {
cachemgrRegister("dns",
"Dnsserver Statistics",
@@ -81,21 +144,32 @@
dnsShutdown(void)
{
if (!dnsservers)
- return;
+ return;
+#ifdef _SQUID_MSWIN_
+ FreeLibrary(dnsservers->hnd);
+ xfree(dnsservers);
+#else
helperShutdown(dnsservers);
wordlistDestroy(&dnsservers->cmdline);
- if (!shutting_down)
+ if (!shutting_down)
return;
helperFree(dnsservers);
+#endif
dnsservers = NULL;
}
void
dnsSubmit(const char *lookup, HLPCB * callback, void *data)
{
+#ifdef _SQUID_MSWIN_
+ dnsservers->stats.requests++;
+ dnsservers->DNSLookup(lookup, data, callback);
+ dnsservers->stats.replies++;
+#else
char buf[256];
snprintf(buf, 256, "%s\n", lookup);
helperSubmit(dnsservers, buf, callback, data);
+#endif
}
#ifdef SQUID_SNMP
Index: squid/src/dns_internal.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/dns_internal.c,v
retrieving revision 1.1.1.1.4.6
retrieving revision 1.1.1.1.4.6.2.1
diff -u -r1.1.1.1.4.6 -r1.1.1.1.4.6.2.1
--- squid/src/dns_internal.c 1 Aug 2000 00:14:35 -0000 1.1.1.1.4.6
+++ squid/src/dns_internal.c 6 Jan 2001 12:40:13 -0000 1.1.1.1.4.6.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: dns_internal.c,v 1.1.1.1.4.6 2000/08/01 00:14:35 hno Exp $
+ * $Id: dns_internal.c,v 1.1.1.1.4.6.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 78 DNS lookups; interacts with lib/rfc1035.c
* AUTHOR: Duane Wessels
@@ -32,6 +32,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
+#ifndef DNS_INTERNAL_C
+#define DNS_INTERNAL_C
#include "squid.h"
@@ -142,9 +144,78 @@
static void
idnsParseResolvConf(void)
{
+#ifndef _SQUID_MSWIN_
FILE *fp;
char buf[512];
- char *t;
+#endif
+ char *t;
+#ifdef _SQUID_MSWIN_
+ char *token;
+ HKEY hndKey,hndKey2;
+
+ idnsFreeNameservers();
+ // get nameservers from the registry
+ if (RegOpenKey(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters",&hndKey) == ERROR_SUCCESS) {
+ DWORD Type = 0;
+ DWORD Size = 0;
+ LONG Result;
+ Result = RegQueryValueEx(hndKey,"DhcpNameServer",NULL,&Type,NULL,&Size);
+ if (Result == ERROR_SUCCESS && Size) {
+ t = (unsigned char*) xmalloc(Size);
+ RegQueryValueEx(hndKey,"DhcpNameServer",NULL,&Type,t,&Size);
+ token = strtok((char*)t,", ");
+ while (token) {
+ idnsAddNameserver(token);
+ token = strtok(NULL,", ");
+ }
+ }
+ Result = RegQueryValueEx(hndKey,"NameServer",NULL,&Type,NULL,&Size);
+ if (Result == ERROR_SUCCESS && Size) {
+ t = (unsigned char*)xmalloc(Size);
+ RegQueryValueEx(hndKey,"NameServer",NULL,&Type,t,&Size);
+ token = strtok((char*)t,", ");
+ while (token) {
+ debug(78, 1) ("Adding nameserver %s from Registry\n", token);
+ idnsAddNameserver(token);
+ token = strtok(NULL,", ");
+ }
+ }
+ RegCloseKey(hndKey);
+ }
+ // might be windows 2000 - search all interfaces for DNS server addresses
+ // what a goddamn PITA
+ if (RegOpenKey(HKEY_LOCAL_MACHINE,"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces",&hndKey) == ERROR_SUCCESS) {
+ int i;
+ char keyname[255];
+
+ for (i=0;i < 10; i++) {
+ if (RegEnumKey(hndKey,i,(char *)&keyname,255) == ERROR_SUCCESS) {
+ char newkeyname[255];
+
+ strcpy(newkeyname,"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\");
+ strcat(newkeyname,keyname);
+ if (RegOpenKey(HKEY_LOCAL_MACHINE,newkeyname,&hndKey2) == ERROR_SUCCESS) {
+ DWORD Type = 0;
+ DWORD Size = 0;
+ LONG Result;
+ Result = RegQueryValueEx(hndKey2,"NameServer",NULL,&Type,NULL,&Size);
+ if (Result == ERROR_SUCCESS && Size) {
+ t =(unsigned char*) xmalloc(Size);
+ RegQueryValueEx(hndKey2,"NameServer",NULL,&Type,t,&Size);
+ token = strtok((char*)t,", ");
+ while (token) {
+ debug(78, 1) ("Adding nameserver %s from Registry\n", token);
+ idnsAddNameserver(token);
+ token = strtok(NULL,", ");
+ }
+ }
+ RegCloseKey(hndKey2);
+ }
+ }
+ }
+ RegCloseKey(hndKey);
+ }
+#else
fp = fopen(_PATH_RESOLV_CONF, "r");
if (fp == NULL) {
debug(78, 1) ("%s: %s\n", _PATH_RESOLV_CONF, xstrerror());
@@ -163,6 +234,7 @@
idnsAddNameserver(t);
}
fclose(fp);
+#endif
}
static void
@@ -435,7 +507,11 @@
static int init = 0;
if (DnsSocket < 0) {
DnsSocket = comm_open(SOCK_DGRAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_UDP,
+#else
0,
+#endif
Config.Addrs.udp_outgoing,
0,
COMM_NONBLOCKING,
@@ -503,3 +579,4 @@
}
#endif /* !USE_DNSSERVERS */
+#endif /* !DNS_INTERNAL_C */
\ No newline at end of file
Index: squid/src/dnsserver.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/dnsserver.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/dnsserver.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/dnsserver.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: dnsserver.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: dnsserver.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 0 DNS Resolver
* AUTHOR: Harvest Derived
@@ -140,8 +140,10 @@
#include "snprintf.h"
#if !defined(_SQUID_AIX_)
+#if !defined(_SQUID_MSWIN_)
extern int h_errno;
#endif
+#endif
#if LIBRESOLV_DNS_TTL_HACK
extern int _dns_ttl_; /* this is a really *dirty* hack - bne */
@@ -181,20 +183,39 @@
#define REQ_SZ 512
+#ifdef _SQUID_MSWIN_
+
+typedef void HLPCB(void *, char *buf);
+
+__declspec (dllexport) int
+DNSLookup(const char *buf, void *data, HLPCB callback)
+{
+static char reply[20*sizeof(buf)],tail[20*sizeof(buf)];
+#else
static void
lookup(const char *buf)
{
+#endif
const struct hostent *result = NULL;
int reverse = 0;
int ttl = 0;
int retry = 0;
int i;
struct in_addr addr;
+
+#ifndef _SQUID_MSWIN_
if (0 == strcmp(buf, "$shutdown"))
- exit(0);
+ exit(0);
+#endif
if (0 == strcmp(buf, "$hello")) {
- printf("$alive\n");
+#ifdef _SQUID_MSWIN_
+ snprintf(reply,sizeof(reply),"$alive\n");
+ (callback)(data,reply);
+ return 0;
+#else
+ printf("$alive\n");
return;
+#endif
}
/* check if it's already an IP address in text form. */
for (;;) {
@@ -210,16 +231,33 @@
break;
if (++retry == 3)
break;
+#ifdef _SQUID_MSWIN_
+ Sleep(1000);
+#else
sleep(1);
+#endif
}
if (NULL == result) {
- if (h_errno == TRY_AGAIN) {
- printf("$fail Name Server for domain '%s' is unavailable.\n", buf);
- } else {
- printf("$fail DNS Domain '%s' is invalid: %s.\n",
- buf, my_h_msgs(h_errno));
- }
- return;
+ if (h_errno == TRY_AGAIN) {
+#ifdef _SQUID_MSWIN_
+ snprintf(reply,sizeof(reply),"$fail Name Server for domain '%s' is unavailable.\n", buf);
+#else
+ printf("$fail Name Server for domain '%s' is unavailable.\n", buf);
+#endif
+ } else {
+#ifdef _SQUID_MSWIN_
+ snprintf(reply,sizeof(reply),"$fail DNS Domain '%s' is invalid: %s.\n",
+#else
+ printf("$fail DNS Domain '%s' is invalid: %s.\n",
+#endif
+ buf, my_h_msgs(h_errno));
+ }
+#ifdef _SQUID_MSWIN_
+ (callback)(data,reply);
+ return 0;
+#else
+ return;
+#endif
}
#if LIBRESOLV_DNS_TTL_HACK
/* DNS TTL handling - bne@CareNet.hu
@@ -229,19 +267,40 @@
ttl = _dns_ttl_;
#endif
if (reverse) {
- printf("$name %d %s\n", ttl, result->h_name);
- return;
+#ifdef _SQUID_MSWIN_
+ snprintf(reply,sizeof(reply),"$name %d %s\n", ttl, result->h_name);
+ (callback)(data,reply);
+ return 0;
+ }
+ snprintf(reply,sizeof(reply),"$addr %d", ttl);
+#else
+ printf("$name %d %s\n", ttl, result->h_name);
+ return;
}
printf("$addr %d", ttl);
+#endif
for (i = 0; NULL != result->h_addr_list[i]; i++) {
- if (32 == i)
- break;
- xmemcpy(&addr, result->h_addr_list[i], sizeof(addr));
- printf(" %s", inet_ntoa(addr));
+ if (32 == i)
+ break;
+ xmemcpy(&addr, result->h_addr_list[i], sizeof(addr));
+#ifdef _SQUID_MSWIN_
+ snprintf(tail,sizeof(tail)," %s", inet_ntoa(addr));
+ strcat(reply,tail);
+ (callback)(data,reply);
+ return 0;
+ }
+ snprintf(reply,sizeof(reply),"\n");
+ (callback)(data,reply);
+ return 0;
+#else
+ printf(" %s", inet_ntoa(addr));
}
printf("\n");
+#endif
}
+#ifndef _SQUID_MSWIN_
+
static void
usage(void)
{
@@ -349,3 +408,37 @@
/* NOTREACHED */
return 0;
}
+
+#else
+
+__declspec (dllexport) int Init()
+{
+ safe_inet_addr("255.255.255.255", &no_addr);
+ return 0;
+}
+
+BOOL APIENTRY
+DllMain (
+ HINSTANCE hInst /* Library instance handle. */ ,
+ DWORD reason /* Reason this function is being called. */ ,
+ LPVOID reserved /* Not used. */ )
+{
+
+ switch (reason)
+ {
+ case DLL_PROCESS_ATTACH:
+ break;
+
+ case DLL_PROCESS_DETACH:
+ break;
+
+ case DLL_THREAD_ATTACH:
+ break;
+
+ case DLL_THREAD_DETACH:
+ break;
+ }
+ return TRUE;
+}
+
+#endif
\ No newline at end of file
Index: squid/src/enums.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/enums.h,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/enums.h 1 Jul 2000 12:05:14 -0000 1.1.1.3.4.2
+++ squid/src/enums.h 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: enums.h,v 1.1.1.3.4.2 2000/07/01 12:05:14 hno Exp $
+ * $Id: enums.h,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:13 hno Exp $
*
*
* SQUID Internet Object Cache http://squid.nlanr.net/Squid/
Index: squid/src/errorpage.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/errorpage.c,v
retrieving revision 1.1.1.3.4.3
retrieving revision 1.1.1.3.4.3.2.1
diff -u -r1.1.1.3.4.3 -r1.1.1.3.4.3.2.1
--- squid/src/errorpage.c 31 Dec 2000 05:24:17 -0000 1.1.1.3.4.3
+++ squid/src/errorpage.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.3.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: errorpage.c,v 1.1.1.3.4.3 2000/12/31 05:24:17 hno Exp $
+ * $Id: errorpage.c,v 1.1.1.3.4.3.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 4 Error Generation
* AUTHOR: Duane Wessels
Index: squid/src/event.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/event.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/event.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/event.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: event.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: event.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 41 Event Processing
* AUTHOR: Henrik Nordstrom
Index: squid/src/fd.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fd.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/fd.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/fd.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: fd.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: fd.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 51 Filedescriptor Functions
* AUTHOR: Duane Wessels
@@ -45,6 +45,98 @@
"Unknown"
};
+#ifdef _SQUID_MSWIN_
+static void
+sdUpdateBiggest(int fd, int opening)
+{
+ if (fd < Biggest_SD)
+ return;
+ assert(fd < Squid_MaxFD);
+ if (fd > Biggest_SD) {
+ /*
+ * assert that we are not closing a FD bigger than
+ * our known biggest FD
+ */
+ assert(opening);
+ Biggest_SD = fd;
+ return;
+ }
+ /* if we are here, then fd == Biggest_FD */
+ /*
+ * assert that we are closing the biggest FD; we can't be
+ * re-opening it
+ */
+ assert(!opening);
+ while (!sd_table[Biggest_SD].flags.open && Biggest_SD)
+ Biggest_SD--;
+ debug(51, 2) ("sdUpdateBiggest: %d\n",Biggest_SD);
+}
+
+void
+sd_close(int fd)
+{
+ sde *F = &sd_table[fd];
+ if (F->type == FD_FILE) {
+ assert(F->read_handler == NULL);
+ assert(F->write_handler == NULL);
+ }
+ debug(51, 3) ("sd_close FD %d %s\n", fd, F->desc);
+ F->flags.open = 0;
+ sdUpdateBiggest(fd, 0);
+ Number_SD--;
+ commUpdateReadBitsS(fd, NULL);
+ commUpdateWriteBitsS(fd, NULL);
+ memset(F, '\0', sizeof(sde));
+ F->timeout = 0;
+}
+
+void
+sd_open(int fd, unsigned int type, const char *desc)
+{
+ sde *F = &sd_table[fd];
+ assert(fd >= 0);
+#if USE_ASYNC_IO
+ if (F->flags.closing) {
+ /* Reuse of a closed FD before we have noticed it is closed */
+ sd_close(fd);
+ }
+#endif
+ if (F->flags.open) {
+ debug(51, 1) ("WARNING: Closing open SD %4d\n", fd);
+ sd_close(fd);
+ }
+ assert(!F->flags.open);
+ debug(51, 3) ("sd_open SD %d %s\n", fd, desc);
+ F->type = type;
+ F->flags.open = 1;
+ sdUpdateBiggest(fd, 1);
+ if (desc)
+ xstrncpy(F->desc, desc, FD_DESC_SZ);
+ Number_SD++;
+}
+
+void
+sd_note(int fd, const char *s)
+{
+ sde *F = &sd_table[fd];
+ xstrncpy(F->desc, s, FD_DESC_SZ);
+}
+
+void
+sd_bytes(int fd, int len, unsigned int type)
+{
+ sde *F = &sd_table[fd];
+ if (len < 0)
+ return;
+ assert(type == FD_READ || type == FD_WRITE);
+ if (type == FD_READ)
+ F->bytes_read += len;
+ else
+ F->bytes_written += len;
+}
+
+#endif
+
static void fdUpdateBiggest(int fd, int);
static void
@@ -68,7 +160,11 @@
* re-opening it
*/
assert(!opening);
+#ifdef _SQUID_MSWIN_
+ while (!fd_table[Biggest_FD].flags.open && Biggest_FD)
+#else
while (!fd_table[Biggest_FD].flags.open)
+#endif
Biggest_FD--;
}
@@ -82,6 +178,9 @@
}
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);
@@ -139,6 +238,9 @@
fdFreeMemory(void)
{
safe_free(fd_table);
+#ifdef _SQUID_MSWIN_
+ safe_free(sd_table);
+#endif
}
void
Index: squid/src/filemap.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/filemap.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/filemap.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1
+++ squid/src/filemap.c 6 Jan 2001 12:40:13 -0000 1.1.1.2.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: filemap.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: filemap.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 8 Swap File Bitmap
* AUTHOR: Harvest Derived
Index: squid/src/forward.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/forward.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/forward.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/forward.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: forward.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: forward.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 17 Request Forwarding
* AUTHOR: Duane Wessels
@@ -33,7 +33,7 @@
*
*/
-
+#define FORWARD_C
#include "squid.h"
static PSC fwdStartComplete;
@@ -247,7 +247,11 @@
return;
}
fd = comm_open(SOCK_STREAM,
- 0,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_TCP,
+#else
+ 0,
+#endif
Config.Addrs.tcp_outgoing,
0,
COMM_NONBLOCKING,
@@ -639,3 +643,4 @@
}
/* NOTREACHED */
}
+#undef FORWARD_C
Index: squid/src/fqdncache.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fqdncache.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/fqdncache.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/fqdncache.c 6 Jan 2001 12:40:13 -0000 1.1.1.3.4.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Id: fqdncache.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: fqdncache.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:13 hno Exp $
*
* DEBUG: section 35 FQDN Cache
* AUTHOR: Harvest Derived
Index: squid/src/ftp.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/ftp.c,v
retrieving revision 1.1.1.3.4.3
retrieving revision 1.1.1.3.4.3.2.1
diff -u -r1.1.1.3.4.3 -r1.1.1.3.4.3.2.1
--- squid/src/ftp.c 31 Dec 2000 05:24:17 -0000 1.1.1.3.4.3
+++ squid/src/ftp.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.3.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: ftp.c,v 1.1.1.3.4.3 2000/12/31 05:24:17 hno Exp $
+ * $Id: ftp.c,v 1.1.1.3.4.3.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 9 File Transfer Protocol (FTP)
* AUTHOR: Harvest Derived
@@ -33,6 +33,7 @@
*
*/
+#define FTP_C
#include "squid.h"
static const char *const crlf = "\r\n";
@@ -879,7 +880,11 @@
#endif
memset(ftpState->data.buf + ftpState->data.offset, '\0', read_sz);
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ len = recv(fd, ftpState->data.buf + ftpState->data.offset, read_sz);
+#else
len = read(fd, ftpState->data.buf + ftpState->data.offset, read_sz);
+#endif
if (len > 0) {
fd_bytes(fd, len, FD_READ);
#if DELAY_POOLS
@@ -1246,9 +1251,15 @@
}
assert(ftpState->ctrl.offset < ftpState->ctrl.size);
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ len = recv(fd,
+ ftpState->ctrl.buf + ftpState->ctrl.offset,
+ ftpState->ctrl.size - ftpState->ctrl.offset);
+#else
len = read(fd,
ftpState->ctrl.buf + ftpState->ctrl.offset,
ftpState->ctrl.size - ftpState->ctrl.offset);
+#endif
if (len > 0) {
fd_bytes(fd, len, FD_READ);
kb_incr(&Counter.server.all.kbytes_in, len);
@@ -1677,7 +1688,11 @@
}
/* Open data channel with the same local address as control channel */
fd = comm_open(SOCK_STREAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_TCP,
+#else
0,
+#endif
addr.sin_addr,
0,
COMM_NONBLOCKING,
@@ -1810,7 +1825,11 @@
port = ntohs(addr.sin_port);
}
fd = comm_open(SOCK_STREAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_TCP,
+#else
0,
+#endif
addr.sin_addr,
port,
COMM_NONBLOCKING | (fallback ? COMM_REUSEADDR : 0),
@@ -2561,3 +2580,4 @@
*t = '\0';
return buf;
}
+#undef FTP_C
Index: squid/src/globals.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/globals.h,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/globals.h 1 Jul 2000 12:05:14 -0000 1.1.1.3.4.2
+++ squid/src/globals.h 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: globals.h,v 1.1.1.3.4.2 2000/07/01 12:05:14 hno Exp $
+ * $Id: globals.h,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:14 hno Exp $
*
*
* SQUID Internet Object Cache http://squid.nlanr.net/Squid/
@@ -63,6 +63,11 @@
extern const char *storeStatusStr[];
extern const char *swapStatusStr[];
extern dnsStatData DnsStats;
+#ifdef _SQUID_MSWIN_
+extern sde *sd_table; /* NULL */
+extern int Biggest_SD; /* -1 */
+extern int Number_SD; /* 0 */
+#endif
extern fde *fd_table; /* NULL */
extern int Biggest_FD; /* -1 */
extern int Number_FD; /* 0 */
Index: squid/src/gopher.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/gopher.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/gopher.c 31 Dec 2000 05:24:17 -0000 1.1.1.3.4.2
+++ squid/src/gopher.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.2.2.1
@@ -1,7 +1,7 @@
/*
- * $Id: gopher.c,v 1.1.1.3.4.2 2000/12/31 05:24:17 hno Exp $
+ * $Id: gopher.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 10 Gopher
* AUTHOR: Harvest Derived
@@ -33,7 +33,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#ifndef GOPHER_C
+#define GOPHER_C
#include "squid.h"
/* gopher type code from rfc. Anawat. */
@@ -613,7 +614,11 @@
#endif
/* leave one space for \0 in gopherToHTML */
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ len = recv(fd, buf, read_sz);
+#else
len = read(fd, buf, read_sz);
+#endif
if (len > 0) {
fd_bytes(fd, len, FD_READ);
#if DELAY_POOLS
@@ -821,3 +826,4 @@
gd->buf = memAllocate(MEM_4K_BUF);
return (gd);
}
+#endif GOPHER_C
Index: squid/src/helper.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/helper.c,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.24.1
diff -u -r1.1.1.3 -r1.1.1.3.24.1
--- squid/src/helper.c 26 Jan 2000 03:25:01 -0000 1.1.1.3
+++ squid/src/helper.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.24.1
@@ -1,3 +1,5 @@
+#ifndef HELPER_C
+#define HELPER_C
#include "squid.h"
#define HELPER_MAX_ARGS 64
@@ -15,6 +17,7 @@
void
helperOpenServers(helper * hlp)
{
+#ifndef _SQUID_MSWIN_
char *s;
char *progname;
char *shortname;
@@ -87,6 +90,7 @@
safe_free(shortname);
safe_free(procname);
helperKickQueue(hlp);
+#endif
}
void
@@ -249,7 +253,11 @@
assert(fd == srv->rfd);
assert(cbdataValid(data));
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ len = recv(fd, srv->buf + srv->offset, srv->buf_sz - srv->offset);
+#else
len = read(fd, srv->buf + srv->offset, srv->buf_sz - srv->offset);
+#endif
fd_bytes(fd, len, FD_READ);
debug(29, 5) ("helperHandleRead: %d bytes from %s #%d.\n",
len, hlp->id_name, srv->index + 1);
@@ -388,3 +396,4 @@
xfree(r->buf);
memFree(r, MEM_HELPER_REQUEST);
}
+#endif// HELPER_C
Index: squid/src/htcp.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/htcp.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/htcp.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1
+++ squid/src/htcp.c 6 Jan 2001 12:40:14 -0000 1.1.1.2.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: htcp.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: htcp.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 31 Hypertext Caching Protocol
* AUTHOR: Duane Wesssels
@@ -32,7 +32,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#ifndef HTCP_C
+#define HTCP_C
#include "squid.h"
typedef struct _Countstr Countstr;
@@ -840,7 +841,11 @@
{
enter_suid();
htcpInSocket = comm_open(SOCK_DGRAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_UDP,
+#else
0,
+#endif
Config.Addrs.udp_incoming,
Config.Port.htcp,
COMM_NONBLOCKING,
@@ -854,7 +859,11 @@
if (Config.Addrs.udp_outgoing.s_addr != no_addr.s_addr) {
enter_suid();
htcpOutSocket = comm_open(SOCK_DGRAM,
- 0,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_UDP,
+#else
+ 0,
+#endif
Config.Addrs.udp_outgoing,
Config.Port.htcp,
COMM_NONBLOCKING,
@@ -954,3 +963,4 @@
comm_close(htcpOutSocket);
}
}
+#endif //HTCP_C
Index: squid/src/http.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/http.c,v
retrieving revision 1.1.1.3.4.3
retrieving revision 1.1.1.3.4.3.2.1
diff -u -r1.1.1.3.4.3 -r1.1.1.3.4.3.2.1
--- squid/src/http.c 1 Jul 2000 12:05:14 -0000 1.1.1.3.4.3
+++ squid/src/http.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.3.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: http.c,v 1.1.1.3.4.3 2000/07/01 12:05:14 hno Exp $
+ * $Id: http.c,v 1.1.1.3.4.3.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 11 Hypertext Transfer Protocol (HTTP)
* AUTHOR: Harvest Derived
@@ -37,7 +37,8 @@
* Anonymizing patch by lutz@as-node.jena.thur.de
* have a look into http-anon.c to get more informations.
*/
-
+#ifndef HTTP_C
+#define HTTP_C
#include "squid.h"
static const char *const crlf = "\r\n";
@@ -478,7 +479,11 @@
read_sz = delayBytesWanted(delay_id, 1, read_sz);
#endif
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ len = recv(fd, buf, read_sz);
+#else
len = read(fd, buf, read_sz);
+#endif
debug(11, 5) ("httpReadReply: FD %d: len %d.\n", fd, len);
if (len > 0) {
fd_bytes(fd, len, FD_READ);
@@ -847,7 +852,11 @@
cfd = -1;
else
cfd = entry->mem_obj->fd;
+#ifdef _SQUID_MSWIN_
+ assert(-1 == cfd || FD_SOCKET == sd_table[cfd].type);
+#else
assert(-1 == cfd || FD_SOCKET == fd_table[cfd].type);
+#endif
if (p != NULL)
httpState->flags.proxying = 1;
/*
@@ -999,3 +1008,4 @@
comm_write(fd, "\r\n", 2, httpSendComplete, data, NULL);
}
}
+#endif //HTTP_C
\ No newline at end of file
Index: squid/src/icmp.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/icmp.c,v
retrieving revision 1.1.1.2.4.2
retrieving revision 1.1.1.2.4.2.2.1
diff -u -r1.1.1.2.4.2 -r1.1.1.2.4.2.2.1
--- squid/src/icmp.c 22 May 2000 11:00:39 -0000 1.1.1.2.4.2
+++ squid/src/icmp.c 6 Jan 2001 12:40:14 -0000 1.1.1.2.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: icmp.c,v 1.1.1.2.4.2 2000/05/22 11:00:39 hno Exp $
+ * $Id: icmp.c,v 1.1.1.2.4.2.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 37 ICMP Routines
* AUTHOR: Duane Wessels
@@ -33,7 +33,7 @@
*
*/
-
+#define ICMP_C
#include "squid.h"
#if USE_ICMP
@@ -223,3 +223,4 @@
icmp_sock = -1;
#endif
}
+#undef ICMP_C
\ No newline at end of file
Index: squid/src/icp_v2.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/icp_v2.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/icp_v2.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/icp_v2.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: icp_v2.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: icp_v2.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 12 Internet Cache Protocol
* AUTHOR: Duane Wessels
@@ -32,7 +32,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#define ICP_V2_C
#include "squid.h"
static void icpLogIcp(struct in_addr, log_type, int, const char *, int);
@@ -413,7 +413,11 @@
return;
enter_suid();
theInIcpConnection = comm_open(SOCK_DGRAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_UDP,
+#else
0,
+#endif
Config.Addrs.udp_incoming,
port,
COMM_NONBLOCKING,
@@ -434,7 +438,11 @@
if ((addr = Config.Addrs.udp_outgoing).s_addr != no_addr.s_addr) {
enter_suid();
theOutIcpConnection = comm_open(SOCK_DGRAM,
- 0,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_UDP,
+#else
+ 0,
+#endif
addr,
port,
COMM_NONBLOCKING,
@@ -564,3 +572,4 @@
return queried_keys[reqnum & N_QUERIED_KEYS_MASK];
return storeKeyPublic(url, METHOD_GET);
}
+#undef ICP_V2_C
\ No newline at end of file
Index: squid/src/icp_v3.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/icp_v3.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/icp_v3.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/icp_v3.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: icp_v3.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: icp_v3.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 12 Internet Cache Protocol
* AUTHOR: Duane Wessels
@@ -32,7 +32,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#define ICP_V3_C
#include "squid.h"
/* Currently Harvest cached-2.x uses ICP_VERSION_3 */
@@ -155,3 +155,4 @@
if (icp_request)
requestDestroy(icp_request);
}
+#undef ICP_V3_C
\ No newline at end of file
Index: squid/src/ident.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/ident.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/ident.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/ident.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: ident.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: ident.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 30 Ident (RFC 931)
* AUTHOR: Duane Wessels
@@ -32,7 +32,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#define IDENT_C
#include "squid.h"
#if USE_IDENT
@@ -140,7 +140,11 @@
int len = -1;
buf[0] = '\0';
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ len = recv(fd, buf, BUFSIZ - 1);
+#else
len = read(fd, buf, BUFSIZ - 1);
+#endif
fd_bytes(fd, len, FD_READ);
if (len <= 0) {
comm_close(fd);
@@ -204,7 +208,11 @@
return;
}
fd = comm_open(SOCK_STREAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_TCP,
+#else
0,
+#endif
me->sin_addr,
0,
COMM_NONBLOCKING,
@@ -242,3 +250,4 @@
}
#endif
+#undef IDENT_C
Index: squid/src/internal.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/internal.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/internal.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/internal.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: internal.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: internal.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 76 Internal Squid Object handling
* AUTHOR: Duane, Alex, Henrik
Index: squid/src/ipc.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/ipc.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/ipc.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/ipc.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: ipc.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: ipc.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 54 Interprocess Communication
* AUTHOR: Duane Wessels
@@ -35,6 +35,7 @@
#include "squid.h"
+#ifndef _SQUID_MSWIN_
static const char *hello_string = "hi there\n";
#define HELLO_BUF_SZ 32
static char hello_buf[HELLO_BUF_SZ];
@@ -84,26 +85,42 @@
*wfd = -1;
if (type == IPC_TCP_SOCKET) {
crfd = cwfd = comm_open(SOCK_STREAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_TCP,
+#else
0,
+#endif
local_addr,
0,
COMM_NOCLOEXEC,
name);
prfd = pwfd = comm_open(SOCK_STREAM,
- 0, /* protocol */
+#ifdef _SQUID_MSWIN_
+ IPPROTO_TCP, /* protocol */
+#else
+ 0, /* protocol */
+#endif
local_addr,
0, /* port */
0, /* blocking */
name);
} else if (type == IPC_UDP_SOCKET) {
crfd = cwfd = comm_open(SOCK_DGRAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_UDP,
+#else
0,
+#endif
local_addr,
0,
COMM_NOCLOEXEC,
name);
prfd = pwfd = comm_open(SOCK_DGRAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_UDP,
+#else
0,
+#endif
local_addr,
0,
0,
@@ -276,3 +293,4 @@
_exit(1);
return 0;
}
+#endif
\ No newline at end of file
Index: squid/src/ipcache.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/ipcache.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/ipcache.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/ipcache.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: ipcache.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: ipcache.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 14 IP Cache
* AUTHOR: Harvest Derived
Index: squid/src/leakfinder.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/leakfinder.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/leakfinder.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1
+++ squid/src/leakfinder.c 6 Jan 2001 12:40:14 -0000 1.1.1.1.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: leakfinder.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: leakfinder.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 45 Callback Data Registry
* AUTHOR: Duane Wessels
@@ -97,9 +97,15 @@
return p;
}
-void *
+
+void *
leakFree(void *p)
{
+#ifdef _SQUID_MSWIN_
+#if USE_LEAKFINDER
+ return p;
+#endif
+#endif
ptr *c = (ptr *) hash_lookup(htable, p);
assert(p);
assert(c != NULL);
Index: squid/src/main.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/main.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/main.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.2
+++ squid/src/main.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: main.c,v 1.1.1.3.4.2 2000/04/17 00:56:53 hno Exp $
+ * $Id: main.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 1 Startup and Main Loop
* AUTHOR: Harvest Derived
@@ -73,6 +73,24 @@
static void mainSetCwd(void);
static int checkRunningPid(void);
+#ifdef _SQUID_MSWIN_
+#include
+#include
+extern void Win32SockCleanup(void);
+static BOOL opt_install_service=FALSE;
+static BOOL opt_remove_service=FALSE;
+static BOOL eventrunning=FALSE;
+void InstallService(void);
+void RemoveService(void);
+static SERVICE_STATUS svcStatus;
+static SERVICE_STATUS_HANDLE svcHandle;
+#ifndef _DEBUG
+#define SERVICE
+#endif
+#else
+static void watch_child(char **);
+#endif
+
#if TEST_ACCESS
#include "test_access.c"
#endif
@@ -87,17 +105,27 @@
" -f file Use given config-file instead of\n"
" %s\n"
" -h Print help message.\n"
+#ifdef SERVICE
+ " -i Installs the " SQUID_SERVICE_NAME " service.\n"
+#endif
" -k reconfigure|rotate|shutdown|interrupt|kill|debug|check|parse\n"
" Parse configuration file, then send signal to \n"
" running copy (except -k parse) and exit.\n"
+#ifdef SERVICE
+ " -r Removes the " SQUID_SERVICE_NAME " service.\n"
+#endif
+#ifndef _SQUID_MSWIN_
" -s Enable logging to syslog.\n"
+#endif
" -u port Specify ICP port number (default: %d), disable with 0.\n"
" -v Print version.\n"
" -z Create swap directories\n"
" -C Do not catch fatal signals.\n"
" -D Disable initial DNS tests.\n"
" -F Don't serve any requests until store is rebuilt.\n"
+#ifndef _SQUID_MSWIN_
" -N No daemon mode.\n"
+#endif
" -R Do not set REUSEADDR on port.\n"
" -V Virtual host httpd-accelerator.\n"
" -X Force full debugging.\n"
@@ -109,10 +137,22 @@
static void
mainParseOptions(int argc, char *argv[])
{
+
+#ifdef _SQUID_MSWIN_
+ char *optarg;
+ char c;
+ int i=1;
+
+ while (i 1) {
debug(1, 1) ("Killing RunCache, pid %d\n", getppid());
@@ -272,6 +333,7 @@
signal(SIGTERM, SIG_DFL);
signal(SIGINT, SIG_DFL);
#endif
+#endif
}
static void
@@ -386,6 +448,7 @@
static void
setEffectiveUser(void)
{
+#ifndef _SQUID_MSWIN_
leave_suid(); /* Run as non privilegied user */
#ifdef _SQUID_OS2_
return;
@@ -397,6 +460,7 @@
debug(0, 0) ("'cache_effective_user' option in the config file.\n");
fatal("Don't run Squid as root, set 'cache_effective_user'!");
}
+#endif
}
static void
@@ -431,9 +495,13 @@
mainInitialize(void)
{
/* chroot if configured to run inside chroot */
+#ifndef _SQUID_MSWIN_
if (Config.chroot_dir && chroot(Config.chroot_dir)) {
fatal("failed to chroot");
}
+ Squid_MaxFD=SQUID_MAXFD;
+#endif
+ debug_log = stderr;
if (opt_catch_signals) {
squid_signal(SIGSEGV, death, SA_NODEFER | SA_RESETHAND);
squid_signal(SIGBUS, death, SA_NODEFER | SA_RESETHAND);
@@ -447,9 +515,10 @@
Config.Sockaddr.http->s.sin_port = htons(httpPortNumOverride);
if (icpPortNumOverride != 1)
Config.Port.icp = (u_short) icpPortNumOverride;
-
+#ifndef _DEBUG
_db_init(Config.Log.log, Config.debugOptions);
fd_open(fileno(debug_log), FD_LOG, Config.Log.log);
+#endif
#if MEM_GEN_TRACE
log_trace_init("/tmp/squid.alloc");
#endif
@@ -545,19 +614,111 @@
configured_once = 1;
}
+#ifdef SERVICE
+VOID WINAPI svcHandler (DWORD Opcode)
+{
+ DWORD status;
+
+ switch(Opcode)
+ {
+ case SERVICE_CONTROL_STOP:
+ case SERVICE_CONTROL_SHUTDOWN:
+ // Do whatever it takes to stop here.
+ svcStatus.dwWin32ExitCode = 0;
+ svcStatus.dwCurrentState = SERVICE_STOP_PENDING;
+ svcStatus.dwCheckPoint = 0;
+ svcStatus.dwWaitHint = 10000;
+ shut_down(SIGTERM);
+ if (!SetServiceStatus (svcHandle, &svcStatus))
+ {
+ status = GetLastError();
+ debug(1,1)(" SetServiceStatus error %ld\n",status);
+ }
+ debug(1,1)("Leaving Squid service \n");
+ return;
+ case SERVICE_CONTROL_INTERROGATE:
+ // Fall through to send current status.
+ if (!SetServiceStatus (svcHandle, &svcStatus))
+ {
+ status = GetLastError();
+ debug(1,1)(" SetServiceStatus error %ld\n",status);
+ }
+ break;
+ case SQUID_SERVICE_CONTROL_ROTATE:
+ rotate_logs(SIGUSR1);
+ break;
+ case SQUID_SERVICE_CONTROL_RECONFIGURE:
+ reconfigure(SIGHUP);
+ break;
+ case SQUID_SERVICE_CONTROL_DEBUG:
+ sigusr2_handle(SIGUSR2);
+ break;
+ case SQUID_SERVICE_CONTROL_INTERRUPT:
+ // Do whatever it takes to stop here.
+ svcStatus.dwWin32ExitCode = 0;
+ svcStatus.dwCurrentState = SERVICE_STOP_PENDING;
+ svcStatus.dwCheckPoint = 0;
+ svcStatus.dwWaitHint = 10000;
+ shut_down(SIGINT);
+ if (!SetServiceStatus (svcHandle, &svcStatus))
+ {
+ status = GetLastError();
+ debug(1,1)(" SetServiceStatus error %ld\n",status);
+ }
+ debug(1,1)("Leaving Squid service \n");
+ break;
+
+ default:
+ debug(1,1)("Unrecognized opcode %ld\n", Opcode);
+ }
+ return;
+}
+
+void WINAPI SquidMain(DWORD argc, char **argv)
+
+#else
int
main(int argc, char **argv)
+#endif
{
int errcount = 0;
int n; /* # of GC'd objects */
time_t loop_delay;
mode_t oldmask;
-
- debug_log = stderr;
+#ifdef _DEBUG
+ debug_log=stderr;
+#endif
+#ifdef SERVICE
+ TCHAR path[512];
+ if (argc==1){
+ svcHandle=RegisterServiceCtrlHandler( SQUID_SERVICE_NAME, svcHandler);
+ if(svcHandle==0) return;
+ }
+ GetModuleFileName(NULL, path, 512);
+ _strset(path+strlen(path)-9,0);
+ if (SetCurrentDirectory(path)==0) return;
+ strcat(path, "\\");
+ strcat(path, DefaultConfigFile);
+ xfree(ConfigFile);
+ ConfigFile = xstrdup(path);
+ if (argc==1){
+ svcStatus.dwServiceType=SERVICE_WIN32_OWN_PROCESS;
+ svcStatus.dwCurrentState=SERVICE_START_PENDING;
+ svcStatus.dwControlsAccepted=SERVICE_ACCEPT_STOP |SERVICE_ACCEPT_SHUTDOWN;
+ svcStatus.dwWin32ExitCode=0;
+ svcStatus.dwServiceSpecificExitCode=0;
+ svcStatus.dwCheckPoint=0;
+ svcStatus.dwWaitHint=10000;
+ SetServiceStatus( svcHandle,&svcStatus);
+ }
+#endif
+#ifndef _SQUID_MSWIN_
if (FD_SETSIZE < Squid_MaxFD)
Squid_MaxFD = FD_SETSIZE;
-
- /* call mallopt() before anything else */
+#else
+ Squid_MaxFD = 20*SQUID_MAXFD;
+#endif
+ /* call mallopt() before anything else */
#if HAVE_MALLOPT
#ifdef M_GRAIN
/* Round up all sizes to a multiple of this */
@@ -579,9 +740,11 @@
* set. Unfortunately, there is no way to get the current
* umask value without setting it.
*/
+#ifndef _SQUID_MSWIN_
oldmask = umask(S_IRWXO);
if (oldmask)
umask(oldmask);
+#endif
memset(&local_addr, '\0', sizeof(struct in_addr));
safe_inet_addr(localhost, &local_addr);
@@ -595,8 +758,25 @@
squid_start = current_time;
failure_notify = fatal_dump;
+#ifdef SERVICE
+ if (argc==1){
+ svcStatus.dwCheckPoint++;
+ SetServiceStatus( svcHandle,&svcStatus);
+ }
+#endif
+
mainParseOptions(argc, argv);
+#ifdef SERVICE
+ if(opt_install_service) {
+ InstallService();
+ return;
+ }
+ if(opt_remove_service) {
+ RemoveService();
+ return;
+ }
+#endif
/* parse configuration file
* note: in "normal" case this used to be called from mainInitialize() */
{
@@ -610,14 +790,23 @@
#endif
memInit(); /* memInit is required for config parsing */
eventInit(); /* eventInit() is required for config parsing */
+#ifdef _SQUID_MSWIN_
+ Win32SockInit();
+#endif
parse_err = parseConfigFile(ConfigFile);
if (opt_parse_cfg_only)
- return parse_err;
+#ifdef SERVICE
+ return ;
+#else
+ return parse_err;
+#endif
}
+#ifndef _SQUID_MSWIN_
if (-1 == opt_send_signal)
if (checkRunningPid())
exit(1);
+#endif
#if TEST_ACCESS
comm_init();
@@ -630,22 +819,31 @@
/* send signal to running copy and exit */
if (opt_send_signal != -1) {
/* chroot if configured to run inside chroot */
+#ifndef _SQUID_MSWIN_
if (Config.chroot_dir && chroot(Config.chroot_dir)) {
fatal("failed to chroot");
}
+#endif
sendSignal();
/* NOTREACHED */
}
if (opt_create_swap_dirs) {
+#ifndef _SQUID_MSWIN_
/* chroot if configured to run inside chroot */
if (Config.chroot_dir && chroot(Config.chroot_dir)) {
fatal("failed to chroot");
}
setEffectiveUser();
+#endif
debug(0, 0) ("Creating Swap Directories\n");
storeCreateSwapDirectories();
+#ifndef SERVICE
return 0;
+#else
+ return;
+#endif
}
+#ifndef _SQUID_MSWIN_
if (!opt_no_daemon)
watch_child(argv);
setMaxFD();
@@ -653,18 +851,45 @@
if (opt_catch_signals)
for (n = Squid_MaxFD; n > 2; n--)
close(n);
+#endif
/* init comm module */
comm_init();
comm_select_init();
+#ifndef SERVICE
+
if (opt_no_daemon) {
/* we have to init fdstat here. */
fd_open(0, FD_LOG, "stdin");
fd_open(1, FD_LOG, "stdout");
fd_open(2, FD_LOG, "stderr");
}
- mainInitialize();
+#else
+ svcStatus.dwCheckPoint++;
+ SetServiceStatus( svcHandle,&svcStatus);
+#endif
+#ifdef _SQUID_MSWIN_
+#ifdef _DEBUG
+ for (n=0;n 1) {
+#ifndef _SQUID_MSWIN_
if (kill(pid, opt_send_signal) &&
/* ignore permissions if just running check */
!(opt_send_signal == 0 && errno == EPERM)) {
@@ -737,6 +990,85 @@
opt_send_signal, (int) pid, xstrerror());
exit(1);
}
+#else
+ schSCManager = OpenSCManager(
+ NULL, // machine (NULL == local)
+ NULL, // database (NULL == default)
+ SC_MANAGER_ALL_ACCESS // access required
+ );
+ if (!schSCManager)
+ {
+ debug(1,1)("OpenSCManager failed");
+ exit(1);
+ }
+ // The required service object access depends on the control.
+ switch (opt_send_signal)
+ {
+ case 0: // SIGNULL
+ fdwAccess = SERVICE_INTERROGATE;
+ fdwControl = SERVICE_CONTROL_INTERROGATE;
+ break;
+ case SIGUSR1:
+ fdwAccess = SERVICE_USER_DEFINED_CONTROL;
+ fdwControl = SQUID_SERVICE_CONTROL_ROTATE;
+ break;
+ case SIGUSR2:
+ fdwAccess = SERVICE_USER_DEFINED_CONTROL;
+ fdwControl = SQUID_SERVICE_CONTROL_DEBUG;
+ break;
+ case SIGHUP:
+ fdwAccess = SERVICE_USER_DEFINED_CONTROL;
+ fdwControl = SQUID_SERVICE_CONTROL_RECONFIGURE;
+ break;
+ case SIGTERM:
+ fdwAccess = SERVICE_STOP;
+ fdwControl = SERVICE_CONTROL_STOP;
+ break;
+ case SIGINT:
+ case SIGKILL:
+ fdwAccess = SERVICE_USER_DEFINED_CONTROL;
+ fdwControl = SQUID_SERVICE_CONTROL_INTERRUPT;
+ break;
+ default:
+ exit(1);
+ }
+ // Open a handle to the service.
+ schService = OpenService(
+ schSCManager, // SCManager database
+ SQUID_SERVICE_NAME, // name of service
+ fdwAccess); // specify access
+ if (schService == NULL)
+ {
+ fprintf(stderr, "%s: ERROR: Could not open Service %s\n", appname, SQUID_SERVICE_NAME);
+ exit(1);
+ }
+ else
+ {
+ // Send a control value to the service.
+ if (! ControlService(
+ schService, // handle of service
+ fdwControl, // control value to send
+ &ssStatus) ) // address of status info
+ {
+ fprintf(stderr, "%s: ERROR: Could not Control Service %s\n", appname, SQUID_SERVICE_NAME);
+ exit(1);
+ }
+ else
+ {
+ // Print the service status.
+ printf("\nStatus of %s Service:\n", SQUID_SERVICE_NAME);
+ printf(" Service Type: 0x%x\n", ssStatus.dwServiceType);
+ printf(" Current State: 0x%x\n", ssStatus.dwCurrentState);
+ printf(" Controls Accepted: 0x%x\n", ssStatus.dwControlsAccepted);
+ printf(" Exit Code: %d\n", ssStatus.dwWin32ExitCode);
+ printf(" Service Specific Exit Code: %d\n", ssStatus.dwServiceSpecificExitCode);
+ printf(" Check Point: %d\n", ssStatus.dwCheckPoint);
+ printf(" Wait Hint: %d\n", ssStatus.dwWaitHint);
+ }
+ CloseServiceHandle(schService);
+ }
+ CloseServiceHandle(schSCManager);
+#endif
} else {
fprintf(stderr, "%s: ERROR: No running copy\n", appname);
exit(1);
@@ -745,6 +1077,7 @@
exit(0);
}
+#ifndef _SQUID_MSWIN_
static int
checkRunningPid(void)
{
@@ -838,10 +1171,17 @@
}
/* NOTREACHED */
}
+#endif
static void
SquidShutdown(void *unused)
{
+#ifdef SERVICE
+ const char a[2][20]={"squid","stopped"};
+
+ svcStatus.dwCheckPoint++;
+ SetServiceStatus( svcHandle,&svcStatus);
+#endif
debug(1, 1) ("Shutting down...\n");
if (Config.pidFilename && strcmp(Config.pidFilename, "none")) {
enter_suid();
@@ -911,5 +1251,28 @@
version_string);
if (debug_log)
fclose(debug_log);
+#ifdef _SQUID_MSWIN_
+ Win32SockCleanup();
+#endif
+#ifdef SERVICE
+ svcStatus.dwCurrentState=SERVICE_STOPPED;
+ SetServiceStatus( svcHandle,&svcStatus);
+ ReportEvent(RegisterEventSource(NULL,NULL),EVENTLOG_INFORMATION_TYPE,0,1,NULL,1,0,(const char**)a,NULL);
+#endif
exit(0);
}
+
+#ifdef SERVICE
+#include
+VOID main(int argc, char **argv) {
+ SERVICE_TABLE_ENTRY DispatchTable[] = {
+ { SQUID_SERVICE_NAME, SquidMain },
+ { NULL, NULL }
+ };
+ if (argc>1) SquidMain(argc, argv);
+ else
+ if (!StartServiceCtrlDispatcher( DispatchTable))
+ _cprintf(" StartServiceCtrlDispatcher error = %d\n", GetLastError());
+}
+#endif
+
Index: squid/src/mem.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/mem.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/mem.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/mem.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: mem.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: mem.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 13 High Level Memory Pool Management
* AUTHOR: Harvest Derived
Index: squid/src/mib.txt
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/mib.txt,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/mib.txt 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/mib.txt 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.1.2.1
@@ -2,7 +2,7 @@
DEFINITIONS ::= BEGIN
--
--- $Id: mib.txt,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+-- $Id: mib.txt,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
--
IMPORTS
Index: squid/src/mime.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/mime.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/mime.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/mime.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: mime.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: mime.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 25 MIME Parsing
* AUTHOR: Harvest Derived
Index: squid/src/mk-string-arrays.pl
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/mk-string-arrays.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/src/mk-string-arrays.pl 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/src/mk-string-arrays.pl 6 Jan 2001 12:40:14 -0000 1.1.1.1.44.1
@@ -1,5 +1,5 @@
#******************************************************************************
-# $Id: mk-string-arrays.pl,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+# $Id: mk-string-arrays.pl,v 1.1.1.1.44.1 2001/01/06 12:40:14 hno Exp $
#
# File: mk-strs.pl
#
Index: squid/src/multicast.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/multicast.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/multicast.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1
+++ squid/src/multicast.c 6 Jan 2001 12:40:14 -0000 1.1.1.1.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: multicast.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: multicast.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 7 Multicast
* AUTHOR: Martin Hamilton
Index: squid/src/neighbors.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/neighbors.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/neighbors.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/neighbors.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: neighbors.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: neighbors.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 15 Neighbor Routines
* AUTHOR: Harvest Derived
@@ -988,8 +988,13 @@
{
peer *p = data;
int fd;
+#ifdef _SQUID_MSWIN_
+ fd = comm_open(SOCK_STREAM, IPPROTO_TCP, Config.Addrs.tcp_outgoing,
+ 0, COMM_NONBLOCKING, p->host);
+#else
fd = comm_open(SOCK_STREAM, 0, Config.Addrs.tcp_outgoing,
0, COMM_NONBLOCKING, p->host);
+#endif
if (fd < 0)
return;
p->test_fd = fd;
Index: squid/src/net_db.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/net_db.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/net_db.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/net_db.c 6 Jan 2001 12:40:14 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: net_db.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: net_db.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:14 hno Exp $
*
* DEBUG: section 38 Network Measurement Database
* AUTHOR: Duane Wessels
Index: squid/src/pconn.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/pconn.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/pconn.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1
+++ squid/src/pconn.c 6 Jan 2001 12:40:15 -0000 1.1.1.2.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: pconn.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: pconn.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:15 hno Exp $
*
* DEBUG: section 48 Persistent Connections
* AUTHOR: Duane Wessels
@@ -32,7 +32,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#define PCONN_C
#include "squid.h"
struct _pconn {
@@ -120,7 +120,11 @@
int n;
assert(table != NULL);
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ n = recv(fd, buf, 256);
+#else
n = read(fd, buf, 256);
+#endif
debug(48, 3) ("pconnRead: %d bytes from FD %d, %s\n", n, fd, p->key);
pconnRemoveFD(p, fd);
comm_close(fd);
@@ -244,3 +248,4 @@
else
assert(0);
}
+#undef PCONN_C
\ No newline at end of file
Index: squid/src/peer_digest.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/peer_digest.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/peer_digest.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/peer_digest.c 6 Jan 2001 12:40:15 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: peer_digest.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: peer_digest.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:15 hno Exp $
*
* DEBUG: section 72 Peer Digest Routines
* AUTHOR: Alex Rousskov
Index: squid/src/peer_select.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/peer_select.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/peer_select.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/peer_select.c 6 Jan 2001 12:40:15 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: peer_select.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: peer_select.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:15 hno Exp $
*
* DEBUG: section 44 Peer Selection Algorithm
* AUTHOR: Duane Wessels
Index: squid/src/pinger.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/pinger.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/pinger.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/pinger.c 6 Jan 2001 12:40:15 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: pinger.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: pinger.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:15 hno Exp $
*
* DEBUG: section 42 ICMP Pinger program
* AUTHOR: Duane Wessels
Index: squid/src/protos.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/protos.h,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/protos.h 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/protos.h 6 Jan 2001 12:40:15 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: protos.h,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: protos.h,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:15 hno Exp $
*
*
* SQUID Internet Object Cache http://squid.nlanr.net/Squid/
@@ -167,6 +167,9 @@
extern void commCallCloseHandlers(int fd);
extern int commSetTimeout(int fd, int, PF *, void *);
extern void commSetDefer(int fd, DEFER * func, void *);
+#ifdef _SQUID_MSWIN_
+extern int WSAignoreErrno(int);
+#endif
extern int ignoreErrno(int);
extern void commCloseAllSockets(void);
@@ -180,6 +183,10 @@
#else
extern int comm_select(int);
#endif
+#ifdef _SQUID_MSWIN_
+extern void commUpdateReadBitsS(int, PF *);
+extern void commUpdateWriteBitsS(int, PF *);
+#endif
extern void commUpdateReadBits(int, PF *);
extern void commUpdateWriteBits(int, PF *);
Index: squid/src/pump.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/pump.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/pump.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/pump.c 6 Jan 2001 12:40:15 -0000 1.1.1.3.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: pump.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: pump.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:15 hno Exp $
*
* DEBUG: section 61 PUMP handler
* AUTHOR: Kostas Anagnostakis
@@ -32,6 +32,7 @@
*
*/
+#define PUMP_C
#include "squid.h"
#define PUMP_MAXBUFFER 2*SQUID_UDP_SO_SNDBUF
@@ -240,7 +241,11 @@
int len = 0;
errno = 0;
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ len = recv(fd, buf, bytes_to_read);
+#else
len = read(fd, buf, bytes_to_read);
+#endif
fd_bytes(fd, len, FD_READ);
debug(61, 5) ("pumpReadFromClient: FD %d: len %d.\n", fd, len);
if (len > 0) {
@@ -435,3 +440,4 @@
debug(61, 3) ("pumpRestart: YES!\n");
return 1;
}
+#undef PUMP_C
Index: squid/src/recv-announce.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/recv-announce.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/recv-announce.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1
+++ squid/src/recv-announce.c 6 Jan 2001 12:40:15 -0000 1.1.1.1.4.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Id: recv-announce.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: recv-announce.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:15 hno Exp $
*
* DEBUG: section 0 Announcement Server
* AUTHOR: Harvest Derived
Index: squid/src/redirect.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/redirect.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/redirect.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.2
+++ squid/src/redirect.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: redirect.c,v 1.1.1.3.4.2 2000/04/17 00:56:53 hno Exp $
+ * $Id: redirect.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 29 Redirector
* AUTHOR: Duane Wessels
Index: squid/src/refresh.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/refresh.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/refresh.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/refresh.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Id: refresh.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: refresh.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 22 Refresh Calculation
* AUTHOR: Harvest Derived
Index: squid/src/send-announce.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/send-announce.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/send-announce.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/send-announce.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: send-announce.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: send-announce.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 27 Cache Announcer
* AUTHOR: Duane Wessels
Index: squid/src/snmp_agent.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/snmp_agent.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/snmp_agent.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/snmp_agent.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: snmp_agent.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: snmp_agent.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 49 SNMP Interface
* AUTHOR: Kostas Anagnostakis
Index: squid/src/snmp_core.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/snmp_core.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/snmp_core.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/snmp_core.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: snmp_core.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: snmp_core.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 49 SNMP support
* AUTHOR: Glenn Chisholm
Index: squid/src/squid.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/squid.h,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/squid.h 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/squid.h 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: squid.h,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: squid.h,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* AUTHOR: Duane Wessels
*
@@ -194,7 +194,9 @@
#include
#define NAMLEN(dirent) strlen((dirent)->d_name)
#else /* HAVE_DIRENT_H */
+#ifndef _SQUID_MSWIN_
#define dirent direct
+#endif
#define NAMLEN(dirent) (dirent)->d_namlen
#if HAVE_SYS_NDIR_H
#include
@@ -322,8 +324,10 @@
#else
#define leakAdd(p) p
#define leakTouch(p) p
+#ifndef _SQUID_MSWIN_
#define leakFree(p) p
#endif
+#endif
#if defined(_SQUID_NEXT_) && !defined(S_ISDIR)
#define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR))
@@ -341,6 +345,10 @@
#define USE_UNLINKD 1
#endif
+#ifdef _SQUID_MSWIN_
+#undef USE_UNLINKD
+#endif
+
#include "md5.h"
#include "Stack.h"
@@ -424,4 +432,13 @@
#define SWAP_DIR_SHIFT 24
#define SWAP_FILE_MASK 0x00FFFFFF
+#ifdef _SQUID_MSWIN_
+#define SQUID_SERVICE_CONTROL_ROTATE 128
+#define SQUID_SERVICE_CONTROL_RECONFIGURE 129
+#define SQUID_SERVICE_CONTROL_DEBUG 130
+#define SQUID_SERVICE_CONTROL_INTERRUPT 131
+#define SQUID_SERVICE_NAME "SquidNT2.3Stable4 beta"
+#include "psapi.h"
+#endif
+
#endif /* SQUID_H */
Index: squid/src/ssl.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/ssl.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/ssl.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/ssl.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: ssl.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: ssl.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 26 Secure Sockets Layer Proxy
* AUTHOR: Duane Wessels
@@ -32,7 +32,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#define SSL_C
#include "squid.h"
typedef struct {
@@ -199,7 +199,11 @@
read_sz = delayBytesWanted(sslState->delay_id, 1, read_sz);
#endif
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ len = recv(fd, sslState->server.buf + sslState->server.len, read_sz);
+#else
len = read(fd, sslState->server.buf + sslState->server.len, read_sz);
+#endif
debug(26, 3) ("sslReadServer: FD %d, read %d bytes\n", fd, len);
if (len > 0) {
fd_bytes(fd, len, FD_READ);
@@ -235,9 +239,13 @@
fd, SQUID_TCP_SO_RCVBUF - sslState->client.len,
sslState->client.len);
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ len = recv(fd, sslState->client.buf + sslState->client.len, SQUID_TCP_SO_RCVBUF - sslState->client.len);
+#else
len = read(fd,
sslState->client.buf + sslState->client.len,
SQUID_TCP_SO_RCVBUF - sslState->client.len);
+#endif
debug(26, 3) ("sslReadClient: FD %d, read %d bytes\n", fd, len);
if (len > 0) {
fd_bytes(fd, len, FD_READ);
@@ -246,8 +254,13 @@
}
cbdataLock(sslState);
if (len < 0) {
+#ifdef _SQUID_MSWIN_
+ debug(50, WSAECONNRESET == WSAGetLastError() ? 3 : 1) ("sslReadClient: FD %d: read failure: %s\n",
+ fd, xstrerror());
+#else
debug(50, ECONNRESET == errno ? 3 : 1) ("sslReadClient: FD %d: read failure: %s\n",
fd, xstrerror());
+#endif
if (!ignoreErrno(errno))
comm_close(fd);
} else if (len == 0) {
@@ -268,9 +281,13 @@
debug(26, 3) ("sslWriteServer: FD %d, %d bytes to write\n",
fd, sslState->client.len);
Counter.syscalls.sock.writes++;
+#ifdef _SQUID_MSWIN_
+ len = send(fd,sslState->client.buf,sslState->client.len);
+#else
len = write(fd,
sslState->client.buf,
sslState->client.len);
+#endif
debug(26, 3) ("sslWriteServer: FD %d, %d bytes written\n", fd, len);
if (len > 0) {
fd_bytes(fd, len, FD_WRITE);
@@ -307,9 +324,13 @@
debug(26, 3) ("sslWriteClient: FD %d, %d bytes to write\n",
fd, sslState->server.len);
Counter.syscalls.sock.writes++;
- len = write(fd,
+#ifdef _SQUID_MSWIN_
+ len = send(fd, sslState->server.buf, sslState->server.len);
+#else
+ len = write(fd,
sslState->server.buf,
sslState->server.len);
+#endif
debug(26, 3) ("sslWriteClient: FD %d, %d bytes written\n", fd, len);
if (len > 0) {
fd_bytes(fd, len, FD_WRITE);
@@ -422,7 +443,11 @@
Counter.server.other.requests++;
/* Create socket. */
sock = comm_open(SOCK_STREAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_TCP,
+#else
0,
+#endif
Config.Addrs.tcp_outgoing,
0,
COMM_NONBLOCKING,
@@ -555,3 +580,4 @@
sslConnectDone,
sslState);
}
+#undef SSL_C
\ No newline at end of file
Index: squid/src/stat.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/stat.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/stat.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/stat.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: stat.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: stat.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 18 Cache Manager Statistics
* AUTHOR: Harvest Derived
Index: squid/src/stmem.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/stmem.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/stmem.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1
+++ squid/src/stmem.c 6 Jan 2001 12:40:16 -0000 1.1.1.2.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: stmem.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: stmem.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 19 Store Memory Primitives
* AUTHOR: Harvest Derived
Index: squid/src/store.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store.c,v
retrieving revision 1.1.1.3.4.5
retrieving revision 1.1.1.3.4.5.2.1
diff -u -r1.1.1.3.4.5 -r1.1.1.3.4.5.2.1
--- squid/src/store.c 1 Aug 2000 00:14:35 -0000 1.1.1.3.4.5
+++ squid/src/store.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.5.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store.c,v 1.1.1.3.4.5 2000/08/01 00:14:35 hno Exp $
+ * $Id: store.c,v 1.1.1.3.4.5.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 20 Storage Manager
* AUTHOR: Harvest Derived
Index: squid/src/store_client.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_client.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/store_client.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.2
+++ squid/src/store_client.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store_client.c,v 1.1.1.3.4.2 2000/04/17 00:56:53 hno Exp $
+ * $Id: store_client.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 20 Storage Manager Client-Side Interface
* AUTHOR: Duane Wessels
Index: squid/src/store_digest.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_digest.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/store_digest.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/store_digest.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: store_digest.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: store_digest.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 71 Store Digest Manager
* AUTHOR: Alex Rousskov
Index: squid/src/store_dir.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_dir.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/store_dir.c 22 May 2000 11:07:55 -0000 1.1.1.3.4.2
+++ squid/src/store_dir.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store_dir.c,v 1.1.1.3.4.2 2000/05/22 11:07:55 hno Exp $
+ * $Id: store_dir.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 47 Store Directory Routines
* AUTHOR: Duane Wessels
@@ -32,7 +32,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#define STORE_DIR_C
#include "squid.h"
const char *SwapDirType[] =
@@ -60,12 +60,15 @@
pid_t pid;
int status;
for (i = 0; i < Config.cacheSwap.n_configured; i++) {
+#ifndef _SQUID_MSWIN_
if (fork())
continue;
+#endif
sd = &Config.cacheSwap.swapDirs[i];
sd->newfs(sd);
exit(0);
}
+#ifndef _SQUID_MSWIN_
do {
#ifdef _SQUID_NEXT_
pid = wait3(&status, WNOHANG, NULL);
@@ -73,6 +76,7 @@
pid = waitpid(-1, &status, 0);
#endif
} while (pid > 0 || (pid < 0 && errno == EINTR));
+#endif
}
/*
@@ -447,3 +451,4 @@
return n;
}
#undef CLEAN_BUF_SZ
+#undef STORE_DIR_C
\ No newline at end of file
Index: squid/src/store_dir_ufs.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/store_dir_ufs.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/store_dir_ufs.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1
+++ squid/src/store_dir_ufs.c 6 Jan 2001 12:40:16 -0000 1.1.1.1.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store_dir_ufs.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: store_dir_ufs.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 47 Store Directory Routines
* AUTHOR: Duane Wessels
@@ -127,7 +127,11 @@
} else {
fatalf("Swap directory %s is not a directory.", path);
}
+#ifdef _SQUID_MSWIN_
+ } else if (0 != CreateDirectory(path,NULL)) {
+#else
} else if (0 == mkdir(path, 0755)) {
+#endif
debug(20, should_exist ? 1 : 3) ("%s created\n", path);
created = 1;
} else {
@@ -313,6 +317,9 @@
debug(20, 9) ("file_in: fd=%d %08X\n", fd, sfileno);
Counter.syscalls.disk.reads++;
if (read(fd, hdr_buf, DISK_PAGE_SIZE) < 0) {
+#ifdef _SQUID_MSWIN_
+ fd_table[fd].fbuf=NULL;
+#endif
debug(20, 1) ("storeRebuildFromDirectory: read(FD %d): %s\n",
fd, xstrerror());
file_close(fd);
@@ -740,6 +747,12 @@
fatal("storeUfsDirCloseTmpSwapLog: unlink failed");
}
#endif
+#ifdef _SQUID_MSWIN_
+ if (unlink(swaplog_path) < 0) {
+ debug(50, 0) ("%s: %s\n", swaplog_path, xstrerror());
+ fatal("storeUfsDirCloseTmpSwapLog: unlink failed");
+ }
+#endif
if (xrename(new_path, swaplog_path) < 0) {
fatal("storeUfsDirCloseTmpSwapLog: rename failed");
}
@@ -783,7 +796,11 @@
}
sd->u.ufs.swaplog_fd = fd;
/* open a read-only stream of the old log */
+#ifdef _SQUID_MSWIN_
+ fp = fopen(swaplog_path, "rb");
+#else
fp = fopen(swaplog_path, "r");
+#endif
if (fp == NULL) {
debug(50, 0) ("%s: %s\n", swaplog_path, xstrerror());
fatal("Failed to open swap log for reading");
@@ -891,10 +908,19 @@
static void
storeUfsDirWriteCleanClose(SwapDir * sd)
{
+#ifdef _SQUID_MSWIN_
+ FILE *fbuf;
+#endif
struct _clean_state *state = sd->log.clean.state;
if (state->fd < 0)
return;
+#ifdef _SQUID_MSWIN_
+ fbuf=fd_table[state->fd].fbuf;
+ fwrite(state->outbuf, 1, state->outbuf_offset, fbuf);
+ if (ferror(fbuf) || feof(fbuf)){
+#else
if (write(state->fd, state->outbuf, state->outbuf_offset) < 0) {
+#endif
debug(50, 0) ("storeDirWriteCleanLogs: %s: write: %s\n",
state->new, xstrerror());
debug(20, 0) ("storeDirWriteCleanLogs: Current swap logfile "
@@ -918,6 +944,13 @@
debug(50, 0) ("storeDirWriteCleanLogs: unlinkd failed: %s, %s\n",
xstrerror(), cur);
#endif
+#ifdef _SQUID_MSWIN_
+ file_close(state->fd);
+ state->fd = -1;
+ if (unlink(state->cur) < 0)
+ debug(50, 0) ("storeDirWriteCleanLogs: unlinkd failed: %s, %s\n",
+ xstrerror(), state->cur);
+#endif
xrename(state->new, state->cur);
}
/* touch a timestamp file if we're not still validating */
@@ -1008,7 +1041,11 @@
if (dp == NULL) {
if (errno == ENOENT) {
debug(36, 0) ("storeDirClean: WARNING: Creating %s\n", p1);
+#ifdef _SQUID_MSWIN_
+ if (CreateDirectory(p1, NULL) == 0)
+#else
if (mkdir(p1, 0777) == 0)
+#endif
return 0;
}
debug(50, 0) ("storeDirClean: %s: %s\n", p1, xstrerror());
Index: squid/src/store_heap_replacement.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/store_heap_replacement.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/store_heap_replacement.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1
+++ squid/src/store_heap_replacement.c 6 Jan 2001 12:40:16 -0000 1.1.1.1.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store_heap_replacement.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: store_heap_replacement.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 20 Storage Manager Heap-based replacement
* AUTHOR: John Dilley
Index: squid/src/store_io.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_io.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.20.1
diff -u -r1.1.1.1 -r1.1.1.1.20.1
--- squid/src/store_io.c 26 Jan 2000 03:25:01 -0000 1.1.1.1
+++ squid/src/store_io.c 6 Jan 2001 12:40:16 -0000 1.1.1.1.20.1
@@ -1,7 +1,6 @@
+#define STORE_IO_C
#include "squid.h"
-
-
storeIOState *
storeOpen(sfileno f, mode_t mode, STIOCB * callback, void *callback_data)
{
@@ -46,3 +45,4 @@
{
return sio->offset;
}
+#undef STORE_IO_C
Index: squid/src/store_io_ufs.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/store_io_ufs.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/store_io_ufs.c 17 Apr 2000 00:56:53 -0000 1.1.1.1.4.1
+++ squid/src/store_io_ufs.c 6 Jan 2001 12:40:16 -0000 1.1.1.1.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store_io_ufs.c,v 1.1.1.1.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: store_io_ufs.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 79 Storage Manager UFS Interface
* AUTHOR: Duane Wessels
Index: squid/src/store_key_md5.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_key_md5.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/store_key_md5.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/store_key_md5.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store_key_md5.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: store_key_md5.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 20 Storage Manager MD5 Cache Keys
* AUTHOR: Duane Wessels
Index: squid/src/store_log.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_log.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/store_log.c 17 Apr 2000 00:56:53 -0000 1.1.1.2.4.1
+++ squid/src/store_log.c 6 Jan 2001 12:40:16 -0000 1.1.1.2.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store_log.c,v 1.1.1.2.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: store_log.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 20 Storage Manager Logging Functions
* AUTHOR: Duane Wessels
Index: squid/src/store_rebuild.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_rebuild.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/store_rebuild.c 17 Apr 2000 00:56:53 -0000 1.1.1.3.4.1
+++ squid/src/store_rebuild.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store_rebuild.c,v 1.1.1.3.4.1 2000/04/17 00:56:53 hno Exp $
+ * $Id: store_rebuild.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 20 Store Rebuild Routines
* AUTHOR: Duane Wessels
@@ -42,6 +42,7 @@
static int
storeCleanupDoubleCheck(const StoreEntry * e)
{
+#ifndef _SQUID_MSWIN_
/* XXX too UFS specific */
struct stat sb;
int dirn = e->swap_file_number >> SWAP_DIR_SHIFT;
@@ -69,6 +70,7 @@
storeEntryDump(e, 0);
return -1;
}
+#endif
return 0;
}
Index: squid/src/store_swapin.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_swapin.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/store_swapin.c 17 Apr 2000 00:56:54 -0000 1.1.1.3.4.1
+++ squid/src/store_swapin.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store_swapin.c,v 1.1.1.3.4.1 2000/04/17 00:56:54 hno Exp $
+ * $Id: store_swapin.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 20 Storage Manager Swapin Functions
* AUTHOR: Duane Wessels
Index: squid/src/store_swapmeta.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_swapmeta.c,v
retrieving revision 1.1.1.2.4.2
retrieving revision 1.1.1.2.4.2.2.1
diff -u -r1.1.1.2.4.2 -r1.1.1.2.4.2.2.1
--- squid/src/store_swapmeta.c 1 Aug 2000 00:05:19 -0000 1.1.1.2.4.2
+++ squid/src/store_swapmeta.c 6 Jan 2001 12:40:16 -0000 1.1.1.2.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store_swapmeta.c,v 1.1.1.2.4.2 2000/08/01 00:05:19 hno Exp $
+ * $Id: store_swapmeta.c,v 1.1.1.2.4.2.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 20 Storage Manager Swapfile Metadata
* AUTHOR: Kostas Anagnostakis
Index: squid/src/store_swapout.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/store_swapout.c,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/store_swapout.c 17 Apr 2000 00:56:54 -0000 1.1.1.3.4.2
+++ squid/src/store_swapout.c 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: store_swapout.c,v 1.1.1.3.4.2 2000/04/17 00:56:54 hno Exp $
+ * $Id: store_swapout.c,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:16 hno Exp $
*
* DEBUG: section 20 Storage Manager Swapout Functions
* AUTHOR: Duane Wessels
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.1.1.3.4.2
retrieving revision 1.1.1.3.4.2.2.1
diff -u -r1.1.1.3.4.2 -r1.1.1.3.4.2.2.1
--- squid/src/structs.h 17 Apr 2000 00:56:54 -0000 1.1.1.3.4.2
+++ squid/src/structs.h 6 Jan 2001 12:40:16 -0000 1.1.1.3.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: structs.h,v 1.1.1.3.4.2 2000/04/17 00:56:54 hno Exp $
+ * $Id: structs.h,v 1.1.1.3.4.2.2.1 2001/01/06 12:40:16 hno Exp $
*
*
* SQUID Internet Object Cache http://squid.nlanr.net/Squid/
@@ -562,11 +562,54 @@
const char *str; /* quoted-string */
int weak; /* true if it is a weak validator */
};
+#ifdef _SQUID_MSWIN_
+struct _sde {
+ unsigned int type;
+ u_short local_port;
+ u_short remote_port;
+ char ipaddr[16]; /* dotted decimal address of peer */
+ char desc[FD_DESC_SZ];
+ struct {
+ unsigned int open:1;
+ unsigned int close_request:1;
+ unsigned int write_daemon:1;
+ unsigned int closing:1;
+ unsigned int socket_eof:1;
+ unsigned int nolinger:1;
+ unsigned int nonblocking:1;
+ unsigned int ipc:1;
+ unsigned int called_connect:1;
+#ifdef OPTIMISTIC_IO
+ unsigned int calling_io_handler:1;
+#endif
+ } flags;
+ int bytes_read;
+ int bytes_written;
+ int uses; /* ie # req's over persistent conn */
+ PF *read_handler;
+ void *read_data;
+ PF *write_handler;
+ void *write_data;
+ PF *timeout_handler;
+ time_t timeout;
+ void *timeout_data;
+ void *lifetime_data;
+ close_handler *close_handler; /* linked list */
+ DEFER *defer_check; /* check if we should defer read */
+ void *defer_data;
+ CommWriteStateData *rwstate; /* State data for comm_write */
+};
+
+#endif
+
struct _fde {
unsigned int type;
u_short local_port;
u_short remote_port;
+#ifdef _SQUID_MSWIN_
+ FILE * fbuf;
+#endif
char ipaddr[16]; /* dotted decimal address of peer */
char desc[FD_DESC_SZ];
struct {
Index: squid/src/test-ellipses.pl
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/test-ellipses.pl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/src/test-ellipses.pl 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/src/test-ellipses.pl 6 Jan 2001 12:40:17 -0000 1.1.1.1.44.1
@@ -1,7 +1,7 @@
#!/usr/local/bin/perl -w
use strict;
-# $Id: test-ellipses.pl,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+# $Id: test-ellipses.pl,v 1.1.1.1.44.1 2001/01/06 12:40:17 hno Exp $
#
# Replaces printf-like function calls with printf and compiles with gcc -Wall
Index: squid/src/test_cache_digest.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/test_cache_digest.c,v
retrieving revision 1.1.1.1.4.1
retrieving revision 1.1.1.1.4.1.2.1
diff -u -r1.1.1.1.4.1 -r1.1.1.1.4.1.2.1
--- squid/src/test_cache_digest.c 17 Apr 2000 00:56:54 -0000 1.1.1.1.4.1
+++ squid/src/test_cache_digest.c 6 Jan 2001 12:40:17 -0000 1.1.1.1.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: test_cache_digest.c,v 1.1.1.1.4.1 2000/04/17 00:56:54 hno Exp $
+ * $Id: test_cache_digest.c,v 1.1.1.1.4.1.2.1 2001/01/06 12:40:17 hno Exp $
*
* AUTHOR: Alex Rousskov
*
@@ -37,7 +37,7 @@
*/
#include "squid.h"
-
+#include "hash.h"
typedef struct {
int query_count;
int true_hit_count;
Index: squid/src/tools.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/tools.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/tools.c 17 Apr 2000 00:56:54 -0000 1.1.1.3.4.1
+++ squid/src/tools.c 6 Jan 2001 12:40:17 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: tools.c,v 1.1.1.3.4.1 2000/04/17 00:56:54 hno Exp $
+ * $Id: tools.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:17 hno Exp $
*
* DEBUG: section 21 Misc Functions
* AUTHOR: Harvest Derived
@@ -34,7 +34,10 @@
*/
#include "squid.h"
-
+#ifdef _SQUID_MSWIN_
+#include
+#include
+#endif
#define DEAD_MSG "\
The Squid Cache (version %s) died.\n\
\n\
@@ -62,12 +65,24 @@
/* Release the main ports as early as possible */
for (i = 0; i < NHttpSockets; i++) {
if (HttpSockets[i] >= 0)
+#ifdef _SQUID_MSWIN_
+ closesocket(HttpSockets[i]);
+#else
close(HttpSockets[i]);
+#endif
}
if (theInIcpConnection >= 0)
+#ifdef _SQUID_MSWIN_
+ closesocket(theInIcpConnection);
+#else
close(theInIcpConnection);
+#endif
if (theOutIcpConnection >= 0 && theOutIcpConnection != theInIcpConnection)
+#ifdef _SQUID_MSWIN_
+ closesocket(theOutIcpConnection);
+#else
close(theOutIcpConnection);
+#endif
}
static char *
@@ -82,12 +97,21 @@
mail_warranty(void)
{
FILE *fp = NULL;
- char *filename;
static char command[256];
+#if HAVE_MKSTEMP
+ char filename[] = "/tmp/squid-XXXXXX";
+ int tfd = mkstemp(filename);
+ if (tfd < 0)
+ return;
+ if ((fp = fdopen(tfd, "w")) == NULL)
+ return;
+#else
+ char *filename;
if ((filename = tempnam(NULL, appname)) == NULL)
return;
if ((fp = fopen(filename, "w")) == NULL)
return;
+#endif
fprintf(fp, "From: %s\n", appname);
fprintf(fp, "To: %s\n", Config.adminEmail);
fprintf(fp, "Subject: %s\n", dead_msg());
@@ -152,7 +176,32 @@
void
squid_getrusage(struct rusage *r)
{
+#ifdef _SQUID_MSWIN_
+ HANDLE hProcess;
+ PROCESS_MEMORY_COUNTERS pmc;
+ FILETIME ftCreate, ftExit, ftKernel, ftUser;
+#endif
memset(r, '\0', sizeof(struct rusage));
+#ifdef _SQUID_MSWIN_
+ hProcess = OpenProcess( PROCESS_QUERY_INFORMATION |
+ PROCESS_VM_READ,
+ FALSE, GetCurrentProcessId() );
+
+ if ( GetProcessTimes( hProcess, &ftCreate, &ftExit, &ftKernel, &ftUser));
+ {
+ LONGLONG tUser64 = *(LONGLONG *)&ftUser;
+ LONGLONG tKernel64 = *(LONGLONG *)&ftKernel;
+ r->ru_utime.tv_usec =(DWORD)(tUser64 / 10);
+ r->ru_stime.tv_usec =(DWORD)(tKernel64 / 10);
+ }
+
+ if ( GetProcessMemoryInfo( hProcess, &pmc, sizeof(pmc)) )
+ {
+ r->ru_maxrss=(DWORD)(pmc.WorkingSetSize /1024);
+ r->ru_majflt=pmc.PageFaultCount;
+ }
+ CloseHandle( hProcess );
+#else
#if HAVE_GETRUSAGE && defined(RUSAGE_SELF)
#ifdef _SQUID_SOLARIS_
/* Solaris 2.5 has getrusage() permission bug -- Arjan de Vet */
@@ -163,6 +212,7 @@
leave_suid();
#endif
#endif
+#endif
}
double
@@ -386,6 +436,7 @@
void
sig_child(int sig)
{
+#ifndef _SQUID_MSWIN_
#ifdef _SQUID_NEXT_
union wait status;
#else
@@ -406,6 +457,7 @@
} while (pid > 0 || (pid < 0 && errno == EINTR));
signal(sig, sig_child);
#endif
+#endif
}
const char *
@@ -482,6 +534,7 @@
leave_suid(void)
{
debug(21, 3) ("leave_suid: PID %d called\n", getpid());
+#ifndef _SQUID_MSWIN_
if (geteuid() != 0)
return;
/* Started as a root, check suid option */
@@ -504,18 +557,21 @@
if (setuid(Config2.effectiveUserID) < 0)
debug(50, 0) ("ALERT: setuid: %s\n", xstrerror());
#endif
+#endif
}
/* Enter a privilegied section */
void
enter_suid(void)
{
+#ifndef _SQUID_MSWIN_
debug(21, 3) ("enter_suid: PID %d taking root priveleges\n", getpid());
#if HAVE_SETRESUID
setresuid(-1, 0, -1);
#else
setuid(0);
#endif
+#endif
}
/* Give up the posibility to gain privilegies.
@@ -524,6 +580,7 @@
void
no_suid(void)
{
+#ifndef _SQUID_MSWIN_
uid_t uid;
leave_suid();
uid = geteuid();
@@ -536,6 +593,7 @@
if (setuid(uid) < 0)
debug(50, 1) ("no_suid: setuid: %s\n", xstrerror());
#endif
+#endif
}
void
@@ -658,6 +716,15 @@
#endif /* RLIMIT_VMEM */
}
+#ifdef _SQUID_MSWIN_
+void gettimeofday( struct timeval * pcur_time,void * tz){
+ struct _timeb current;
+ _ftime(¤t);
+ pcur_time->tv_sec=current.time;
+ pcur_time->tv_usec=current.millitm * 1000;
+}
+#endif
+
time_t
getCurrentTime(void)
{
@@ -845,7 +912,7 @@
void
linklistPush(link_list ** L, void *p)
{
- link_list *l = xmalloc(sizeof(*l));
+ link_list *l = (link_list *) xmalloc(sizeof(*l));
l->next = NULL;
l->ptr = p;
while (*L)
@@ -877,6 +944,9 @@
xrename(const char *from, const char *to)
{
debug(21, 2) ("xrename: renaming %s to %s\n", from, to);
+#ifdef _SQUID_MSWIN_
+ remove(to);
+#endif
if (0 == rename(from, to))
return 0;
debug(21, errno == ENOENT ? 2 : 1) ("xrename: Cannot rename %s to %s: %s\n",
Index: squid/src/typedefs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/typedefs.h,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/typedefs.h 17 Apr 2000 00:56:54 -0000 1.1.1.3.4.1
+++ squid/src/typedefs.h 6 Jan 2001 12:40:17 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: typedefs.h,v 1.1.1.3.4.1 2000/04/17 00:56:54 hno Exp $
+ * $Id: typedefs.h,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:17 hno Exp $
*
*
* SQUID Internet Object Cache http://squid.nlanr.net/Squid/
@@ -81,6 +81,9 @@
typedef struct _dwrite_q dwrite_q;
typedef struct _ETag ETag;
typedef struct _fde fde;
+#ifdef _SQUID_MSWIN_
+typedef struct _sde sde;
+#endif
typedef struct _fileMap fileMap;
typedef struct _fqdncache_entry fqdncache_entry;
typedef struct _fqdn_pending fqdn_pending;
Index: squid/src/unlinkd.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/unlinkd.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/unlinkd.c 17 Apr 2000 00:56:54 -0000 1.1.1.3.4.1
+++ squid/src/unlinkd.c 6 Jan 2001 12:40:17 -0000 1.1.1.3.4.1.2.1
@@ -1,5 +1,5 @@
/*
- * $Id: unlinkd.c,v 1.1.1.3.4.1 2000/04/17 00:56:54 hno Exp $
+ * $Id: unlinkd.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:17 hno Exp $
*
* DEBUG: section 12 Unlink Daemon
* AUTHOR: Duane Wessels
@@ -161,6 +161,7 @@
void
unlinkdInit(void)
{
+#ifndef _SQUID_MSWIN_
#if USE_UNLINKD
int x;
char *args[2];
@@ -201,6 +202,7 @@
#else
debug(12, 1) ("Unlinkd is disabled\n");
#endif
+#endif
}
#endif /* ndef UNLINK_DAEMON */
Index: squid/src/url.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/url.c,v
retrieving revision 1.1.1.3.4.4
retrieving revision 1.1.1.3.4.4.2.1
diff -u -r1.1.1.3.4.4 -r1.1.1.3.4.4.2.1
--- squid/src/url.c 21 Oct 2000 14:44:59 -0000 1.1.1.3.4.4
+++ squid/src/url.c 6 Jan 2001 12:40:17 -0000 1.1.1.3.4.4.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: url.c,v 1.1.1.3.4.4 2000/10/21 14:44:59 hno Exp $
+ * $Id: url.c,v 1.1.1.3.4.4.2.1 2001/01/06 12:40:17 hno Exp $
*
* DEBUG: section 23 URL Parsing
* AUTHOR: Duane Wessels
Index: squid/src/urn.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/urn.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/urn.c 17 Apr 2000 00:56:54 -0000 1.1.1.3.4.1
+++ squid/src/urn.c 6 Jan 2001 12:40:17 -0000 1.1.1.3.4.1.2.1
@@ -1,7 +1,7 @@
/*
*
- * $Id: urn.c,v 1.1.1.3.4.1 2000/04/17 00:56:54 hno Exp $
+ * $Id: urn.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:17 hno Exp $
*
* DEBUG: section 52 URN Parsing
* AUTHOR: Kostas Anagnostakis
Index: squid/src/useragent.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/useragent.c,v
retrieving revision 1.1.1.3.4.1
retrieving revision 1.1.1.3.4.1.2.1
diff -u -r1.1.1.3.4.1 -r1.1.1.3.4.1.2.1
--- squid/src/useragent.c 17 Apr 2000 00:56:54 -0000 1.1.1.3.4.1
+++ squid/src/useragent.c 6 Jan 2001 12:40:17 -0000 1.1.1.3.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: useragent.c,v 1.1.1.3.4.1 2000/04/17 00:56:54 hno Exp $
+ * $Id: useragent.c,v 1.1.1.3.4.1.2.1 2001/01/06 12:40:17 hno Exp $
*
* DEBUG: section 40 User-Agent logging
* AUTHOR: Joe Ramey
@@ -106,7 +106,7 @@
void
logUserAgent(const char *client, const char *agent)
{
-#if USE_USERAGENT_LOG
+#if USE_USERAGENT_LOG
static time_t last_time = 0;
static char time_str[128];
const char *s;
@@ -117,7 +117,11 @@
strcpy(time_str, s);
last_time = squid_curtime;
}
+#ifdef _SQUID_MSWIN_
+ fprintf(cache_useragent_log, "%s [%s] \"%s\"\r\n",
+#else
fprintf(cache_useragent_log, "%s [%s] \"%s\"\n",
+#endif
client,
time_str,
agent);
Index: squid/src/wais.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/wais.c,v
retrieving revision 1.1.1.2.4.1
retrieving revision 1.1.1.2.4.1.2.1
diff -u -r1.1.1.2.4.1 -r1.1.1.2.4.1.2.1
--- squid/src/wais.c 17 Apr 2000 00:56:54 -0000 1.1.1.2.4.1
+++ squid/src/wais.c 6 Jan 2001 12:40:17 -0000 1.1.1.2.4.1.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: wais.c,v 1.1.1.2.4.1 2000/04/17 00:56:54 hno Exp $
+ * $Id: wais.c,v 1.1.1.2.4.1.2.1 2001/01/06 12:40:17 hno Exp $
*
* DEBUG: section 24 WAIS Relay
* AUTHOR: Harvest Derived
@@ -32,7 +32,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#define WAIS_C
#include "squid.h"
typedef struct {
@@ -103,7 +103,11 @@
read_sz = delayBytesWanted(delay_id, 1, read_sz);
#endif
Counter.syscalls.sock.reads++;
+#ifdef _SQUID_MSWIN_
+ len = recv(fd, buf, read_sz);
+#else
len = read(fd, buf, read_sz);
+#endif
if (len > 0) {
fd_bytes(fd, len, FD_READ);
#if DELAY_POOLS
@@ -242,3 +246,4 @@
commSetSelect(fd, COMM_SELECT_WRITE, waisSendRequest, waisState, 0);
commSetTimeout(fd, Config.Timeout.read, waisTimeout, waisState);
}
+#undef WAIS_C
Index: squid/src/wccp.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/wccp.c,v
retrieving revision 1.1.1.1.4.2
retrieving revision 1.1.1.1.4.2.2.1
diff -u -r1.1.1.1.4.2 -r1.1.1.1.4.2.2.1
--- squid/src/wccp.c 15 Jul 2000 20:50:08 -0000 1.1.1.1.4.2
+++ squid/src/wccp.c 6 Jan 2001 12:40:17 -0000 1.1.1.1.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: wccp.c,v 1.1.1.1.4.2 2000/07/15 20:50:08 hno Exp $
+ * $Id: wccp.c,v 1.1.1.1.4.2.2.1 2001/01/06 12:40:17 hno Exp $
*
* DEBUG: section 80 WCCP Support
* AUTHOR: Glenn Chisholm
@@ -32,6 +32,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
+#define WCCP_C
#include "squid.h"
#if USE_WCCP
@@ -125,7 +126,11 @@
return;
}
theInWccpConnection = comm_open(SOCK_DGRAM,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_UDP,
+#else
0,
+#endif
Config.Wccp.incoming,
port,
COMM_NONBLOCKING,
@@ -141,7 +146,11 @@
(int) port, theInWccpConnection);
if (Config.Wccp.outgoing.s_addr != no_addr.s_addr) {
theOutWccpConnection = comm_open(SOCK_DGRAM,
- 0,
+#ifdef _SQUID_MSWIN_
+ IPPROTO_UDP,
+#else
+ 0,
+#endif
Config.Wccp.outgoing,
port,
COMM_NONBLOCKING,
@@ -220,7 +229,11 @@
Counter.syscalls.sock.recvfroms++;
len = recvfrom(sock,
- &wccp_i_see_you,
+#ifdef _SQUID_MSWIN_
+ (char *)&wccp_i_see_you,
+#else
+ &wccp_i_see_you,
+#endif
WCCP_RESPONSE_SIZE,
0,
(struct sockaddr *) &from,
@@ -262,7 +275,11 @@
wccp_here_i_am.id = wccp_i_see_you.id;
send(theOutWccpConnection,
- &wccp_here_i_am,
+#ifdef _SQUID_MSWIN_
+ (const char*)&wccp_here_i_am,
+#else
+ &wccp_here_i_am,
+#endif
sizeof(wccp_here_i_am),
0);
@@ -325,3 +342,4 @@
}
#endif /* USE_WCCP */
+#undef WCCP_C
Index: squid/src/whois.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/whois.c,v
retrieving revision 1.1.1.2.4.2
retrieving revision 1.1.1.2.4.2.2.1
diff -u -r1.1.1.2.4.2 -r1.1.1.2.4.2.2.1
--- squid/src/whois.c 22 May 2000 11:00:39 -0000 1.1.1.2.4.2
+++ squid/src/whois.c 6 Jan 2001 12:40:17 -0000 1.1.1.2.4.2.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: whois.c,v 1.1.1.2.4.2 2000/05/22 11:00:39 hno Exp $
+ * $Id: whois.c,v 1.1.1.2.4.2.2.1 2001/01/06 12:40:17 hno Exp $
*
* DEBUG: section 75 WHOIS protocol
* AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -32,7 +32,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*
*/
-
+#define WHOIS_C
#include "squid.h"
#define WHOIS_PORT 43
@@ -131,3 +131,4 @@
storeUnlockObject(p->entry);
cbdataFree(p);
}
+#undef WHOIS_C
Index: squid/test-suite/hash.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/test-suite/hash.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.44.1
diff -u -r1.1.1.1 -r1.1.1.1.44.1
--- squid/test-suite/hash.c 26 Jan 2000 03:21:47 -0000 1.1.1.1
+++ squid/test-suite/hash.c 6 Jan 2001 12:40:17 -0000 1.1.1.1.44.1
@@ -1,6 +1,6 @@
/*
- * $Id: hash.c,v 1.1.1.1 2000/01/26 03:21:47 hno Exp $
+ * $Id: hash.c,v 1.1.1.1.44.1 2001/01/06 12:40:17 hno Exp $
*
* DEBUG: section 0 Hash Tables
* AUTHOR: Harvest Derived
Index: squid/test-suite/tcp-banger2.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/test-suite/tcp-banger2.c,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.30.1
diff -u -r1.1.1.3 -r1.1.1.3.30.1
--- squid/test-suite/tcp-banger2.c 26 Jan 2000 03:25:01 -0000 1.1.1.3
+++ squid/test-suite/tcp-banger2.c 6 Jan 2001 12:40:17 -0000 1.1.1.3.30.1
@@ -1,6 +1,6 @@
#include "config.h"
-/* $Id: tcp-banger2.c,v 1.1.1.3 2000/01/26 03:25:01 hno Exp $ */
+/* $Id: tcp-banger2.c,v 1.1.1.3.30.1 2001/01/06 12:40:17 hno Exp $ */
/*
* On some systems, FD_SETSIZE is set to something lower than the
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/resource.h Wed Feb 14 00:48:02 2007
@@ -0,0 +1,15 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by squid.rc
+//
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/squid.rc Wed Feb 14 00:48:02 2007
@@ -0,0 +1,109 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Italian (Italy) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
+#ifdef _WIN32
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x29L
+#else
+ FILEFLAGS 0x28L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "Native build for WIN32\0"
+ VALUE "CompanyName", "Squid Web Proxy Cache - http://www.squid-cache.org/\0"
+ 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 "LegalTrademarks", "GNU gpl\0"
+ VALUE "OriginalFilename", "squid.exe\0"
+ VALUE "PrivateBuild", "STABLE4\0"
+ VALUE "ProductName", "Squid Proxy Server for Windows NT\0"
+ VALUE "ProductVersion", "2.3\0"
+ VALUE "SpecialBuild", "STABLE4\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // !_MAC
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // Italian (Italy) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/win.dsw Wed Feb 14 00:48:02 2007
@@ -0,0 +1,197 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "LDAP_auth"=..\auth_modules\LDAP\LDAP_auth.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name miscutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "NCSA_auth"=..\auth_modules\NCSA\NCSA_auth.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name miscutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name chpasswd
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name htpasswd
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "NT_auth"=..\auth_modules\NT\NT_auth.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name miscutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "cachemgr"=.\cachemgr\cachemgr.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name miscutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "cf_gen"=.\cf_gen\cf_gen.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "chpasswd"=..\contrib\chpasswd\chpasswd.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "dnsserver"=.\dnsserver\dnsserver.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name miscutil
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "htpasswd"=..\contrib\htpasswd\htpasswd.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "libregex"=.\libregex\libregex.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "miscutil"=.\miscutil\miscutil.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libregex
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "squidnt"=.\squidnt\squidnt.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name miscutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name NativeNT
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name NT_auth
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name NCSA_auth
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name cachemgr
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name cf_gen
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name dnsserver
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name LDAP_auth
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/cachemgr/cachemgr.dsp Wed Feb 14 00:48:02 2007
@@ -0,0 +1,115 @@
+# Microsoft Developer Studio Project File - Name="cachemgr" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=cachemgr - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "cachemgr.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "cachemgr.mak" CFG="cachemgr - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "cachemgr - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "cachemgr - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "cachemgr - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# 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 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\\"
+# SUBTRACT LINK32 /pdb:none
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy d:\work\squidnt23\win\cachemgr\release\cachemgr.exe c:\squid23\cgi-bin\cachemgr.cgi
+# End Special Build Tool
+
+!ELSEIF "$(CFG)" == "cachemgr - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# 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 "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 advapi32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\\"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy d:\work\squidnt23\win\cachemgr\debug\cachemgr.exe c:\squid23\cgi-bin\cachemgr.cgi
+# End Special Build Tool
+
+!ENDIF
+
+# Begin Target
+
+# Name "cachemgr - Win32 Release"
+# Name "cachemgr - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\src\cachemgr.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\cachemgr.rc
+# End Source File
+# End Group
+# End Target
+# End Project
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/cachemgr/cachemgr.mak Wed Feb 14 00:48:02 2007
@@ -0,0 +1,241 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on cachemgr.dsp
+!IF "$(CFG)" == ""
+CFG=cachemgr - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to cachemgr - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "cachemgr - Win32 Release" && "$(CFG)" != "cachemgr - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "cachemgr.mak" CFG="cachemgr - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "cachemgr - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "cachemgr - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "cachemgr - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\cachemgr.exe"
+
+!ELSE
+
+ALL : "miscutil - Win32 Release" "$(OUTDIR)\cachemgr.exe"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"miscutil - Win32 ReleaseCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+ -@erase "$(INTDIR)\cachemgr.obj"
+ -@erase "$(INTDIR)\cachemgr.res"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(OUTDIR)\cachemgr.exe"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\cachemgr.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\cachemgr.res" /d "NDEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\cachemgr.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\cachemgr.pdb" /machine:I386 /out:"$(OUTDIR)\cachemgr.exe" /libpath:"..\\"
+LINK32_OBJS= \
+ "$(INTDIR)\cachemgr.obj" \
+ "$(INTDIR)\cachemgr.res" \
+ "..\miscutil\Release\miscutil.lib"
+
+"$(OUTDIR)\cachemgr.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "miscutil - Win32 Release" "$(OUTDIR)\cachemgr.exe"
+ copy d:\work\squidnt23\win\cachemgr\release\cachemgr.exe c:\squid23\cgi-bin\cachemgr.cgi
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF "$(CFG)" == "cachemgr - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\cachemgr.exe"
+
+!ELSE
+
+ALL : "miscutil - Win32 Debug" "$(OUTDIR)\cachemgr.exe"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"miscutil - Win32 DebugCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+ -@erase "$(INTDIR)\cachemgr.obj"
+ -@erase "$(INTDIR)\cachemgr.res"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(INTDIR)\vc60.pdb"
+ -@erase "$(OUTDIR)\cachemgr.exe"
+ -@erase "$(OUTDIR)\cachemgr.ilk"
+ -@erase "$(OUTDIR)\cachemgr.pdb"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\cachemgr.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\cachemgr.res" /d "_DEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\cachemgr.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\cachemgr.pdb" /debug /machine:I386 /out:"$(OUTDIR)\cachemgr.exe" /pdbtype:sept /libpath:"..\\"
+LINK32_OBJS= \
+ "$(INTDIR)\cachemgr.obj" \
+ "$(INTDIR)\cachemgr.res" \
+ "..\miscutil\Debug\miscutil.lib"
+
+"$(OUTDIR)\cachemgr.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "miscutil - Win32 Debug" "$(OUTDIR)\cachemgr.exe"
+ copy d:\work\squidnt23\win\cachemgr\debug\cachemgr.exe c:\squid23\cgi-bin\cachemgr.cgi
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("cachemgr.dep")
+!INCLUDE "cachemgr.dep"
+!ELSE
+!MESSAGE Warning: cannot find "cachemgr.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "cachemgr - Win32 Release" || "$(CFG)" == "cachemgr - Win32 Debug"
+SOURCE=..\..\src\cachemgr.c
+
+"$(INTDIR)\cachemgr.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\cachemgr.rc
+
+"$(INTDIR)\cachemgr.res" : $(SOURCE) "$(INTDIR)"
+ $(RSC) $(RSC_PROJ) $(SOURCE)
+
+
+!IF "$(CFG)" == "cachemgr - Win32 Release"
+
+"miscutil - Win32 Release" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release"
+ cd "..\cachemgr"
+
+"miscutil - Win32 ReleaseCLEAN" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release" RECURSE=1 CLEAN
+ cd "..\cachemgr"
+
+!ELSEIF "$(CFG)" == "cachemgr - Win32 Debug"
+
+"miscutil - Win32 Debug" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug"
+ cd "..\cachemgr"
+
+"miscutil - Win32 DebugCLEAN" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\cachemgr"
+
+!ENDIF
+
+
+!ENDIF
+
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/cachemgr/cachemgr.rc Wed Feb 14 00:48:02 2007
@@ -0,0 +1,109 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Italian (Italy) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
+#ifdef _WIN32
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x29L
+#else
+ FILEFLAGS 0x28L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "Native build for WIN32\0"
+ VALUE "CompanyName", "Squid Web Proxy Cache - http://www.squid-cache.org/\0"
+ 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 "LegalTrademarks", "GNU gpl\0"
+ VALUE "OriginalFilename", "cachemgr.exe\0"
+ VALUE "PrivateBuild", "STABLE4\0"
+ VALUE "ProductName", "Squid Proxy Server for Windows NT\0"
+ VALUE "ProductVersion", "2.3\0"
+ VALUE "SpecialBuild", "STABLE4\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // !_MAC
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // Italian (Italy) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/cachemgr/resource.h Wed Feb 14 00:48:02 2007
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by cachemgr.rc
+//
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC 1
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/cf_gen/cf_gen.dsp Wed Feb 14 00:48:02 2007
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="cf_gen" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=cf_gen - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "cf_gen.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "cf_gen.mak" CFG="cf_gen - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "cf_gen - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "cf_gen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "cf_gen - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# 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 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF "$(CFG)" == "cf_gen - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# 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 "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF
+
+# Begin Target
+
+# Name "cf_gen - Win32 Release"
+# Name "cf_gen - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\src\cf_gen.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/cf_gen/cf_gen.mak Wed Feb 14 00:48:02 2007
@@ -0,0 +1,153 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on cf_gen.dsp
+!IF "$(CFG)" == ""
+CFG=cf_gen - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to cf_gen - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "cf_gen - Win32 Release" && "$(CFG)" != "cf_gen - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "cf_gen.mak" CFG="cf_gen - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "cf_gen - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "cf_gen - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "cf_gen - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+ALL : "$(OUTDIR)\cf_gen.exe"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\cf_gen.obj"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(OUTDIR)\cf_gen.exe"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\cf_gen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\cf_gen.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\cf_gen.pdb" /machine:I386 /out:"$(OUTDIR)\cf_gen.exe"
+LINK32_OBJS= \
+ "$(INTDIR)\cf_gen.obj"
+
+"$(OUTDIR)\cf_gen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "cf_gen - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "$(OUTDIR)\cf_gen.exe"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\cf_gen.obj"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(INTDIR)\vc60.pdb"
+ -@erase "$(OUTDIR)\cf_gen.exe"
+ -@erase "$(OUTDIR)\cf_gen.ilk"
+ -@erase "$(OUTDIR)\cf_gen.pdb"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\cf_gen.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\cf_gen.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\cf_gen.pdb" /debug /machine:I386 /out:"$(OUTDIR)\cf_gen.exe" /pdbtype:sept
+LINK32_OBJS= \
+ "$(INTDIR)\cf_gen.obj"
+
+"$(OUTDIR)\cf_gen.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("cf_gen.dep")
+!INCLUDE "cf_gen.dep"
+!ELSE
+!MESSAGE Warning: cannot find "cf_gen.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "cf_gen - Win32 Release" || "$(CFG)" == "cf_gen - Win32 Debug"
+SOURCE=..\..\src\cf_gen.c
+
+"$(INTDIR)\cf_gen.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+
+!ENDIF
+
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/dnsserver/dnsserver.dsp Wed Feb 14 00:48:02 2007
@@ -0,0 +1,119 @@
+# Microsoft Developer Studio Project File - Name="dnsserver" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=dnsserver - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "dnsserver.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "dnsserver.mak" CFG="dnsserver - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "dnsserver - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dnsserver - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "dnsserver - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 1
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DNSSERVER_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DNSSERVER_EXPORTS" /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"
+# ADD RSC /l 0x410 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib /nologo /dll /machine:I386
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy d:\work\squidnt23\win\dnsserver\release\dnsserver.dll c:\squid23\dnsserver.dll
+# End Special Build Tool
+
+!ELSEIF "$(CFG)" == "dnsserver - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 1
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DNSSERVER_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DNSSERVER_EXPORTS" /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"
+# ADD RSC /l 0x410 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy d:\work\squidnt23\win\dnsserver\debug\dnsserver.dll c:\squid23\dnsserver.dll
+# End Special Build Tool
+
+!ENDIF
+
+# Begin Target
+
+# Name "dnsserver - Win32 Release"
+# Name "dnsserver - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\src\dnsserver.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\dnsserver.rc
+# End Source File
+# End Group
+# End Target
+# End Project
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/dnsserver/dnsserver.mak Wed Feb 14 00:48:02 2007
@@ -0,0 +1,246 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on dnsserver.dsp
+!IF "$(CFG)" == ""
+CFG=dnsserver - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to dnsserver - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "dnsserver - Win32 Release" && "$(CFG)" != "dnsserver - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "dnsserver.mak" CFG="dnsserver - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "dnsserver - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "dnsserver - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "dnsserver - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\dnsserver.dll"
+
+!ELSE
+
+ALL : "miscutil - Win32 Release" "$(OUTDIR)\dnsserver.dll"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"miscutil - Win32 ReleaseCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+ -@erase "$(INTDIR)\dnsserver.obj"
+ -@erase "$(INTDIR)\dnsserver.res"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(OUTDIR)\dnsserver.dll"
+ -@erase "$(OUTDIR)\dnsserver.exp"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DNSSERVER_EXPORTS" /Fp"$(INTDIR)\dnsserver.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x410 /fo"$(INTDIR)\dnsserver.res" /d "NDEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\dnsserver.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\dnsserver.pdb" /machine:I386 /out:"$(OUTDIR)\dnsserver.dll" /implib:"$(OUTDIR)\dnsserver.lib"
+LINK32_OBJS= \
+ "$(INTDIR)\dnsserver.obj" \
+ "$(INTDIR)\dnsserver.res" \
+ "..\miscutil\Release\miscutil.lib"
+
+"$(OUTDIR)\dnsserver.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "miscutil - Win32 Release" "$(OUTDIR)\dnsserver.dll"
+ copy d:\work\squidnt23\win\dnsserver\release\dnsserver.dll c:\squid23\dnsserver.dll
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF "$(CFG)" == "dnsserver - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\dnsserver.dll"
+
+!ELSE
+
+ALL : "miscutil - Win32 Debug" "$(OUTDIR)\dnsserver.dll"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"miscutil - Win32 DebugCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+ -@erase "$(INTDIR)\dnsserver.obj"
+ -@erase "$(INTDIR)\dnsserver.res"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(INTDIR)\vc60.pdb"
+ -@erase "$(OUTDIR)\dnsserver.dll"
+ -@erase "$(OUTDIR)\dnsserver.exp"
+ -@erase "$(OUTDIR)\dnsserver.ilk"
+ -@erase "$(OUTDIR)\dnsserver.pdb"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DNSSERVER_EXPORTS" /Fp"$(INTDIR)\dnsserver.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+RSC_PROJ=/l 0x410 /fo"$(INTDIR)\dnsserver.res" /d "_DEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\dnsserver.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\dnsserver.pdb" /debug /machine:I386 /out:"$(OUTDIR)\dnsserver.dll" /implib:"$(OUTDIR)\dnsserver.lib" /pdbtype:sept
+LINK32_OBJS= \
+ "$(INTDIR)\dnsserver.obj" \
+ "$(INTDIR)\dnsserver.res" \
+ "..\miscutil\Debug\miscutil.lib"
+
+"$(OUTDIR)\dnsserver.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "miscutil - Win32 Debug" "$(OUTDIR)\dnsserver.dll"
+ copy d:\work\squidnt23\win\dnsserver\debug\dnsserver.dll c:\squid23\dnsserver.dll
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("dnsserver.dep")
+!INCLUDE "dnsserver.dep"
+!ELSE
+!MESSAGE Warning: cannot find "dnsserver.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "dnsserver - Win32 Release" || "$(CFG)" == "dnsserver - Win32 Debug"
+SOURCE=..\..\src\dnsserver.c
+
+"$(INTDIR)\dnsserver.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=.\dnsserver.rc
+
+"$(INTDIR)\dnsserver.res" : $(SOURCE) "$(INTDIR)"
+ $(RSC) $(RSC_PROJ) $(SOURCE)
+
+
+!IF "$(CFG)" == "dnsserver - Win32 Release"
+
+"miscutil - Win32 Release" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release"
+ cd "..\dnsserver"
+
+"miscutil - Win32 ReleaseCLEAN" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release" RECURSE=1 CLEAN
+ cd "..\dnsserver"
+
+!ELSEIF "$(CFG)" == "dnsserver - Win32 Debug"
+
+"miscutil - Win32 Debug" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug"
+ cd "..\dnsserver"
+
+"miscutil - Win32 DebugCLEAN" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\dnsserver"
+
+!ENDIF
+
+
+!ENDIF
+
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/dnsserver/dnsserver.rc Wed Feb 14 00:48:02 2007
@@ -0,0 +1,109 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Italian (Italy) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
+#ifdef _WIN32
+LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x29L
+#else
+ FILEFLAGS 0x28L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "Native build for WIN32\0"
+ VALUE "CompanyName", "Squid Web Proxy Cache - http://www.squid-cache.org/\0"
+ 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 "LegalTrademarks", "GNU gpl\0"
+ VALUE "OriginalFilename", "dnsserver.dll\0"
+ VALUE "PrivateBuild", "STABLE4\0"
+ VALUE "ProductName", "Squid Proxy Server for Windows NT\0"
+ VALUE "ProductVersion", "2.3\0"
+ VALUE "SpecialBuild", "STABLE4\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // !_MAC
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // Italian (Italy) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/dnsserver/resource.h Wed Feb 14 00:48:02 2007
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by dnsserver.rc
+//
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC 1
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/libregex/libregex.dsp Wed Feb 14 00:48:02 2007
@@ -0,0 +1,98 @@
+# Microsoft Developer Studio Project File - Name="libregex" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libregex - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "libregex.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libregex.mak" CFG="libregex - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libregex - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libregex - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libregex - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# 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 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "libregex - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# 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 "../" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "libregex - Win32 Release"
+# Name "libregex - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\lib\GNUregex.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/libregex/libregex.mak Wed Feb 14 00:48:02 2007
@@ -0,0 +1,151 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on libregex.dsp
+!IF "$(CFG)" == ""
+CFG=libregex - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to libregex - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "libregex - Win32 Release" && "$(CFG)" != "libregex - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "libregex.mak" CFG="libregex - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "libregex - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libregex - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "libregex - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+ALL : "$(OUTDIR)\libregex.lib"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\GNUregex.obj"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(OUTDIR)\libregex.lib"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\libregex.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libregex.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libregex.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\GNUregex.obj"
+
+"$(OUTDIR)\libregex.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "libregex - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "$(OUTDIR)\libregex.lib"
+
+
+CLEAN :
+ -@erase "$(INTDIR)\GNUregex.obj"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(INTDIR)\vc60.pdb"
+ -@erase "$(OUTDIR)\libregex.lib"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\libregex.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libregex.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libregex.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\GNUregex.obj"
+
+"$(OUTDIR)\libregex.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("libregex.dep")
+!INCLUDE "libregex.dep"
+!ELSE
+!MESSAGE Warning: cannot find "libregex.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "libregex - Win32 Release" || "$(CFG)" == "libregex - Win32 Debug"
+SOURCE=..\..\lib\GNUregex.c
+
+"$(INTDIR)\GNUregex.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+
+!ENDIF
+
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/miscutil/miscutil.dsp Wed Feb 14 00:48:02 2007
@@ -0,0 +1,174 @@
+# Microsoft Developer Studio Project File - Name="miscutil" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=miscutil - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "miscutil.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "miscutil.mak" CFG="miscutil - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "miscutil - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "miscutil - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "miscutil - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# 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 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "miscutil - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# 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 "../" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "miscutil - Win32 Release"
+# Name "miscutil - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\lib\Array.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\base64.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\drand48.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\getfullhostname.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\heap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\html_quote.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\iso3307.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\md5.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\radix.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\rfc1035.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\rfc1123.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\rfc1738.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\safe_inet_addr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\snprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\splay.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\Stack.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\stub_memaccount.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\util.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lib\uudecode.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# End Target
+# End Project
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/miscutil/miscutil.mak Wed Feb 14 00:48:02 2007
@@ -0,0 +1,391 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on miscutil.dsp
+!IF "$(CFG)" == ""
+CFG=miscutil - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to miscutil - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "miscutil - Win32 Release" && "$(CFG)" != "miscutil - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "miscutil.mak" CFG="miscutil - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "miscutil - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "miscutil - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "miscutil - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\miscutil.lib"
+
+!ELSE
+
+ALL : "libregex - Win32 Release" "$(OUTDIR)\miscutil.lib"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"libregex - Win32 ReleaseCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+ -@erase "$(INTDIR)\Array.obj"
+ -@erase "$(INTDIR)\base64.obj"
+ -@erase "$(INTDIR)\drand48.obj"
+ -@erase "$(INTDIR)\getfullhostname.obj"
+ -@erase "$(INTDIR)\hash.obj"
+ -@erase "$(INTDIR)\heap.obj"
+ -@erase "$(INTDIR)\html_quote.obj"
+ -@erase "$(INTDIR)\iso3307.obj"
+ -@erase "$(INTDIR)\md5.obj"
+ -@erase "$(INTDIR)\radix.obj"
+ -@erase "$(INTDIR)\rfc1035.obj"
+ -@erase "$(INTDIR)\rfc1123.obj"
+ -@erase "$(INTDIR)\rfc1738.obj"
+ -@erase "$(INTDIR)\safe_inet_addr.obj"
+ -@erase "$(INTDIR)\snprintf.obj"
+ -@erase "$(INTDIR)\splay.obj"
+ -@erase "$(INTDIR)\Stack.obj"
+ -@erase "$(INTDIR)\stub_memaccount.obj"
+ -@erase "$(INTDIR)\util.obj"
+ -@erase "$(INTDIR)\uudecode.obj"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(OUTDIR)\miscutil.lib"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MT /W3 /GX /O2 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\miscutil.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\miscutil.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\miscutil.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\Array.obj" \
+ "$(INTDIR)\base64.obj" \
+ "$(INTDIR)\drand48.obj" \
+ "$(INTDIR)\getfullhostname.obj" \
+ "$(INTDIR)\hash.obj" \
+ "$(INTDIR)\heap.obj" \
+ "$(INTDIR)\html_quote.obj" \
+ "$(INTDIR)\iso3307.obj" \
+ "$(INTDIR)\md5.obj" \
+ "$(INTDIR)\radix.obj" \
+ "$(INTDIR)\rfc1035.obj" \
+ "$(INTDIR)\rfc1123.obj" \
+ "$(INTDIR)\rfc1738.obj" \
+ "$(INTDIR)\safe_inet_addr.obj" \
+ "$(INTDIR)\snprintf.obj" \
+ "$(INTDIR)\splay.obj" \
+ "$(INTDIR)\Stack.obj" \
+ "$(INTDIR)\stub_memaccount.obj" \
+ "$(INTDIR)\util.obj" \
+ "$(INTDIR)\uudecode.obj" \
+ "..\libregex\Release\libregex.lib"
+
+"$(OUTDIR)\miscutil.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF "$(CFG)" == "miscutil - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\miscutil.lib"
+
+!ELSE
+
+ALL : "libregex - Win32 Debug" "$(OUTDIR)\miscutil.lib"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"libregex - Win32 DebugCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+ -@erase "$(INTDIR)\Array.obj"
+ -@erase "$(INTDIR)\base64.obj"
+ -@erase "$(INTDIR)\drand48.obj"
+ -@erase "$(INTDIR)\getfullhostname.obj"
+ -@erase "$(INTDIR)\hash.obj"
+ -@erase "$(INTDIR)\heap.obj"
+ -@erase "$(INTDIR)\html_quote.obj"
+ -@erase "$(INTDIR)\iso3307.obj"
+ -@erase "$(INTDIR)\md5.obj"
+ -@erase "$(INTDIR)\radix.obj"
+ -@erase "$(INTDIR)\rfc1035.obj"
+ -@erase "$(INTDIR)\rfc1123.obj"
+ -@erase "$(INTDIR)\rfc1738.obj"
+ -@erase "$(INTDIR)\safe_inet_addr.obj"
+ -@erase "$(INTDIR)\snprintf.obj"
+ -@erase "$(INTDIR)\splay.obj"
+ -@erase "$(INTDIR)\Stack.obj"
+ -@erase "$(INTDIR)\stub_memaccount.obj"
+ -@erase "$(INTDIR)\util.obj"
+ -@erase "$(INTDIR)\uudecode.obj"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(INTDIR)\vc60.pdb"
+ -@erase "$(OUTDIR)\miscutil.lib"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\miscutil.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\miscutil.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\miscutil.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\Array.obj" \
+ "$(INTDIR)\base64.obj" \
+ "$(INTDIR)\drand48.obj" \
+ "$(INTDIR)\getfullhostname.obj" \
+ "$(INTDIR)\hash.obj" \
+ "$(INTDIR)\heap.obj" \
+ "$(INTDIR)\html_quote.obj" \
+ "$(INTDIR)\iso3307.obj" \
+ "$(INTDIR)\md5.obj" \
+ "$(INTDIR)\radix.obj" \
+ "$(INTDIR)\rfc1035.obj" \
+ "$(INTDIR)\rfc1123.obj" \
+ "$(INTDIR)\rfc1738.obj" \
+ "$(INTDIR)\safe_inet_addr.obj" \
+ "$(INTDIR)\snprintf.obj" \
+ "$(INTDIR)\splay.obj" \
+ "$(INTDIR)\Stack.obj" \
+ "$(INTDIR)\stub_memaccount.obj" \
+ "$(INTDIR)\util.obj" \
+ "$(INTDIR)\uudecode.obj" \
+ "..\libregex\Debug\libregex.lib"
+
+"$(OUTDIR)\miscutil.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("miscutil.dep")
+!INCLUDE "miscutil.dep"
+!ELSE
+!MESSAGE Warning: cannot find "miscutil.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "miscutil - Win32 Release" || "$(CFG)" == "miscutil - Win32 Debug"
+SOURCE=..\..\lib\Array.c
+
+"$(INTDIR)\Array.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\base64.c
+
+"$(INTDIR)\base64.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\drand48.c
+
+"$(INTDIR)\drand48.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\getfullhostname.c
+
+"$(INTDIR)\getfullhostname.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\hash.c
+
+"$(INTDIR)\hash.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\heap.c
+
+"$(INTDIR)\heap.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\html_quote.c
+
+"$(INTDIR)\html_quote.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\iso3307.c
+
+"$(INTDIR)\iso3307.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\md5.c
+
+"$(INTDIR)\md5.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\radix.c
+
+"$(INTDIR)\radix.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\rfc1035.c
+
+"$(INTDIR)\rfc1035.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\rfc1123.c
+
+"$(INTDIR)\rfc1123.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\rfc1738.c
+
+"$(INTDIR)\rfc1738.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\safe_inet_addr.c
+
+"$(INTDIR)\safe_inet_addr.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\snprintf.c
+
+"$(INTDIR)\snprintf.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\splay.c
+
+"$(INTDIR)\splay.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\Stack.c
+
+"$(INTDIR)\Stack.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\stub_memaccount.c
+
+"$(INTDIR)\stub_memaccount.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\util.c
+
+"$(INTDIR)\util.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\lib\uudecode.c
+
+"$(INTDIR)\uudecode.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!IF "$(CFG)" == "miscutil - Win32 Release"
+
+"libregex - Win32 Release" :
+ cd "\work\squidnt23\win\libregex"
+ $(MAKE) /$(MAKEFLAGS) /F .\libregex.mak CFG="libregex - Win32 Release"
+ cd "..\miscutil"
+
+"libregex - Win32 ReleaseCLEAN" :
+ cd "\work\squidnt23\win\libregex"
+ $(MAKE) /$(MAKEFLAGS) /F .\libregex.mak CFG="libregex - Win32 Release" RECURSE=1 CLEAN
+ cd "..\miscutil"
+
+!ELSEIF "$(CFG)" == "miscutil - Win32 Debug"
+
+"libregex - Win32 Debug" :
+ cd "\work\squidnt23\win\libregex"
+ $(MAKE) /$(MAKEFLAGS) /F .\libregex.mak CFG="libregex - Win32 Debug"
+ cd "..\miscutil"
+
+"libregex - Win32 DebugCLEAN" :
+ cd "\work\squidnt23\win\libregex"
+ $(MAKE) /$(MAKEFLAGS) /F .\libregex.mak CFG="libregex - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\miscutil"
+
+!ENDIF
+
+
+!ENDIF
+
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/squidnt/squidnt.dsp Wed Feb 14 00:48:02 2007
@@ -0,0 +1,503 @@
+# Microsoft Developer Studio Project File - Name="squidnt" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=squidnt - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "squidnt.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "squidnt.mak" CFG="squidnt - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "squidnt - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "squidnt - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# 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 /vmg /GX /O2 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 kernel32.lib user32.lib ws2_32.lib advapi32.lib psapi.lib /nologo /subsystem:console /machine:I386 /out:"Release/squid.exe" /libpath:"..\\"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=net stop "SquidNT2.3Stable4 beta" copy d:\work\squidnt23\win\squidnt\release\squid.exe c:\squid23\squid.exe net start "SquidNT2.3Stable4 beta"
+# End Special Build Tool
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# 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 "../" /I "../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 ws2_32.lib advapi32.lib psapi.lib winwrap.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/squid.exe" /pdbtype:sept /libpath:"..\\"
+# SUBTRACT LINK32 /profile
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=net stop "SquidNT2.3Stable4 beta" copy d:\work\squidnt23\win\squidnt\debug\squid.exe c:\squid23\squid.exe copy d:\work\squidnt23\auth_modules\NT\debug\nt_auth.dll c:\squid23\nt_auth.dll copy d:\work\squidnt23\auth_modules\NCSA\debug\ncsa_auth.dll c:\squid23\ncsa_auth.dll
+# End Special Build Tool
+
+!ENDIF
+
+# Begin Target
+
+# Name "squidnt - Win32 Release"
+# Name "squidnt - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\src\access_log.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\acl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\asn.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\async_io.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\authenticate.c
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+# ADD CPP /W4
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cache_cf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cache_manager.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\CacheDigest.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\carp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\cbdata.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\client_db.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\client_side.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\comm.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\comm_select.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\debug.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\delay_pools.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\disk.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dns.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dns_internal.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\errorpage.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\ETag.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\event.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\filemap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\forward.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\fqdncache.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\ftp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\globals.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\gopher.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\helper.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\htcp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\http.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\HttpBody.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\HttpHdrCc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\HttpHdrContRange.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\HttpHdrRange.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\HttpHeader.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\HttpHeaderTools.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\HttpMsg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\HttpReply.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\HttpRequest.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\HttpStatusLine.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\icmp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\icp_v2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\icp_v3.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\ident.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\internal.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\ipc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\ipcache.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\leakfinder.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\main.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\mem.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\MemBuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\MemPool.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\mime.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\multicast.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\neighbors.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\net_db.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\Packer.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\pconn.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\peer_digest.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\peer_select.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\pump.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\readdir.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\redirect.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\refresh.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\send-announce.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\ssl.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\stat.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\StatHist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\stmem.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_client.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_digest.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_dir.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_dir_ufs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_io.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_io_ufs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_key_md5.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_log.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_rebuild.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_swapin.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_swapmeta.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\store_swapout.c
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\string-arrays.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\String.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\tools.c
+# ADD CPP /W4
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\unlinkd.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\url.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\urn.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\useragent.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\wais.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\wccp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\whois.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\win32.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\squid.rc
+# End Source File
+# End Group
+# End Target
+# End Project
--- /dev/null Wed Feb 14 00:45:56 2007
+++ squid/win/squidnt/squidnt.mak Wed Feb 14 00:48:02 2007
@@ -0,0 +1,1396 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on squidnt.dsp
+!IF "$(CFG)" == ""
+CFG=squidnt - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to squidnt - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "squidnt - Win32 Release" && "$(CFG)" != "squidnt - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "squidnt.mak" CFG="squidnt - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "squidnt - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "squidnt - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\squid.exe"
+
+!ELSE
+
+ALL : "LDAP_auth - Win32 Release" "dnsserver - Win32 Release" "cf_gen - Win32 Release" "cachemgr - Win32 Release" "NCSA_auth - Win32 Release" "NT_auth - Win32 Release" "miscutil - Win32 Release" "$(OUTDIR)\squid.exe"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"miscutil - Win32 ReleaseCLEAN" "NT_auth - Win32 ReleaseCLEAN" "NCSA_auth - Win32 ReleaseCLEAN" "cachemgr - Win32 ReleaseCLEAN" "cf_gen - Win32 ReleaseCLEAN" "dnsserver - Win32 ReleaseCLEAN" "LDAP_auth - Win32 ReleaseCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+ -@erase "$(INTDIR)\access_log.obj"
+ -@erase "$(INTDIR)\acl.obj"
+ -@erase "$(INTDIR)\asn.obj"
+ -@erase "$(INTDIR)\async_io.obj"
+ -@erase "$(INTDIR)\authenticate.obj"
+ -@erase "$(INTDIR)\cache_cf.obj"
+ -@erase "$(INTDIR)\cache_manager.obj"
+ -@erase "$(INTDIR)\CacheDigest.obj"
+ -@erase "$(INTDIR)\carp.obj"
+ -@erase "$(INTDIR)\cbdata.obj"
+ -@erase "$(INTDIR)\client_db.obj"
+ -@erase "$(INTDIR)\client_side.obj"
+ -@erase "$(INTDIR)\comm.obj"
+ -@erase "$(INTDIR)\comm_select.obj"
+ -@erase "$(INTDIR)\debug.obj"
+ -@erase "$(INTDIR)\delay_pools.obj"
+ -@erase "$(INTDIR)\disk.obj"
+ -@erase "$(INTDIR)\dns.obj"
+ -@erase "$(INTDIR)\dns_internal.obj"
+ -@erase "$(INTDIR)\errorpage.obj"
+ -@erase "$(INTDIR)\ETag.obj"
+ -@erase "$(INTDIR)\event.obj"
+ -@erase "$(INTDIR)\fd.obj"
+ -@erase "$(INTDIR)\filemap.obj"
+ -@erase "$(INTDIR)\forward.obj"
+ -@erase "$(INTDIR)\fqdncache.obj"
+ -@erase "$(INTDIR)\ftp.obj"
+ -@erase "$(INTDIR)\globals.obj"
+ -@erase "$(INTDIR)\gopher.obj"
+ -@erase "$(INTDIR)\helper.obj"
+ -@erase "$(INTDIR)\htcp.obj"
+ -@erase "$(INTDIR)\http.obj"
+ -@erase "$(INTDIR)\HttpBody.obj"
+ -@erase "$(INTDIR)\HttpHdrCc.obj"
+ -@erase "$(INTDIR)\HttpHdrContRange.obj"
+ -@erase "$(INTDIR)\HttpHdrRange.obj"
+ -@erase "$(INTDIR)\HttpHeader.obj"
+ -@erase "$(INTDIR)\HttpHeaderTools.obj"
+ -@erase "$(INTDIR)\HttpMsg.obj"
+ -@erase "$(INTDIR)\HttpReply.obj"
+ -@erase "$(INTDIR)\HttpRequest.obj"
+ -@erase "$(INTDIR)\HttpStatusLine.obj"
+ -@erase "$(INTDIR)\icmp.obj"
+ -@erase "$(INTDIR)\icp_v2.obj"
+ -@erase "$(INTDIR)\icp_v3.obj"
+ -@erase "$(INTDIR)\ident.obj"
+ -@erase "$(INTDIR)\internal.obj"
+ -@erase "$(INTDIR)\ipc.obj"
+ -@erase "$(INTDIR)\ipcache.obj"
+ -@erase "$(INTDIR)\leakfinder.obj"
+ -@erase "$(INTDIR)\main.obj"
+ -@erase "$(INTDIR)\mem.obj"
+ -@erase "$(INTDIR)\MemBuf.obj"
+ -@erase "$(INTDIR)\MemPool.obj"
+ -@erase "$(INTDIR)\mime.obj"
+ -@erase "$(INTDIR)\multicast.obj"
+ -@erase "$(INTDIR)\neighbors.obj"
+ -@erase "$(INTDIR)\net_db.obj"
+ -@erase "$(INTDIR)\Packer.obj"
+ -@erase "$(INTDIR)\pconn.obj"
+ -@erase "$(INTDIR)\peer_digest.obj"
+ -@erase "$(INTDIR)\peer_select.obj"
+ -@erase "$(INTDIR)\pump.obj"
+ -@erase "$(INTDIR)\readdir.obj"
+ -@erase "$(INTDIR)\redirect.obj"
+ -@erase "$(INTDIR)\refresh.obj"
+ -@erase "$(INTDIR)\send-announce.obj"
+ -@erase "$(INTDIR)\squid.res"
+ -@erase "$(INTDIR)\ssl.obj"
+ -@erase "$(INTDIR)\stat.obj"
+ -@erase "$(INTDIR)\StatHist.obj"
+ -@erase "$(INTDIR)\stmem.obj"
+ -@erase "$(INTDIR)\store.obj"
+ -@erase "$(INTDIR)\store_client.obj"
+ -@erase "$(INTDIR)\store_digest.obj"
+ -@erase "$(INTDIR)\store_dir.obj"
+ -@erase "$(INTDIR)\store_dir_ufs.obj"
+ -@erase "$(INTDIR)\store_io.obj"
+ -@erase "$(INTDIR)\store_io_ufs.obj"
+ -@erase "$(INTDIR)\store_key_md5.obj"
+ -@erase "$(INTDIR)\store_log.obj"
+ -@erase "$(INTDIR)\store_rebuild.obj"
+ -@erase "$(INTDIR)\store_swapin.obj"
+ -@erase "$(INTDIR)\store_swapmeta.obj"
+ -@erase "$(INTDIR)\store_swapout.obj"
+ -@erase "$(INTDIR)\string-arrays.obj"
+ -@erase "$(INTDIR)\String.obj"
+ -@erase "$(INTDIR)\tools.obj"
+ -@erase "$(INTDIR)\unlinkd.obj"
+ -@erase "$(INTDIR)\url.obj"
+ -@erase "$(INTDIR)\urn.obj"
+ -@erase "$(INTDIR)\useragent.obj"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(INTDIR)\wais.obj"
+ -@erase "$(INTDIR)\wccp.obj"
+ -@erase "$(INTDIR)\whois.obj"
+ -@erase "$(INTDIR)\win32.obj"
+ -@erase "$(OUTDIR)\squid.exe"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MT /W3 /vmg /GX /O2 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\squidnt.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\squid.res" /d "NDEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\squidnt.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib ws2_32.lib advapi32.lib psapi.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\squid.pdb" /machine:I386 /out:"$(OUTDIR)\squid.exe" /libpath:"..\\"
+LINK32_OBJS= \
+ "$(INTDIR)\access_log.obj" \
+ "$(INTDIR)\acl.obj" \
+ "$(INTDIR)\asn.obj" \
+ "$(INTDIR)\async_io.obj" \
+ "$(INTDIR)\authenticate.obj" \
+ "$(INTDIR)\cache_cf.obj" \
+ "$(INTDIR)\cache_manager.obj" \
+ "$(INTDIR)\CacheDigest.obj" \
+ "$(INTDIR)\carp.obj" \
+ "$(INTDIR)\cbdata.obj" \
+ "$(INTDIR)\client_db.obj" \
+ "$(INTDIR)\client_side.obj" \
+ "$(INTDIR)\comm.obj" \
+ "$(INTDIR)\comm_select.obj" \
+ "$(INTDIR)\debug.obj" \
+ "$(INTDIR)\delay_pools.obj" \
+ "$(INTDIR)\disk.obj" \
+ "$(INTDIR)\dns.obj" \
+ "$(INTDIR)\dns_internal.obj" \
+ "$(INTDIR)\errorpage.obj" \
+ "$(INTDIR)\ETag.obj" \
+ "$(INTDIR)\event.obj" \
+ "$(INTDIR)\fd.obj" \
+ "$(INTDIR)\filemap.obj" \
+ "$(INTDIR)\forward.obj" \
+ "$(INTDIR)\fqdncache.obj" \
+ "$(INTDIR)\ftp.obj" \
+ "$(INTDIR)\globals.obj" \
+ "$(INTDIR)\gopher.obj" \
+ "$(INTDIR)\helper.obj" \
+ "$(INTDIR)\htcp.obj" \
+ "$(INTDIR)\http.obj" \
+ "$(INTDIR)\HttpBody.obj" \
+ "$(INTDIR)\HttpHdrCc.obj" \
+ "$(INTDIR)\HttpHdrContRange.obj" \
+ "$(INTDIR)\HttpHdrRange.obj" \
+ "$(INTDIR)\HttpHeader.obj" \
+ "$(INTDIR)\HttpHeaderTools.obj" \
+ "$(INTDIR)\HttpMsg.obj" \
+ "$(INTDIR)\HttpReply.obj" \
+ "$(INTDIR)\HttpRequest.obj" \
+ "$(INTDIR)\HttpStatusLine.obj" \
+ "$(INTDIR)\icmp.obj" \
+ "$(INTDIR)\icp_v2.obj" \
+ "$(INTDIR)\icp_v3.obj" \
+ "$(INTDIR)\ident.obj" \
+ "$(INTDIR)\internal.obj" \
+ "$(INTDIR)\ipc.obj" \
+ "$(INTDIR)\ipcache.obj" \
+ "$(INTDIR)\leakfinder.obj" \
+ "$(INTDIR)\main.obj" \
+ "$(INTDIR)\mem.obj" \
+ "$(INTDIR)\MemBuf.obj" \
+ "$(INTDIR)\MemPool.obj" \
+ "$(INTDIR)\mime.obj" \
+ "$(INTDIR)\multicast.obj" \
+ "$(INTDIR)\neighbors.obj" \
+ "$(INTDIR)\net_db.obj" \
+ "$(INTDIR)\Packer.obj" \
+ "$(INTDIR)\pconn.obj" \
+ "$(INTDIR)\peer_digest.obj" \
+ "$(INTDIR)\peer_select.obj" \
+ "$(INTDIR)\pump.obj" \
+ "$(INTDIR)\readdir.obj" \
+ "$(INTDIR)\redirect.obj" \
+ "$(INTDIR)\refresh.obj" \
+ "$(INTDIR)\send-announce.obj" \
+ "$(INTDIR)\ssl.obj" \
+ "$(INTDIR)\stat.obj" \
+ "$(INTDIR)\StatHist.obj" \
+ "$(INTDIR)\stmem.obj" \
+ "$(INTDIR)\store.obj" \
+ "$(INTDIR)\store_client.obj" \
+ "$(INTDIR)\store_digest.obj" \
+ "$(INTDIR)\store_dir.obj" \
+ "$(INTDIR)\store_dir_ufs.obj" \
+ "$(INTDIR)\store_io.obj" \
+ "$(INTDIR)\store_io_ufs.obj" \
+ "$(INTDIR)\store_key_md5.obj" \
+ "$(INTDIR)\store_log.obj" \
+ "$(INTDIR)\store_rebuild.obj" \
+ "$(INTDIR)\store_swapin.obj" \
+ "$(INTDIR)\store_swapmeta.obj" \
+ "$(INTDIR)\store_swapout.obj" \
+ "$(INTDIR)\string-arrays.obj" \
+ "$(INTDIR)\String.obj" \
+ "$(INTDIR)\tools.obj" \
+ "$(INTDIR)\unlinkd.obj" \
+ "$(INTDIR)\url.obj" \
+ "$(INTDIR)\urn.obj" \
+ "$(INTDIR)\useragent.obj" \
+ "$(INTDIR)\wais.obj" \
+ "$(INTDIR)\wccp.obj" \
+ "$(INTDIR)\whois.obj" \
+ "$(INTDIR)\win32.obj" \
+ "$(INTDIR)\squid.res" \
+ "..\miscutil\Release\miscutil.lib"
+
+"$(OUTDIR)\squid.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "LDAP_auth - Win32 Release" "dnsserver - Win32 Release" "cf_gen - Win32 Release" "cachemgr - Win32 Release" "NCSA_auth - Win32 Release" "NT_auth - Win32 Release" "miscutil - Win32 Release" "$(OUTDIR)\squid.exe"
+ net stop "SquidNT2.3Stable4 beta"
+ copy d:\work\squidnt23\win\squidnt\release\squid.exe c:\squid23\squid.exe
+ net start "SquidNT2.3Stable4 beta"
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\squid.exe"
+
+!ELSE
+
+ALL : "LDAP_auth - Win32 Debug" "dnsserver - Win32 Debug" "cf_gen - Win32 Debug" "cachemgr - Win32 Debug" "NCSA_auth - Win32 Debug" "NT_auth - Win32 Debug" "miscutil - Win32 Debug" "$(OUTDIR)\squid.exe"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"miscutil - Win32 DebugCLEAN" "NT_auth - Win32 DebugCLEAN" "NCSA_auth - Win32 DebugCLEAN" "cachemgr - Win32 DebugCLEAN" "cf_gen - Win32 DebugCLEAN" "dnsserver - Win32 DebugCLEAN" "LDAP_auth - Win32 DebugCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+ -@erase "$(INTDIR)\access_log.obj"
+ -@erase "$(INTDIR)\acl.obj"
+ -@erase "$(INTDIR)\asn.obj"
+ -@erase "$(INTDIR)\async_io.obj"
+ -@erase "$(INTDIR)\authenticate.obj"
+ -@erase "$(INTDIR)\cache_cf.obj"
+ -@erase "$(INTDIR)\cache_manager.obj"
+ -@erase "$(INTDIR)\CacheDigest.obj"
+ -@erase "$(INTDIR)\carp.obj"
+ -@erase "$(INTDIR)\cbdata.obj"
+ -@erase "$(INTDIR)\client_db.obj"
+ -@erase "$(INTDIR)\client_side.obj"
+ -@erase "$(INTDIR)\comm.obj"
+ -@erase "$(INTDIR)\comm_select.obj"
+ -@erase "$(INTDIR)\debug.obj"
+ -@erase "$(INTDIR)\delay_pools.obj"
+ -@erase "$(INTDIR)\disk.obj"
+ -@erase "$(INTDIR)\dns.obj"
+ -@erase "$(INTDIR)\dns_internal.obj"
+ -@erase "$(INTDIR)\errorpage.obj"
+ -@erase "$(INTDIR)\ETag.obj"
+ -@erase "$(INTDIR)\event.obj"
+ -@erase "$(INTDIR)\fd.obj"
+ -@erase "$(INTDIR)\filemap.obj"
+ -@erase "$(INTDIR)\forward.obj"
+ -@erase "$(INTDIR)\fqdncache.obj"
+ -@erase "$(INTDIR)\ftp.obj"
+ -@erase "$(INTDIR)\globals.obj"
+ -@erase "$(INTDIR)\gopher.obj"
+ -@erase "$(INTDIR)\helper.obj"
+ -@erase "$(INTDIR)\htcp.obj"
+ -@erase "$(INTDIR)\http.obj"
+ -@erase "$(INTDIR)\HttpBody.obj"
+ -@erase "$(INTDIR)\HttpHdrCc.obj"
+ -@erase "$(INTDIR)\HttpHdrContRange.obj"
+ -@erase "$(INTDIR)\HttpHdrRange.obj"
+ -@erase "$(INTDIR)\HttpHeader.obj"
+ -@erase "$(INTDIR)\HttpHeaderTools.obj"
+ -@erase "$(INTDIR)\HttpMsg.obj"
+ -@erase "$(INTDIR)\HttpReply.obj"
+ -@erase "$(INTDIR)\HttpRequest.obj"
+ -@erase "$(INTDIR)\HttpStatusLine.obj"
+ -@erase "$(INTDIR)\icmp.obj"
+ -@erase "$(INTDIR)\icp_v2.obj"
+ -@erase "$(INTDIR)\icp_v3.obj"
+ -@erase "$(INTDIR)\ident.obj"
+ -@erase "$(INTDIR)\internal.obj"
+ -@erase "$(INTDIR)\ipc.obj"
+ -@erase "$(INTDIR)\ipcache.obj"
+ -@erase "$(INTDIR)\leakfinder.obj"
+ -@erase "$(INTDIR)\main.obj"
+ -@erase "$(INTDIR)\mem.obj"
+ -@erase "$(INTDIR)\MemBuf.obj"
+ -@erase "$(INTDIR)\MemPool.obj"
+ -@erase "$(INTDIR)\mime.obj"
+ -@erase "$(INTDIR)\multicast.obj"
+ -@erase "$(INTDIR)\neighbors.obj"
+ -@erase "$(INTDIR)\net_db.obj"
+ -@erase "$(INTDIR)\Packer.obj"
+ -@erase "$(INTDIR)\pconn.obj"
+ -@erase "$(INTDIR)\peer_digest.obj"
+ -@erase "$(INTDIR)\peer_select.obj"
+ -@erase "$(INTDIR)\pump.obj"
+ -@erase "$(INTDIR)\readdir.obj"
+ -@erase "$(INTDIR)\redirect.obj"
+ -@erase "$(INTDIR)\refresh.obj"
+ -@erase "$(INTDIR)\send-announce.obj"
+ -@erase "$(INTDIR)\squid.res"
+ -@erase "$(INTDIR)\ssl.obj"
+ -@erase "$(INTDIR)\stat.obj"
+ -@erase "$(INTDIR)\StatHist.obj"
+ -@erase "$(INTDIR)\stmem.obj"
+ -@erase "$(INTDIR)\store.obj"
+ -@erase "$(INTDIR)\store_client.obj"
+ -@erase "$(INTDIR)\store_digest.obj"
+ -@erase "$(INTDIR)\store_dir.obj"
+ -@erase "$(INTDIR)\store_dir_ufs.obj"
+ -@erase "$(INTDIR)\store_io.obj"
+ -@erase "$(INTDIR)\store_io_ufs.obj"
+ -@erase "$(INTDIR)\store_key_md5.obj"
+ -@erase "$(INTDIR)\store_log.obj"
+ -@erase "$(INTDIR)\store_rebuild.obj"
+ -@erase "$(INTDIR)\store_swapin.obj"
+ -@erase "$(INTDIR)\store_swapmeta.obj"
+ -@erase "$(INTDIR)\store_swapout.obj"
+ -@erase "$(INTDIR)\string-arrays.obj"
+ -@erase "$(INTDIR)\String.obj"
+ -@erase "$(INTDIR)\tools.obj"
+ -@erase "$(INTDIR)\unlinkd.obj"
+ -@erase "$(INTDIR)\url.obj"
+ -@erase "$(INTDIR)\urn.obj"
+ -@erase "$(INTDIR)\useragent.obj"
+ -@erase "$(INTDIR)\vc60.idb"
+ -@erase "$(INTDIR)\vc60.pdb"
+ -@erase "$(INTDIR)\wais.obj"
+ -@erase "$(INTDIR)\wccp.obj"
+ -@erase "$(INTDIR)\whois.obj"
+ -@erase "$(INTDIR)\win32.obj"
+ -@erase "$(OUTDIR)\squid.exe"
+ -@erase "$(OUTDIR)\squid.ilk"
+ -@erase "$(OUTDIR)\squid.pdb"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\squidnt.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\squid.res" /d "_DEBUG"
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\squidnt.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib ws2_32.lib advapi32.lib psapi.lib winwrap.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\squid.pdb" /debug /machine:I386 /out:"$(OUTDIR)\squid.exe" /pdbtype:sept /libpath:"..\\"
+LINK32_OBJS= \
+ "$(INTDIR)\access_log.obj" \
+ "$(INTDIR)\acl.obj" \
+ "$(INTDIR)\asn.obj" \
+ "$(INTDIR)\async_io.obj" \
+ "$(INTDIR)\authenticate.obj" \
+ "$(INTDIR)\cache_cf.obj" \
+ "$(INTDIR)\cache_manager.obj" \
+ "$(INTDIR)\CacheDigest.obj" \
+ "$(INTDIR)\carp.obj" \
+ "$(INTDIR)\cbdata.obj" \
+ "$(INTDIR)\client_db.obj" \
+ "$(INTDIR)\client_side.obj" \
+ "$(INTDIR)\comm.obj" \
+ "$(INTDIR)\comm_select.obj" \
+ "$(INTDIR)\debug.obj" \
+ "$(INTDIR)\delay_pools.obj" \
+ "$(INTDIR)\disk.obj" \
+ "$(INTDIR)\dns.obj" \
+ "$(INTDIR)\dns_internal.obj" \
+ "$(INTDIR)\errorpage.obj" \
+ "$(INTDIR)\ETag.obj" \
+ "$(INTDIR)\event.obj" \
+ "$(INTDIR)\fd.obj" \
+ "$(INTDIR)\filemap.obj" \
+ "$(INTDIR)\forward.obj" \
+ "$(INTDIR)\fqdncache.obj" \
+ "$(INTDIR)\ftp.obj" \
+ "$(INTDIR)\globals.obj" \
+ "$(INTDIR)\gopher.obj" \
+ "$(INTDIR)\helper.obj" \
+ "$(INTDIR)\htcp.obj" \
+ "$(INTDIR)\http.obj" \
+ "$(INTDIR)\HttpBody.obj" \
+ "$(INTDIR)\HttpHdrCc.obj" \
+ "$(INTDIR)\HttpHdrContRange.obj" \
+ "$(INTDIR)\HttpHdrRange.obj" \
+ "$(INTDIR)\HttpHeader.obj" \
+ "$(INTDIR)\HttpHeaderTools.obj" \
+ "$(INTDIR)\HttpMsg.obj" \
+ "$(INTDIR)\HttpReply.obj" \
+ "$(INTDIR)\HttpRequest.obj" \
+ "$(INTDIR)\HttpStatusLine.obj" \
+ "$(INTDIR)\icmp.obj" \
+ "$(INTDIR)\icp_v2.obj" \
+ "$(INTDIR)\icp_v3.obj" \
+ "$(INTDIR)\ident.obj" \
+ "$(INTDIR)\internal.obj" \
+ "$(INTDIR)\ipc.obj" \
+ "$(INTDIR)\ipcache.obj" \
+ "$(INTDIR)\leakfinder.obj" \
+ "$(INTDIR)\main.obj" \
+ "$(INTDIR)\mem.obj" \
+ "$(INTDIR)\MemBuf.obj" \
+ "$(INTDIR)\MemPool.obj" \
+ "$(INTDIR)\mime.obj" \
+ "$(INTDIR)\multicast.obj" \
+ "$(INTDIR)\neighbors.obj" \
+ "$(INTDIR)\net_db.obj" \
+ "$(INTDIR)\Packer.obj" \
+ "$(INTDIR)\pconn.obj" \
+ "$(INTDIR)\peer_digest.obj" \
+ "$(INTDIR)\peer_select.obj" \
+ "$(INTDIR)\pump.obj" \
+ "$(INTDIR)\readdir.obj" \
+ "$(INTDIR)\redirect.obj" \
+ "$(INTDIR)\refresh.obj" \
+ "$(INTDIR)\send-announce.obj" \
+ "$(INTDIR)\ssl.obj" \
+ "$(INTDIR)\stat.obj" \
+ "$(INTDIR)\StatHist.obj" \
+ "$(INTDIR)\stmem.obj" \
+ "$(INTDIR)\store.obj" \
+ "$(INTDIR)\store_client.obj" \
+ "$(INTDIR)\store_digest.obj" \
+ "$(INTDIR)\store_dir.obj" \
+ "$(INTDIR)\store_dir_ufs.obj" \
+ "$(INTDIR)\store_io.obj" \
+ "$(INTDIR)\store_io_ufs.obj" \
+ "$(INTDIR)\store_key_md5.obj" \
+ "$(INTDIR)\store_log.obj" \
+ "$(INTDIR)\store_rebuild.obj" \
+ "$(INTDIR)\store_swapin.obj" \
+ "$(INTDIR)\store_swapmeta.obj" \
+ "$(INTDIR)\store_swapout.obj" \
+ "$(INTDIR)\string-arrays.obj" \
+ "$(INTDIR)\String.obj" \
+ "$(INTDIR)\tools.obj" \
+ "$(INTDIR)\unlinkd.obj" \
+ "$(INTDIR)\url.obj" \
+ "$(INTDIR)\urn.obj" \
+ "$(INTDIR)\useragent.obj" \
+ "$(INTDIR)\wais.obj" \
+ "$(INTDIR)\wccp.obj" \
+ "$(INTDIR)\whois.obj" \
+ "$(INTDIR)\win32.obj" \
+ "$(INTDIR)\squid.res" \
+ "..\miscutil\Debug\miscutil.lib"
+
+"$(OUTDIR)\squid.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "LDAP_auth - Win32 Debug" "dnsserver - Win32 Debug" "cf_gen - Win32 Debug" "cachemgr - Win32 Debug" "NCSA_auth - Win32 Debug" "NT_auth - Win32 Debug" "miscutil - Win32 Debug" "$(OUTDIR)\squid.exe"
+ net stop "SquidNT2.3Stable4 beta"
+ copy d:\work\squidnt23\win\squidnt\debug\squid.exe c:\squid23\squid.exe
+ copy d:\work\squidnt23\auth_modules\NT\debug\nt_auth.dll c:\squid23\nt_auth.dll
+ copy d:\work\squidnt23\auth_modules\NCSA\debug\ncsa_auth.dll c:\squid23\ncsa_auth.dll
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF
+
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("squidnt.dep")
+!INCLUDE "squidnt.dep"
+!ELSE
+!MESSAGE Warning: cannot find "squidnt.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "squidnt - Win32 Release" || "$(CFG)" == "squidnt - Win32 Debug"
+SOURCE=..\..\src\access_log.c
+
+"$(INTDIR)\access_log.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\acl.c
+
+"$(INTDIR)\acl.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\asn.c
+
+"$(INTDIR)\asn.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\async_io.c
+
+"$(INTDIR)\async_io.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\authenticate.c
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+CPP_SWITCHES=/nologo /G6 /MT /W4 /vmg /GX /O2 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\squidnt.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+"$(INTDIR)\authenticate.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) @<<
+ $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+CPP_SWITCHES=/nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\squidnt.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+"$(INTDIR)\authenticate.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) @<<
+ $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ENDIF
+
+SOURCE=..\..\src\cache_cf.c
+
+"$(INTDIR)\cache_cf.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\cache_manager.c
+
+"$(INTDIR)\cache_manager.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\CacheDigest.c
+
+"$(INTDIR)\CacheDigest.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\carp.c
+
+"$(INTDIR)\carp.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\cbdata.c
+
+"$(INTDIR)\cbdata.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\client_db.c
+
+"$(INTDIR)\client_db.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\client_side.c
+
+"$(INTDIR)\client_side.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\comm.c
+
+"$(INTDIR)\comm.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\comm_select.c
+
+"$(INTDIR)\comm_select.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\debug.c
+
+"$(INTDIR)\debug.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\delay_pools.c
+
+"$(INTDIR)\delay_pools.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\disk.c
+
+"$(INTDIR)\disk.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\dns.c
+
+"$(INTDIR)\dns.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\dns_internal.c
+
+"$(INTDIR)\dns_internal.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\errorpage.c
+
+"$(INTDIR)\errorpage.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\ETag.c
+
+"$(INTDIR)\ETag.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\event.c
+
+"$(INTDIR)\event.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\fd.c
+
+"$(INTDIR)\fd.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\filemap.c
+
+"$(INTDIR)\filemap.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\forward.c
+
+"$(INTDIR)\forward.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\fqdncache.c
+
+"$(INTDIR)\fqdncache.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\ftp.c
+
+"$(INTDIR)\ftp.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\globals.c
+
+"$(INTDIR)\globals.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\gopher.c
+
+"$(INTDIR)\gopher.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\helper.c
+
+"$(INTDIR)\helper.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\htcp.c
+
+"$(INTDIR)\htcp.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\http.c
+
+"$(INTDIR)\http.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\HttpBody.c
+
+"$(INTDIR)\HttpBody.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\HttpHdrCc.c
+
+"$(INTDIR)\HttpHdrCc.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\HttpHdrContRange.c
+
+"$(INTDIR)\HttpHdrContRange.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\HttpHdrRange.c
+
+"$(INTDIR)\HttpHdrRange.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\HttpHeader.c
+
+"$(INTDIR)\HttpHeader.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\HttpHeaderTools.c
+
+"$(INTDIR)\HttpHeaderTools.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\HttpMsg.c
+
+"$(INTDIR)\HttpMsg.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\HttpReply.c
+
+"$(INTDIR)\HttpReply.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\HttpRequest.c
+
+"$(INTDIR)\HttpRequest.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\HttpStatusLine.c
+
+"$(INTDIR)\HttpStatusLine.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\icmp.c
+
+"$(INTDIR)\icmp.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\icp_v2.c
+
+"$(INTDIR)\icp_v2.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\icp_v3.c
+
+"$(INTDIR)\icp_v3.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\ident.c
+
+"$(INTDIR)\ident.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\internal.c
+
+"$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\ipc.c
+
+"$(INTDIR)\ipc.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\ipcache.c
+
+"$(INTDIR)\ipcache.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\leakfinder.c
+
+"$(INTDIR)\leakfinder.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\main.c
+
+"$(INTDIR)\main.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\mem.c
+
+"$(INTDIR)\mem.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\MemBuf.c
+
+"$(INTDIR)\MemBuf.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\MemPool.c
+
+"$(INTDIR)\MemPool.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\mime.c
+
+"$(INTDIR)\mime.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\multicast.c
+
+"$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\neighbors.c
+
+"$(INTDIR)\neighbors.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\net_db.c
+
+"$(INTDIR)\net_db.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\Packer.c
+
+"$(INTDIR)\Packer.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\pconn.c
+
+"$(INTDIR)\pconn.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\peer_digest.c
+
+"$(INTDIR)\peer_digest.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\peer_select.c
+
+"$(INTDIR)\peer_select.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\pump.c
+
+"$(INTDIR)\pump.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\readdir.c
+
+"$(INTDIR)\readdir.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\redirect.c
+
+"$(INTDIR)\redirect.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\refresh.c
+
+"$(INTDIR)\refresh.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\src\send-announce.c"
+
+"$(INTDIR)\send-announce.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\ssl.c
+
+"$(INTDIR)\ssl.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\stat.c
+
+"$(INTDIR)\stat.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\StatHist.c
+
+"$(INTDIR)\StatHist.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\stmem.c
+
+"$(INTDIR)\stmem.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store.c
+
+"$(INTDIR)\store.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_client.c
+
+"$(INTDIR)\store_client.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_digest.c
+
+"$(INTDIR)\store_digest.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_dir.c
+
+"$(INTDIR)\store_dir.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_dir_ufs.c
+
+"$(INTDIR)\store_dir_ufs.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_io.c
+
+"$(INTDIR)\store_io.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_io_ufs.c
+
+"$(INTDIR)\store_io_ufs.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_key_md5.c
+
+"$(INTDIR)\store_key_md5.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_log.c
+
+"$(INTDIR)\store_log.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_rebuild.c
+
+"$(INTDIR)\store_rebuild.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_swapin.c
+
+"$(INTDIR)\store_swapin.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_swapmeta.c
+
+"$(INTDIR)\store_swapmeta.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\store_swapout.c
+
+"$(INTDIR)\store_swapout.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\src\string-arrays.c"
+
+"$(INTDIR)\string-arrays.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\String.c
+
+"$(INTDIR)\String.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\tools.c
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+CPP_SWITCHES=/nologo /G6 /MT /W4 /vmg /GX /O2 /Ob2 /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\squidnt.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+
+"$(INTDIR)\tools.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) @<<
+ $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+CPP_SWITCHES=/nologo /G6 /MTd /W4 /Gm /GX /ZI /Od /I "../../include" /I "../" /I "../../src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\squidnt.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+
+"$(INTDIR)\tools.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) @<<
+ $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ENDIF
+
+SOURCE=..\..\src\unlinkd.c
+
+"$(INTDIR)\unlinkd.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\url.c
+
+"$(INTDIR)\url.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\urn.c
+
+"$(INTDIR)\urn.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\useragent.c
+
+"$(INTDIR)\useragent.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\wais.c
+
+"$(INTDIR)\wais.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\wccp.c
+
+"$(INTDIR)\wccp.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\whois.c
+
+"$(INTDIR)\whois.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\src\win32.c
+
+"$(INTDIR)\win32.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\squid.rc
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+
+"$(INTDIR)\squid.res" : $(SOURCE) "$(INTDIR)"
+ $(RSC) /l 0x409 /fo"$(INTDIR)\squid.res" /i "\work\squidnt23\win" /d "NDEBUG" $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+
+"$(INTDIR)\squid.res" : $(SOURCE) "$(INTDIR)"
+ $(RSC) /l 0x409 /fo"$(INTDIR)\squid.res" /i "\work\squidnt23\win" /d "_DEBUG" $(SOURCE)
+
+
+!ENDIF
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+"miscutil - Win32 Release" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release"
+ cd "..\squidnt"
+
+"miscutil - Win32 ReleaseCLEAN" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Release" RECURSE=1 CLEAN
+ cd "..\squidnt"
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+"miscutil - Win32 Debug" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug"
+ cd "..\squidnt"
+
+"miscutil - Win32 DebugCLEAN" :
+ cd "\work\squidnt23\win\miscutil"
+ $(MAKE) /$(MAKEFLAGS) /F .\miscutil.mak CFG="miscutil - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\squidnt"
+
+!ENDIF
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+!ENDIF
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+"NT_auth - Win32 Release" :
+ cd "\work\squidnt23\auth_modules\NT"
+ $(MAKE) /$(MAKEFLAGS) /F .\NT_auth.mak CFG="NT_auth - Win32 Release"
+ cd "..\..\win\squidnt"
+
+"NT_auth - Win32 ReleaseCLEAN" :
+ cd "\work\squidnt23\auth_modules\NT"
+ $(MAKE) /$(MAKEFLAGS) /F .\NT_auth.mak CFG="NT_auth - Win32 Release" RECURSE=1 CLEAN
+ cd "..\..\win\squidnt"
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+"NT_auth - Win32 Debug" :
+ cd "\work\squidnt23\auth_modules\NT"
+ $(MAKE) /$(MAKEFLAGS) /F .\NT_auth.mak CFG="NT_auth - Win32 Debug"
+ cd "..\..\win\squidnt"
+
+"NT_auth - Win32 DebugCLEAN" :
+ cd "\work\squidnt23\auth_modules\NT"
+ $(MAKE) /$(MAKEFLAGS) /F .\NT_auth.mak CFG="NT_auth - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\..\win\squidnt"
+
+!ENDIF
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+"NCSA_auth - Win32 Release" :
+ cd "\work\squidnt23\auth_modules\NCSA"
+ $(MAKE) /$(MAKEFLAGS) /F .\NCSA_auth.mak CFG="NCSA_auth - Win32 Release"
+ cd "..\..\win\squidnt"
+
+"NCSA_auth - Win32 ReleaseCLEAN" :
+ cd "\work\squidnt23\auth_modules\NCSA"
+ $(MAKE) /$(MAKEFLAGS) /F .\NCSA_auth.mak CFG="NCSA_auth - Win32 Release" RECURSE=1 CLEAN
+ cd "..\..\win\squidnt"
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+"NCSA_auth - Win32 Debug" :
+ cd "\work\squidnt23\auth_modules\NCSA"
+ $(MAKE) /$(MAKEFLAGS) /F .\NCSA_auth.mak CFG="NCSA_auth - Win32 Debug"
+ cd "..\..\win\squidnt"
+
+"NCSA_auth - Win32 DebugCLEAN" :
+ cd "\work\squidnt23\auth_modules\NCSA"
+ $(MAKE) /$(MAKEFLAGS) /F .\NCSA_auth.mak CFG="NCSA_auth - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\..\win\squidnt"
+
+!ENDIF
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+"cachemgr - Win32 Release" :
+ cd "\work\squidnt23\win\cachemgr"
+ $(MAKE) /$(MAKEFLAGS) /F .\cachemgr.mak CFG="cachemgr - Win32 Release"
+ cd "..\squidnt"
+
+"cachemgr - Win32 ReleaseCLEAN" :
+ cd "\work\squidnt23\win\cachemgr"
+ $(MAKE) /$(MAKEFLAGS) /F .\cachemgr.mak CFG="cachemgr - Win32 Release" RECURSE=1 CLEAN
+ cd "..\squidnt"
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+"cachemgr - Win32 Debug" :
+ cd "\work\squidnt23\win\cachemgr"
+ $(MAKE) /$(MAKEFLAGS) /F .\cachemgr.mak CFG="cachemgr - Win32 Debug"
+ cd "..\squidnt"
+
+"cachemgr - Win32 DebugCLEAN" :
+ cd "\work\squidnt23\win\cachemgr"
+ $(MAKE) /$(MAKEFLAGS) /F .\cachemgr.mak CFG="cachemgr - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\squidnt"
+
+!ENDIF
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+"cf_gen - Win32 Release" :
+ cd "\work\squidnt23\win\cf_gen"
+ $(MAKE) /$(MAKEFLAGS) /F .\cf_gen.mak CFG="cf_gen - Win32 Release"
+ cd "..\squidnt"
+
+"cf_gen - Win32 ReleaseCLEAN" :
+ cd "\work\squidnt23\win\cf_gen"
+ $(MAKE) /$(MAKEFLAGS) /F .\cf_gen.mak CFG="cf_gen - Win32 Release" RECURSE=1 CLEAN
+ cd "..\squidnt"
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+"cf_gen - Win32 Debug" :
+ cd "\work\squidnt23\win\cf_gen"
+ $(MAKE) /$(MAKEFLAGS) /F .\cf_gen.mak CFG="cf_gen - Win32 Debug"
+ cd "..\squidnt"
+
+"cf_gen - Win32 DebugCLEAN" :
+ cd "\work\squidnt23\win\cf_gen"
+ $(MAKE) /$(MAKEFLAGS) /F .\cf_gen.mak CFG="cf_gen - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\squidnt"
+
+!ENDIF
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+"dnsserver - Win32 Release" :
+ cd "\work\squidnt23\win\dnsserver"
+ $(MAKE) /$(MAKEFLAGS) /F .\dnsserver.mak CFG="dnsserver - Win32 Release"
+ cd "..\squidnt"
+
+"dnsserver - Win32 ReleaseCLEAN" :
+ cd "\work\squidnt23\win\dnsserver"
+ $(MAKE) /$(MAKEFLAGS) /F .\dnsserver.mak CFG="dnsserver - Win32 Release" RECURSE=1 CLEAN
+ cd "..\squidnt"
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+"dnsserver - Win32 Debug" :
+ cd "\work\squidnt23\win\dnsserver"
+ $(MAKE) /$(MAKEFLAGS) /F .\dnsserver.mak CFG="dnsserver - Win32 Debug"
+ cd "..\squidnt"
+
+"dnsserver - Win32 DebugCLEAN" :
+ cd "\work\squidnt23\win\dnsserver"
+ $(MAKE) /$(MAKEFLAGS) /F .\dnsserver.mak CFG="dnsserver - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\squidnt"
+
+!ENDIF
+
+!IF "$(CFG)" == "squidnt - Win32 Release"
+
+"LDAP_auth - Win32 Release" :
+ cd "\work\squidnt23\auth_modules\LDAP"
+ $(MAKE) /$(MAKEFLAGS) /F .\LDAP_auth.mak CFG="LDAP_auth - Win32 Release"
+ cd "..\..\win\squidnt"
+
+"LDAP_auth - Win32 ReleaseCLEAN" :
+ cd "\work\squidnt23\auth_modules\LDAP"
+ $(MAKE) /$(MAKEFLAGS) /F .\LDAP_auth.mak CFG="LDAP_auth - Win32 Release" RECURSE=1 CLEAN
+ cd "..\..\win\squidnt"
+
+!ELSEIF "$(CFG)" == "squidnt - Win32 Debug"
+
+"LDAP_auth - Win32 Debug" :
+ cd "\work\squidnt23\auth_modules\LDAP"
+ $(MAKE) /$(MAKEFLAGS) /F .\LDAP_auth.mak CFG="LDAP_auth - Win32 Debug"
+ cd "..\..\win\squidnt"
+
+"LDAP_auth - Win32 DebugCLEAN" :
+ cd "\work\squidnt23\auth_modules\LDAP"
+ $(MAKE) /$(MAKEFLAGS) /F .\LDAP_auth.mak CFG="LDAP_auth - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\..\win\squidnt"
+
+!ENDIF
+
+
+!ENDIF
+