diff -ruN squid-2.6.STABLE3/CONTRIBUTORS squid-2.6.STABLE4/CONTRIBUTORS --- squid-2.6.STABLE3/CONTRIBUTORS Wed Jun 7 18:00:48 2006 +++ squid-2.6.STABLE4/CONTRIBUTORS Sat Sep 9 09:41:45 2006 @@ -82,7 +82,8 @@ Sergio Rabellino Ian Turner Moez Mahfoudh - Guido Serassio + Guido Serassio + Andrey Shorin Miquel van Smoorenburg Brian Ian Castle diff -ruN squid-2.6.STABLE3/ChangeLog squid-2.6.STABLE4/ChangeLog --- squid-2.6.STABLE3/ChangeLog Fri Aug 18 15:31:01 2006 +++ squid-2.6.STABLE4/ChangeLog Fri Sep 22 05:10:14 2006 @@ -1,4 +1,43 @@ -Changes to squid-2.5.STABLE3 (Aug 18 2006) +Changes to squid-2.6.STABLE4 (Sep 22 2006) + + - Bug #1736: Missing Italian translation of ERR_TOO_BIG error page + - Windows port enhancement: added native exception handler with signal emulation + - Fix the %un log_format tag again. Got broken in 2.6.STABLE2 + - Fix Squid crash when using %a in ERR_INVALID_REQ and ERR_INVALID_URL error messages. + - Bug #212: variable %i always 0.0.0.0 in many error pages + - Bug #1708: Ports in ACL accepts characters and out of range + - Bug #1706: Squid time acl accepts invalid time range. + - Fix another harmless fake_auth compiler warning on gcc 4.1.1 x86 + - Fix an harmless snmp_core.c compiler warning on gcc 4.1.1 x86 + - Bug #1744: squid-2.6.STABLE3 - fakeauth_auth crashing on certain requests + - Bug #1746: Harmless off by one overrun in ncsa_auth md5 password validation + - Bug #1598: start_announce cannot be disabled + - Periodically flush cache.log to disk when "buffered_logs on" is set + - Numerous COSS improvements and fixes + - Windows port: merge of MinGW support + - Windows port: Merged Windows threads support into aufs + - Bug #1759: Windows port cachemgr.cgi attempts to write to file system root directory + - Numerous portability fixes + - Various minor statistics cleanup on 64-bit hosts with more than 4GB of memory + - Bug #1758: HEAD on ftp:// URLs always returned 200 OK. + - Bug #1760: FTP related memory leak + - Bug #1770: WCCP2 weighted assignment + - Bug #1768: Redundant DNS PTR lookups + - Bug #1696: Add support for wccpv2 mask assignment + - Bug #1774: ncsa_auth support for cramfs timestamps + - Bug #1769: near-hit and filedescriptor usage missing in SNMP MIB + - Bug #1725: cache_peer login=PASS documentation somewhat confusing + - Bug #1590: Silence those ETag loop warnings + - Bug #1740: Squid crashes on certain malformed HTTP responses + - Bug #1699: assertion failed: authenticate.c:836: "auth_user_request != NULL" + - Improve error reporting on unexpected CONNECT requests in accelerator mode + - Cosmetic change to increase cache.log detail level on invalid requests + - Bug #1229: http_port and other directives accept invalid ports + - Reject http_port specifications using both transparent and accelerator options + - Cosmetic cleanup to not dump stacktraces on configuration errors + + +Changes to squid-2.6.STABLE3 (Aug 18 2006) - Bug #1577: assertion failed "fm->max_n_files <= (1 << 24)" on very large cache_dir. Limit number of objects stored to slightly diff -ruN squid-2.6.STABLE3/Makefile.in squid-2.6.STABLE4/Makefile.in --- squid-2.6.STABLE3/Makefile.in Mon Jun 12 00:09:41 2006 +++ squid-2.6.STABLE4/Makefile.in Fri Sep 22 03:09:34 2006 @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.45 2006/06/12 06:09:41 hno Exp $ +# $Id: Makefile.in,v 1.48 2006/09/22 09:09:34 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -110,6 +110,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -150,6 +152,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -187,6 +191,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -204,6 +210,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/RELEASENOTES.html squid-2.6.STABLE4/RELEASENOTES.html --- squid-2.6.STABLE3/RELEASENOTES.html Fri Aug 18 15:33:10 2006 +++ squid-2.6.STABLE4/RELEASENOTES.html Sat Sep 23 11:50:05 2006 @@ -7,7 +7,7 @@

Squid 2.6 release notes

-

Squid Developers

$Id: release-2.6.html,v 1.28 2006/08/18 21:30:10 hno Exp $ +

Squid Developers

$Id: release-2.6.html,v 1.35 2006/09/22 11:10:14 hno Exp $
This document contains the release notes for version 2.6 of Squid. Squid is a WWW Cache application developed by the Web Caching community. @@ -36,6 +36,9 @@

8. Key changes squid-2.6.STABLE2 to 2.6.STABLE3

+

+

9. Key changes squid-2.6.STABLE3 to 2.6.STABLE4

+

1. Key changes from squid 2.5

@@ -152,6 +155,7 @@
wccp2_*

WCCP2 protocol support

minimum_expiry_time

tune the magic 60 seconds limit of what is considered cachable when the object doesn't have any cache validators. (2.6.STABLE2)

wccp2_rebuild_wait

make Squid delay registering with a WCCP router until store rebuild have finished. Default on. (2.6.STABLE2)

+
wccp2_weight

Cache server load weigth in the cluster. (2.6.STABLE4)

@@ -216,9 +220,9 @@

6. Windows support

-

This Squid version can run on Windows as a system service using the Cygwin environment.
-Windows NT 4 and later are supported.
-On Windows 2000/XP/2003 the service is configured to use the Windows Service Recovery option +

This Squid version can run on Windows as a system service using the Cygwin emulation environment, +or can be compiled in Windows native mode using the MinGW + MSYS development environment. Windows NT 4 SP4 and later are supported.
+On Windows 2000 and later the service is configured to use the Windows Service Recovery option restarting automatically after 60 seconds.

@@ -262,6 +266,24 @@

+
PSAPI.DLL (Process Status Helper) Considerations

The process status helper functions make it easier for you to obtain information about +processes and device drivers running on Microsoft® Windows NT®/Windows® 2000. These +functions are available in PSAPI.DLL, which is distributed in the Microsoft® Platform +Software Development Kit (SDK). The same information is generally available through the +performance data in the registry, but it is more difficult to get to it. PSAPI.DLL is +freely redistributable.

+

PSAPI.DLL is available only on Windows NT, 2000, XP and 2003. The implementation in Squid is +aware of this, and try to use it only on the right platform.

+

On Windows NT PSAPI.DLL can be found as component of many applications, if you need it, +you can find it on Windows NT Resource KIT. If you have problem, it can be +downloaded from here: +http://download.microsoft.com/download/platformsdk/Redist/4.0.1371.1/NT4/EN-US/psinst.EXE

+

On Windows 2000 and later it is available installing the Windows Support Tools, located on the +Support\Tools folder of the installation Windows CD-ROM.

+
+

+

+

Registry DNS lookup

On Windows platforms, if no value is specified in the dns_nameservers option on squid.conf or in the /etc/resolv.conf file, the list of DNS name servers are taken from the Windows registry, both static and dynamic DHCP configurations @@ -293,6 +315,7 @@

  • When Squid runs in command line mode, the launching user account must have administrative privilege on the system
  • "Start parameters" in the Windows 2000/XP/2003 Service applet cannot be used
    • +
  • Building with MinGW, when the configure option --enable-truncate is used, Squid cannot run on Windows NT, only Windows 2000 and later are supported

    • @@ -310,11 +333,77 @@
  • Some code sections can make blocking calls.
  • Some external helpers may not work.
    • +
  • File Descriptors number hard-limited to 2048 when building with MinGW.
    • + +

    +
    +

    +

    +

    +
    Building Squid on Windows:

    A reasonably recent release of Cygwin or MinGW is needed. Like other Unix/Linux environments, -devel version of libraries must be installed.
    +When running configure, --disable-wccp and --disable-wccpv2 options should always specified to avoid compile errors.
    +

      +
    • New configure options:
      +
        +
      • --enable-win32-service
        • +
      +
      • +
    • Updated configure options:
      +
        +
      • --enable-arp-acl
        • +
      • --enable-default-hostsfile
        • +
      +
      • +
    • Unsupported configure options:
      +
        +
      • --enable-coss-aio-ops: On Cygwin Posix AIO is not available
        • +
      +
      • +
    +

    +
    +

    +

    +

    +
    Using cache manager on Windows:

    On Windows, cache manager (cachemgr.cgi) can be used with Microsoft IIS or Apache.
    +Some specific configuration could be needed:
    +

      +
    • IIS 6 (Windows 2003):
      +
        +
      • On IIS 6.0 all CGI extensions are denied by default for security reason, so the following configuration is needed:
        +
          +
        • Create a cgi-bin Directory
          • +
        • Define the cgi-bin IIS Virtual Directory with read and CGI execute IIS +permissions, ASP scripts are not needed. This automatically defines a +cgi-bin IIS web application
          • +
        • Copy cachemgr.cgi into cgi-bin directory and look to file permissions: +the IIS system account and SYSTEM must be able to read and execute the file
          • +
        • In IIS manager go to Web Service extensions and add a new Web Service +Extension called "Squid Cachemgr", add the cachemgr.cgi file and set the +extension status to Allowed
          • +
        +
        • +
      +
      • +
    • Apache:
      +
        +
      • On Windows, cachemgr.cgi needs to create a temporary file, so Apache must be instructed +to pass the TMP and TEMP Windows environment variables to CGI applications:
        +
        +ScriptAlias /squid/cgi-bin/ "c:/squid/libexec/"
+<Location /squid/cgi-bin/cachemgr.cgi>
+    PassEnv TMP TEMP
+    Order allow,deny
+    Allow from workstation.example.com
+</Location>
+
        +
        • +
      +

    -

    7. Key changes squid-2.6.STABLE1 to 2.6.STABLE2

    @@ -339,7 +428,7 @@
  • Bug #1703: Wrong default path to the diskd helper causing hangs at 100% CPU
  • Bug #1685: Crashes or other odd results after storeSwapMetaUnpack: errors
  • a number of other minor and cosmetic bugfixes. See the list of -squid-2.6 changes and the +squid-2.6.STABLE2 changes and the ChangeLog file for details.

    • @@ -364,12 +453,31 @@
  • Fixed some assertion failures and segmentation faults
  • Some small optimizations to reduce CPU usage
  • a number of other minor and cosmetic bugfixes. See the list of -squid-2.6 changes and the +squid-2.6.STABLE3 changes and the ChangeLog file for details.

    • +

    9. Key changes squid-2.6.STABLE3 to 2.6.STABLE4

    + +

    +

      +
    • New wccp2_weight directive
      • +
    • Numeros COSS fixes and improvements
      • +
    • Support for WCCP2 hash based assignment and weighted assignments
      • +
    • Windows port update
      • +
    • Many small fixes to better detect invalid configurations
      • +
    • Bug #1760: FTP related memory leak
      • +
    • SNMP mib updates for some minor missing details
      • +
    • Bug #1590: Silence those harmless ETag loop warnings
      • +
    • Bug #1740: Squid crashes on certain malformed HTTP responses
      • +
    • Bug #1699: assertion failed: authenticate.c:836: "auth_user_request != NULL"
      • +
    • a number of other minor and cosmetic bugfixes. See the list of +squid-2.6.STABLE4 changes and the +ChangeLog file for details.
      • +
    +

    diff -ruN squid-2.6.STABLE3/SPONSORS squid-2.6.STABLE4/SPONSORS --- squid-2.6.STABLE3/SPONSORS Fri Apr 28 04:17:14 2006 +++ squid-2.6.STABLE4/SPONSORS Sun Sep 3 19:53:48 2006 @@ -41,3 +41,12 @@ webwasher AG paid for improvements to Squid's iCAP client implementation. You can find the results of this work at http://devel.squid-cache.org/icap/ + +iiNet Ltd - http://www.iinet.net.au/ + + iiNet Ltd contributed significant development resources to + Squid during its early stages and was instrumental in its + early adoption in the local internet community. iiNet has also + recently supplied equipment to help develop and test the WCCPv2 + implementation in Squid-2.6 and Squid-3. + diff -ruN squid-2.6.STABLE3/configure squid-2.6.STABLE4/configure --- squid-2.6.STABLE3/configure Fri Aug 18 15:32:54 2006 +++ squid-2.6.STABLE4/configure Sat Sep 23 11:49:33 2006 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.392 . +# From configure.in Revision: 1.402 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Squid Web Proxy 2.6.STABLE3. +# Generated by GNU Autoconf 2.59 for Squid Web Proxy 2.6.STABLE4. # # Report bugs to . # @@ -270,8 +270,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='2.6.STABLE3' -PACKAGE_STRING='Squid Web Proxy 2.6.STABLE3' +PACKAGE_VERSION='2.6.STABLE4' +PACKAGE_STRING='Squid Web Proxy 2.6.STABLE4' PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/' ac_default_prefix=/usr/local/squid @@ -312,7 +312,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKGCONFIG CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_MODULES NEED_DISKD_TRUE NEED_DISKD_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB EPOLL_LIBS USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os PKGCONFIG CGIEXT ENABLE_WIN32SPECIFIC_TRUE ENABLE_WIN32SPECIFIC_FALSE ENABLE_MINGW32SPECIFIC_TRUE ENABLE_MINGW32SPECIFIC_FALSE WIN32_PSAPI CACHE_HTTP_PORT CACHE_ICP_PORT LIBDLMALLOC LIB_MALLOC STORE_OBJS STORE_LIBS STORE_MODULES NEED_DISKD_TRUE NEED_DISKD_FALSE USE_AIOPS_WIN32_TRUE USE_AIOPS_WIN32_FALSE NEED_COSSDUMP_TRUE NEED_COSSDUMP_FALSE REPL_POLICIES REPL_OBJS REPL_LIBS ENABLE_PINGER_TRUE ENABLE_PINGER_FALSE USE_DELAY_POOLS_TRUE USE_DELAY_POOLS_FALSE USE_SNMP_TRUE USE_SNMP_FALSE SNMPLIB makesnmplib ENABLE_HTCP_TRUE ENABLE_HTCP_FALSE ENABLE_SSL_TRUE ENABLE_SSL_FALSE NEED_OWN_MD5_TRUE NEED_OWN_MD5_FALSE SSLLIB ERR_DEFAULT_LANGUAGE ERR_LANGUAGES MAKE_LEAKFINDER_TRUE MAKE_LEAKFINDER_FALSE USE_DNSSERVER_TRUE USE_DNSSERVER_FALSE OPT_DEFAULT_HOSTS AUTH_MODULES AUTH_OBJS AUTH_LIBS BASIC_AUTH_HELPERS NTLM_AUTH_HELPERS DIGEST_AUTH_HELPERS NEGOTIATE_AUTH_HELPERS EXTERNAL_ACL_HELPERS CPP EGREP LIBSASL ENABLE_UNLINKD_TRUE ENABLE_UNLINKD_FALSE RANLIB ac_ct_RANLIB LN_S SH FALSE TRUE RM MV MKDIR LN PERL AR AR_R ALLOCA CRYPTLIB LIB_EPOLL LIB_LDAP LIB_LBER LIB_DB EPOLL_LIBS USE_POLL_TRUE USE_POLL_FALSE USE_EPOLL_TRUE USE_EPOLL_FALSE USE_SELECT_TRUE USE_SELECT_FALSE USE_SELECT_WIN32_TRUE USE_SELECT_WIN32_FALSE USE_KQUEUE_TRUE USE_KQUEUE_FALSE NEED_OWN_SNPRINTF_TRUE NEED_OWN_SNPRINTF_FALSE NEED_OWN_STRSEP_TRUE NEED_OWN_STRSEP_FALSE REGEXLIB LIBREGEX LIBOBJS XTRA_OBJS XTRA_LIBS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -781,7 +781,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Squid Web Proxy 2.6.STABLE3 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 2.6.STABLE4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -847,7 +847,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE3:";; + short | recursive ) echo "Configuration of Squid Web Proxy 2.6.STABLE4:";; esac cat <<\_ACEOF @@ -1155,7 +1155,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 2.6.STABLE3 +Squid Web Proxy configure 2.6.STABLE4 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1169,7 +1169,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Squid Web Proxy $as_me 2.6.STABLE3, which was +It was created by Squid Web Proxy $as_me 2.6.STABLE4, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1815,7 +1815,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='2.6.STABLE3' + VERSION='2.6.STABLE4' cat >>confdefs.h <<_ACEOF @@ -3324,6 +3324,85 @@ ;; esac +case "$host_os" in +mingw|mingw32) + + +if true; then + ENABLE_MINGW32SPECIFIC_TRUE= + ENABLE_MINGW32SPECIFIC_FALSE='#' +else + ENABLE_MINGW32SPECIFIC_TRUE='#' + ENABLE_MINGW32SPECIFIC_FALSE= +fi + + # Extract the first word of "psapi.dll", so it can be a program name with args. +set dummy psapi.dll; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_WIN32_PSAPI+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $WIN32_PSAPI in + [\\/]* | ?:[\\/]*) + ac_cv_path_WIN32_PSAPI="$WIN32_PSAPI" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_WIN32_PSAPI="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_WIN32_PSAPI" && ac_cv_path_WIN32_PSAPI="none" + ;; +esac +fi +WIN32_PSAPI=$ac_cv_path_WIN32_PSAPI + +if test -n "$WIN32_PSAPI"; then + echo "$as_me:$LINENO: result: $WIN32_PSAPI" >&5 +echo "${ECHO_T}$WIN32_PSAPI" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CFLAGS="$CFLAGS -mthreads" + if test "$ac_cv_path_WIN32_PSAPI" = "none"; then + echo "PSAPI.DLL is recommended to run Squid on Windows Platform" + echo "Please see PSAPI.DLL section on doc/release-notes/release-2.6.html." + else + +cat >>confdefs.h <<\_ACEOF +#define HAVE_WIN32_PSAPI 1 +_ACEOF + + LIBS="$LIBS -lpsapi" + fi + ;; +*) + + +if false; then + ENABLE_MINGW32SPECIFIC_TRUE= + ENABLE_MINGW32SPECIFIC_FALSE='#' +else + ENABLE_MINGW32SPECIFIC_TRUE='#' + ENABLE_MINGW32SPECIFIC_FALSE= +fi + + ;; +esac + if test -z "$CACHE_HTTP_PORT"; then CACHE_HTTP_PORT="3128" fi @@ -3509,7 +3588,6 @@ -valgrind= # Check whether --with-valgrind-debug or --without-valgrind-debug was given. if test "${with_valgrind_debug+set}" = set; then @@ -3537,7 +3615,6 @@ fi; -valgrind= # Check whether --enable-mempool-debug or --disable-mempool-debug was given. if test "${enable_mempool_debug+set}" = set; then enableval="$enable_mempool_debug" @@ -3689,6 +3766,8 @@ fi; echo "Store modules built: $STORE_MODULES" NEED_DISKD=0 +USE_AIOPS_WIN32=0 +NEED_COSSDUMP=0 STORE_OBJS="fs/lib`echo $STORE_MODULES|sed -e 's% %.a fs/lib%g'`.a" STORE_LIBS="`echo $STORE_OBJS|sed -e 's%fs/%%g'`" @@ -3701,11 +3780,20 @@ ;; aufs) if test -z "$with_pthreads"; then - echo "aufs store used, pthreads support automatically enabled" - with_pthreads=yes + case "$host_os" in + mingw|mingw32) + USE_AIOPS_WIN32=1 + echo "aufs store used, Windows threads support automatically enabled" + ;; + *) + echo "aufs store used, pthreads support automatically enabled" + with_pthreads=yes + ;; + esac fi ;; coss) + NEED_COSSDUMP=1 if test -z "$with_aio"; then echo "coss store used, aio support automatically enabled" with_aio=yes @@ -3725,6 +3813,26 @@ fi + +if test "$USE_AIOPS_WIN32" = 1; then + USE_AIOPS_WIN32_TRUE= + USE_AIOPS_WIN32_FALSE='#' +else + USE_AIOPS_WIN32_TRUE='#' + USE_AIOPS_WIN32_FALSE= +fi + + + +if test "$NEED_COSSDUMP" = 1; then + NEED_COSSDUMP_TRUE= + NEED_COSSDUMP_FALSE='#' +else + NEED_COSSDUMP_TRUE='#' + NEED_COSSDUMP_FALSE= +fi + + # Check whether --enable-heap-replacement or --disable-heap-replacement was given. if test "${enable_heap_replacement+set}" = set; then enableval="$enable_heap_replacement" @@ -7161,6 +7269,8 @@ + + for ac_header in sys/types.h \ stddef.h \ limits.h \ @@ -7198,6 +7308,7 @@ openssl/md5.h \ openssl/ssl.h \ openssl/engine.h \ + paths.h \ poll.h \ pwd.h \ regex.h \ @@ -7239,6 +7350,7 @@ nss.h \ db.h \ db_185.h \ + aio.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -8130,13 +8242,23 @@ fi -echo "$as_me:$LINENO: checking for struct rusage" >&5 +case "$host_os" in + mingw|mingw32) + cat >>confdefs.h <<\_ACEOF +#define HAVE_STRUCT_RUSAGE 1 +_ACEOF + + ac_cv_func_getrusage='yes' + echo "Using own rusage on Windows." + ;; + *) + echo "$as_me:$LINENO: checking for struct rusage" >&5 echo $ECHO_N "checking for struct rusage... $ECHO_C" >&6 if test "${ac_cv_have_struct_rusage+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8191,13 +8313,15 @@ fi echo "$as_me:$LINENO: result: $ac_cv_have_struct_rusage" >&5 echo "${ECHO_T}$ac_cv_have_struct_rusage" >&6 -if test $ac_cv_have_struct_rusage = "yes" ; then + if test $ac_cv_have_struct_rusage = "yes" ; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRUCT_RUSAGE 1 _ACEOF -fi + fi + ;; +esac echo "$as_me:$LINENO: checking for ip->ip_hl" >&5 echo $ECHO_N "checking for ip->ip_hl... $ECHO_C" >&6 @@ -15713,6 +15837,12 @@ esac fi +case "$host_os" in +mingw|mingw32) + ac_cv_func_statfs='yes' + ;; +esac + @@ -17040,6 +17170,11 @@ fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +case "$host_os" in +mingw|mingw32) + SQUID_MAXFD="2048" + ;; +esac echo "$as_me:$LINENO: result: $SQUID_MAXFD" >&5 echo "${ECHO_T}$SQUID_MAXFD" >&6 fi # --with-maxfd SQUID_MAXFD @@ -17824,6 +17959,20 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${ENABLE_MINGW32SPECIFIC_TRUE}" && test -z "${ENABLE_MINGW32SPECIFIC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MINGW32SPECIFIC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ENABLE_MINGW32SPECIFIC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${ENABLE_MINGW32SPECIFIC_TRUE}" && test -z "${ENABLE_MINGW32SPECIFIC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MINGW32SPECIFIC\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"ENABLE_MINGW32SPECIFIC\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${NEED_DISKD_TRUE}" && test -z "${NEED_DISKD_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"NEED_DISKD\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -17831,6 +17980,20 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${USE_AIOPS_WIN32_TRUE}" && test -z "${USE_AIOPS_WIN32_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"USE_AIOPS_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"USE_AIOPS_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${NEED_COSSDUMP_TRUE}" && test -z "${NEED_COSSDUMP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"NEED_COSSDUMP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"NEED_COSSDUMP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${ENABLE_PINGER_TRUE}" && test -z "${ENABLE_PINGER_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"ENABLE_PINGER\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -18291,7 +18454,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by Squid Web Proxy $as_me 2.6.STABLE3, which was +This file was extended by Squid Web Proxy $as_me 2.6.STABLE4, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18354,7 +18517,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Squid Web Proxy config.status 2.6.STABLE3 +Squid Web Proxy config.status 2.6.STABLE4 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -18648,6 +18811,9 @@ s,@CGIEXT@,$CGIEXT,;t t s,@ENABLE_WIN32SPECIFIC_TRUE@,$ENABLE_WIN32SPECIFIC_TRUE,;t t s,@ENABLE_WIN32SPECIFIC_FALSE@,$ENABLE_WIN32SPECIFIC_FALSE,;t t +s,@ENABLE_MINGW32SPECIFIC_TRUE@,$ENABLE_MINGW32SPECIFIC_TRUE,;t t +s,@ENABLE_MINGW32SPECIFIC_FALSE@,$ENABLE_MINGW32SPECIFIC_FALSE,;t t +s,@WIN32_PSAPI@,$WIN32_PSAPI,;t t s,@CACHE_HTTP_PORT@,$CACHE_HTTP_PORT,;t t s,@CACHE_ICP_PORT@,$CACHE_ICP_PORT,;t t s,@LIBDLMALLOC@,$LIBDLMALLOC,;t t @@ -18657,6 +18823,10 @@ s,@STORE_MODULES@,$STORE_MODULES,;t t s,@NEED_DISKD_TRUE@,$NEED_DISKD_TRUE,;t t s,@NEED_DISKD_FALSE@,$NEED_DISKD_FALSE,;t t +s,@USE_AIOPS_WIN32_TRUE@,$USE_AIOPS_WIN32_TRUE,;t t +s,@USE_AIOPS_WIN32_FALSE@,$USE_AIOPS_WIN32_FALSE,;t t +s,@NEED_COSSDUMP_TRUE@,$NEED_COSSDUMP_TRUE,;t t +s,@NEED_COSSDUMP_FALSE@,$NEED_COSSDUMP_FALSE,;t t s,@REPL_POLICIES@,$REPL_POLICIES,;t t s,@REPL_OBJS@,$REPL_OBJS,;t t s,@REPL_LIBS@,$REPL_LIBS,;t t diff -ruN squid-2.6.STABLE3/configure.in squid-2.6.STABLE4/configure.in --- squid-2.6.STABLE3/configure.in Fri Aug 18 15:32:54 2006 +++ squid-2.6.STABLE4/configure.in Sat Sep 23 11:49:33 2006 @@ -1,16 +1,16 @@ dnl dnl Configuration input file for Squid dnl -dnl $Id: configure.in,v 1.392 2006/08/18 21:31:01 hno Exp $ +dnl $Id: configure.in,v 1.402 2006/09/22 11:10:14 hno Exp $ dnl dnl dnl -AC_INIT(Squid Web Proxy, 2.6.STABLE3, http://www.squid-cache.org/bugs/, squid) +AC_INIT(Squid Web Proxy, 2.6.STABLE4, http://www.squid-cache.org/bugs/, squid) AC_PREREQ(2.52) AM_CONFIG_HEADER(include/autoconf.h) AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE -AC_REVISION($Revision: 1.392 $)dnl +AC_REVISION($Revision: 1.402 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -58,6 +58,24 @@ ;; esac +case "$host_os" in +mingw|mingw32) + AM_CONDITIONAL(ENABLE_MINGW32SPECIFIC, true) + AC_PATH_PROG(WIN32_PSAPI, psapi.dll, none) + CFLAGS="$CFLAGS -mthreads" + if test "$ac_cv_path_WIN32_PSAPI" = "none"; then + echo "PSAPI.DLL is recommended to run Squid on Windows Platform" + echo "Please see PSAPI.DLL section on doc/release-notes/release-2.6.html." + else + AC_DEFINE(HAVE_WIN32_PSAPI,1,[Define if you have PSAPI.DLL on Windows systems]) + LIBS="$LIBS -lpsapi" + fi + ;; +*) + AM_CONDITIONAL(ENABLE_MINGW32SPECIFIC, false) + ;; +esac + if test -z "$CACHE_HTTP_PORT"; then CACHE_HTTP_PORT="3128" fi @@ -252,7 +270,6 @@ dnl fi dnl ]) -valgrind= AC_ARG_WITH(valgrind-debug, [ --with-valgrind-debug Include debug instrumentation for use with valgrind], [ case $withval in @@ -273,7 +290,6 @@ fi ]) -valgrind= AC_ARG_ENABLE(mempool-debug, [ --enable-mempool-debug Include MemPool debug verifications]) if test "$enable_mempool_debug" = yes; then @@ -394,6 +410,8 @@ ]) echo "Store modules built: $STORE_MODULES" NEED_DISKD=0 +USE_AIOPS_WIN32=0 +NEED_COSSDUMP=0 STORE_OBJS="fs/lib`echo $STORE_MODULES|sed -e 's% %.a fs/lib%g'`.a" AC_SUBST(STORE_OBJS) STORE_LIBS="`echo $STORE_OBJS|sed -e 's%fs/%%g'`" @@ -407,11 +425,20 @@ ;; aufs) if test -z "$with_pthreads"; then - echo "aufs store used, pthreads support automatically enabled" - with_pthreads=yes + case "$host_os" in + mingw|mingw32) + USE_AIOPS_WIN32=1 + echo "aufs store used, Windows threads support automatically enabled" + ;; + *) + echo "aufs store used, pthreads support automatically enabled" + with_pthreads=yes + ;; + esac fi ;; coss) + NEED_COSSDUMP=1 if test -z "$with_aio"; then echo "coss store used, aio support automatically enabled" with_aio=yes @@ -421,6 +448,8 @@ done AC_SUBST(STORE_MODULES) AM_CONDITIONAL([NEED_DISKD], [test "$NEED_DISKD" = 1]) +AM_CONDITIONAL([USE_AIOPS_WIN32], [test "$USE_AIOPS_WIN32" = 1]) +AM_CONDITIONAL([NEED_COSSDUMP], [test "$NEED_COSSDUMP" = 1]) dnl --enable-heap-replacement compatibility option AC_ARG_ENABLE(heap-replacement, @@ -1551,6 +1580,7 @@ openssl/md5.h \ openssl/ssl.h \ openssl/engine.h \ + paths.h \ poll.h \ pwd.h \ regex.h \ @@ -1592,6 +1622,7 @@ nss.h \ db.h \ db_185.h \ + aio.h \ ,,,[ #if HAVE_SYS_TYPES_H #include @@ -1739,21 +1770,30 @@ AC_DEFINE(HAVE_EXT_MALLINFO, 1, [Define if struct mallinfo has mxfast member]) fi -AC_CACHE_CHECK(for struct rusage,ac_cv_have_struct_rusage, [ - AC_TRY_COMPILE([ +case "$host_os" in + mingw|mingw32) + AC_DEFINE(HAVE_STRUCT_RUSAGE) + ac_cv_func_getrusage='yes' + echo "Using own rusage on Windows." + ;; + *) + AC_CACHE_CHECK(for struct rusage,ac_cv_have_struct_rusage, [ + AC_TRY_COMPILE([ #if HAVE_SYS_TIME_H #include #endif #if HAVE_SYS_RESOURCE_H #include #endif], - [struct rusage R;], - ac_cv_have_struct_rusage="yes", - ac_cv_have_struct_rusage="no") + [struct rusage R;], + ac_cv_have_struct_rusage="yes", + ac_cv_have_struct_rusage="no") ]) -if test $ac_cv_have_struct_rusage = "yes" ; then - AC_DEFINE(HAVE_STRUCT_RUSAGE, 1, [Define if you have struct rusage]) -fi + if test $ac_cv_have_struct_rusage = "yes" ; then + AC_DEFINE(HAVE_STRUCT_RUSAGE, 1, [Define if you have struct rusage]) + fi + ;; +esac AC_CACHE_CHECK(for ip->ip_hl, ac_cv_have_ip_hl, [ AC_TRY_COMPILE([#include @@ -2227,6 +2267,13 @@ esac fi +dnl Override statfs detect on MinGW because is emulated in source code +case "$host_os" in +mingw|mingw32) + ac_cv_func_statfs='yes' + ;; +esac + dnl Check for library functions AC_CHECK_FUNCS(\ bcopy \ @@ -2711,6 +2758,12 @@ SQUID_MAXFD=`cat conftestval`, SQUID_MAXFD=256, SQUID_MAXFD=256) +dnl Microsoft MSVCRT.DLL supports 2048 maximum FDs +case "$host_os" in +mingw|mingw32) + SQUID_MAXFD="2048" + ;; +esac AC_MSG_RESULT($SQUID_MAXFD) fi # --with-maxfd SQUID_MAXFD AC_DEFINE_UNQUOTED(SQUID_MAXFD, $SQUID_MAXFD, [Maximum number of open filedescriptors]) diff -ruN squid-2.6.STABLE3/contrib/Makefile.in squid-2.6.STABLE4/contrib/Makefile.in --- squid-2.6.STABLE3/contrib/Makefile.in Mon Jun 12 00:09:42 2006 +++ squid-2.6.STABLE4/contrib/Makefile.in Fri Sep 22 03:09:34 2006 @@ -87,6 +87,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -127,6 +129,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -164,6 +168,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -181,6 +187,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/doc/Makefile.in squid-2.6.STABLE4/doc/Makefile.in --- squid-2.6.STABLE3/doc/Makefile.in Mon Jun 12 00:09:42 2006 +++ squid-2.6.STABLE4/doc/Makefile.in Fri Sep 22 03:09:36 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.26 2006/06/12 06:09:42 hno Exp $ +# $Id: Makefile.in,v 1.29 2006/09/22 09:09:36 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -94,6 +94,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -134,6 +136,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -171,6 +175,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -188,6 +194,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/errors/Italian/ERR_TOO_BIG squid-2.6.STABLE4/errors/Italian/ERR_TOO_BIG --- squid-2.6.STABLE3/errors/Italian/ERR_TOO_BIG Tue May 17 10:56:15 2005 +++ squid-2.6.STABLE4/errors/Italian/ERR_TOO_BIG Sat Aug 19 02:54:44 2006 @@ -1,28 +1,28 @@ -ERROR: The requested URL could not be retrieved +ERRORE: La URL richiesta non può essere recuperata -

    ERROR

    -

    The requested URL could not be retrieved

    +

    ERRORE

    +

    La URL richiesta non può essere recuperata

    -While trying to retrieve the URL: +Mentre si cercava di recuperare la URL: %U

    -The following error was encountered: +È avvenuto il seguente errore:

    • -The request or reply is too large. +La richiesta o la risposta è troppo grande.

      -If you are making a POST or PUT request, then your request body -(the thing you are trying to upload) is too large. If you are -making a GET request, then the reply body (what you are trying -to download) is too large. These limits have been established -by the Internet Service Provider who operates this cache. Please -contact them directly if you feel this is an error. +Se state eseguendo una richiesta POST o PUT, allora il corpo della richiesta +(l'oggetto di cui state tendando l'upload) è troppo grande. Se state +eseguendo una richiesta GET, allora il corpo della risposta (l'oggetto di cui +state tendando il download) è troppo grande. Questi limiti sono stati +impostati dal gestore di questa cache. Se ritenete che questo sia un errore +siete pregati di contattarlo direttamente.

    -Your cache administrator is %w. +L'amministratore di questa cache è %w. diff -ruN squid-2.6.STABLE3/errors/Makefile.in squid-2.6.STABLE4/errors/Makefile.in --- squid-2.6.STABLE3/errors/Makefile.in Mon Jun 12 00:09:43 2006 +++ squid-2.6.STABLE4/errors/Makefile.in Fri Sep 22 03:09:37 2006 @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.42 2006/06/12 06:09:43 hno Exp $ +# $Id: Makefile.in,v 1.45 2006/09/22 09:09:37 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -86,6 +86,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -126,6 +128,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -163,6 +167,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -180,6 +186,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/Makefile.in squid-2.6.STABLE4/helpers/Makefile.in --- squid-2.6.STABLE3/helpers/Makefile.in Mon Jun 12 00:09:43 2006 +++ squid-2.6.STABLE4/helpers/Makefile.in Fri Sep 22 03:09:38 2006 @@ -91,6 +91,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -131,6 +133,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -168,6 +172,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -185,6 +191,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/basic_auth/LDAP/Makefile.in squid-2.6.STABLE4/helpers/basic_auth/LDAP/Makefile.in --- squid-2.6.STABLE3/helpers/basic_auth/LDAP/Makefile.in Mon Jun 12 00:09:44 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/LDAP/Makefile.in Fri Sep 22 03:09:39 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.34 2006/06/12 06:09:44 hno Exp $ +# $Id: Makefile.in,v 1.37 2006/09/22 09:09:39 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -113,6 +113,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -153,6 +155,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -190,6 +194,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -207,6 +213,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/basic_auth/LDAP/squid_ldap_auth.c squid-2.6.STABLE4/helpers/basic_auth/LDAP/squid_ldap_auth.c --- squid-2.6.STABLE3/helpers/basic_auth/LDAP/squid_ldap_auth.c Tue May 23 12:44:21 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/LDAP/squid_ldap_auth.c Fri Sep 1 12:26:25 2006 @@ -89,6 +89,7 @@ #include #include #include +#include #ifdef _SQUID_MSWIN_ /* Native Windows port and MinGW */ @@ -119,7 +120,6 @@ #include #include -#include #endif diff -ruN squid-2.6.STABLE3/helpers/basic_auth/MSNT/Makefile.in squid-2.6.STABLE4/helpers/basic_auth/MSNT/Makefile.in --- squid-2.6.STABLE3/helpers/basic_auth/MSNT/Makefile.in Mon Jun 12 00:09:45 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/MSNT/Makefile.in Fri Sep 22 03:09:39 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.37 2006/06/12 06:09:45 hno Exp $ +# $Id: Makefile.in,v 1.40 2006/09/22 09:09:39 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -122,6 +122,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -162,6 +164,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -199,6 +203,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -216,6 +222,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/basic_auth/Makefile.in squid-2.6.STABLE4/helpers/basic_auth/Makefile.in --- squid-2.6.STABLE3/helpers/basic_auth/Makefile.in Mon Jun 12 00:09:43 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/Makefile.in Fri Sep 22 03:09:39 2006 @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.33 2006/06/12 06:09:43 hno Exp $ +# $Id: Makefile.in,v 1.36 2006/09/22 09:09:39 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -95,6 +95,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -135,6 +137,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -172,6 +176,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -189,6 +195,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/basic_auth/NCSA/Makefile.in squid-2.6.STABLE4/helpers/basic_auth/NCSA/Makefile.in --- squid-2.6.STABLE3/helpers/basic_auth/NCSA/Makefile.in Fri Jun 23 18:12:39 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/NCSA/Makefile.in Fri Sep 22 03:09:40 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.34 2006/06/24 00:12:39 hno Exp $ +# $Id: Makefile.in,v 1.37 2006/09/22 09:09:40 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -113,6 +113,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -153,6 +155,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -190,6 +194,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -207,6 +213,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/basic_auth/NCSA/crypt_md5.c squid-2.6.STABLE4/helpers/basic_auth/NCSA/crypt_md5.c --- squid-2.6.STABLE3/helpers/basic_auth/NCSA/crypt_md5.c Thu Jun 22 19:03:58 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/NCSA/crypt_md5.c Wed Aug 30 12:16:08 2006 @@ -186,7 +186,7 @@ for(idx=0;idx<16;idx++) sprintf(&sum[idx*2],"%02x",digest[idx]); - sum[33]='\0'; + sum[32]='\0'; /* Don't leave anything around in vm they could use. */ memset(digest, 0, sizeof digest); diff -ruN squid-2.6.STABLE3/helpers/basic_auth/NCSA/ncsa_auth.c squid-2.6.STABLE4/helpers/basic_auth/NCSA/ncsa_auth.c --- squid-2.6.STABLE3/helpers/basic_auth/NCSA/ncsa_auth.c Thu Jun 22 19:03:58 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/NCSA/ncsa_auth.c Thu Sep 21 20:18:00 2006 @@ -105,7 +105,7 @@ main(int argc, char **argv) { struct stat sb; - time_t change_time = 0; + time_t change_time = -1; char buf[256]; char *user, *passwd, *p; user_data *u; diff -ruN squid-2.6.STABLE3/helpers/basic_auth/PAM/Makefile.in squid-2.6.STABLE4/helpers/basic_auth/PAM/Makefile.in --- squid-2.6.STABLE3/helpers/basic_auth/PAM/Makefile.in Mon Jun 12 00:09:47 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/PAM/Makefile.in Fri Sep 22 03:09:40 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid PAM authentication helper # -# $Id: Makefile.in,v 1.33 2006/06/12 06:09:47 hno Exp $ +# $Id: Makefile.in,v 1.36 2006/09/22 09:09:40 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -112,6 +112,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -152,6 +154,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -189,6 +193,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -206,6 +212,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/basic_auth/SASL/Makefile.in squid-2.6.STABLE4/helpers/basic_auth/SASL/Makefile.in --- squid-2.6.STABLE3/helpers/basic_auth/SASL/Makefile.in Mon Jun 12 00:09:48 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/SASL/Makefile.in Fri Sep 22 03:09:40 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid SASL authentication helper # -# $Id: Makefile.in,v 1.30 2006/06/12 06:09:48 hno Exp $ +# $Id: Makefile.in,v 1.33 2006/09/22 09:09:40 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -109,6 +109,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -149,6 +151,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -186,6 +190,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -203,6 +209,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/basic_auth/SMB/Makefile.in squid-2.6.STABLE4/helpers/basic_auth/SMB/Makefile.in --- squid-2.6.STABLE3/helpers/basic_auth/SMB/Makefile.in Mon Jun 12 00:09:48 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/SMB/Makefile.in Fri Sep 22 03:09:41 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.33 2006/06/12 06:09:48 hno Exp $ +# $Id: Makefile.in,v 1.36 2006/09/22 09:09:41 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -118,6 +118,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -158,6 +160,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -195,6 +199,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -212,6 +218,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/basic_auth/YP/Makefile.in squid-2.6.STABLE4/helpers/basic_auth/YP/Makefile.in --- squid-2.6.STABLE3/helpers/basic_auth/YP/Makefile.in Mon Jun 12 00:09:50 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/YP/Makefile.in Fri Sep 22 03:09:41 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.34 2006/06/12 06:09:50 hno Exp $ +# $Id: Makefile.in,v 1.37 2006/09/22 09:09:41 hno Exp $ # # @@ -108,6 +108,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -148,6 +150,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -185,6 +189,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -202,6 +208,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/basic_auth/getpwnam/Makefile.in squid-2.6.STABLE4/helpers/basic_auth/getpwnam/Makefile.in --- squid-2.6.STABLE3/helpers/basic_auth/getpwnam/Makefile.in Mon Jun 12 00:09:51 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/getpwnam/Makefile.in Fri Sep 22 03:09:41 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.32 2006/06/12 06:09:51 hno Exp $ +# $Id: Makefile.in,v 1.35 2006/09/22 09:09:41 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -110,6 +110,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -150,6 +152,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -187,6 +191,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -204,6 +210,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/basic_auth/mswin_sspi/Makefile.in squid-2.6.STABLE4/helpers/basic_auth/mswin_sspi/Makefile.in --- squid-2.6.STABLE3/helpers/basic_auth/mswin_sspi/Makefile.in Mon Jun 12 00:09:53 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/mswin_sspi/Makefile.in Fri Sep 22 03:09:41 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.6 2006/06/12 06:09:53 hno Exp $ +# $Id: Makefile.in,v 1.9 2006/09/22 09:09:41 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -109,6 +109,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -149,6 +151,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -186,6 +190,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -203,6 +209,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/basic_auth/mswin_sspi/valid.c squid-2.6.STABLE4/helpers/basic_auth/mswin_sspi/valid.c --- squid-2.6.STABLE3/helpers/basic_auth/mswin_sspi/valid.c Sat May 27 02:58:28 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/mswin_sspi/valid.c Sun Sep 17 03:23:50 2006 @@ -49,11 +49,11 @@ Valid_Group(char *UserName, char *Group) { int result = FALSE; - WCHAR wszUserName[256]; // Unicode user name + WCHAR wszUserName[256]; /* Unicode user name */ - WCHAR wszGroup[256]; // Unicode Group + WCHAR wszGroup[256]; /* Unicode Group */ - LPLOCALGROUP_USERS_INFO_0 pBuf = NULL; + LPLOCALGROUP_USERS_INFO_0 pBuf; LPLOCALGROUP_USERS_INFO_0 pTmpBuf; DWORD dwLevel = 0; DWORD dwFlags = LG_INCLUDE_INDIRECT; @@ -63,6 +63,7 @@ NET_API_STATUS nStatus; DWORD i; DWORD dwTotalCount = 0; + LPBYTE pBufTmp = NULL; /* Convert ANSI User Name and Group to Unicode */ @@ -84,7 +85,11 @@ wszUserName, dwLevel, dwFlags, - (LPBYTE *) & pBuf, dwPrefMaxLen, &dwEntriesRead, &dwTotalEntries); + &pBufTmp, + dwPrefMaxLen, + &dwEntriesRead, + &dwTotalEntries); + pBuf = (LPLOCALGROUP_USERS_INFO_0) pBufTmp; /* * If the call succeeds, */ @@ -126,7 +131,7 @@ int result = NTV_SERVER_ERROR; size_t i; char NTDomain[256]; - char *domain_qualify; + char *domain_qualify = NULL; char DomainUser[256]; char User[256]; diff -ruN squid-2.6.STABLE3/helpers/basic_auth/multi-domain-NTLM/Makefile.in squid-2.6.STABLE4/helpers/basic_auth/multi-domain-NTLM/Makefile.in --- squid-2.6.STABLE3/helpers/basic_auth/multi-domain-NTLM/Makefile.in Mon Jun 12 00:09:53 2006 +++ squid-2.6.STABLE4/helpers/basic_auth/multi-domain-NTLM/Makefile.in Fri Sep 22 03:09:42 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.30 2006/06/12 06:09:53 hno Exp $ +# $Id: Makefile.in,v 1.33 2006/09/22 09:09:42 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -94,6 +94,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -134,6 +136,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -171,6 +175,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -188,6 +194,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/digest_auth/Makefile.in squid-2.6.STABLE4/helpers/digest_auth/Makefile.in --- squid-2.6.STABLE3/helpers/digest_auth/Makefile.in Mon Jun 12 00:09:53 2006 +++ squid-2.6.STABLE4/helpers/digest_auth/Makefile.in Fri Sep 22 03:09:42 2006 @@ -16,7 +16,7 @@ # Makefile for digest auth helpers in the Squid Object Cache server # -# $Id: Makefile.in,v 1.30 2006/06/12 06:09:53 hno Exp $ +# $Id: Makefile.in,v 1.33 2006/09/22 09:09:42 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -95,6 +95,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -135,6 +137,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -172,6 +176,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -189,6 +195,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/digest_auth/ldap/Makefile.in squid-2.6.STABLE4/helpers/digest_auth/ldap/Makefile.in --- squid-2.6.STABLE3/helpers/digest_auth/ldap/Makefile.in Mon Jun 12 00:09:53 2006 +++ squid-2.6.STABLE4/helpers/digest_auth/ldap/Makefile.in Fri Sep 22 03:09:43 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.11 2006/06/12 06:09:53 hno Exp $ +# $Id: Makefile.in,v 1.14 2006/09/22 09:09:43 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -112,6 +112,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -152,6 +154,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -189,6 +193,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -206,6 +212,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/digest_auth/password/Makefile.in squid-2.6.STABLE4/helpers/digest_auth/password/Makefile.in --- squid-2.6.STABLE3/helpers/digest_auth/password/Makefile.in Mon Jun 12 00:09:55 2006 +++ squid-2.6.STABLE4/helpers/digest_auth/password/Makefile.in Fri Sep 22 03:09:43 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.32 2006/06/12 06:09:55 hno Exp $ +# $Id: Makefile.in,v 1.35 2006/09/22 09:09:43 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -111,6 +111,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -151,6 +153,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -188,6 +192,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -205,6 +211,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/external_acl/Makefile.in squid-2.6.STABLE4/helpers/external_acl/Makefile.in --- squid-2.6.STABLE3/helpers/external_acl/Makefile.in Mon Jun 12 00:09:55 2006 +++ squid-2.6.STABLE4/helpers/external_acl/Makefile.in Fri Sep 22 03:09:43 2006 @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.20 2006/06/12 06:09:55 hno Exp $ +# $Id: Makefile.in,v 1.23 2006/09/22 09:09:43 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -95,6 +95,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -135,6 +137,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -172,6 +176,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -189,6 +195,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/external_acl/ip_user/Makefile.in squid-2.6.STABLE4/helpers/external_acl/ip_user/Makefile.in --- squid-2.6.STABLE3/helpers/external_acl/ip_user/Makefile.in Mon Jun 12 00:09:55 2006 +++ squid-2.6.STABLE4/helpers/external_acl/ip_user/Makefile.in Fri Sep 22 03:09:43 2006 @@ -17,7 +17,7 @@ # # Makefile for the ip_user external_acl helper by Rodrigo Campos # -# $Id: Makefile.in,v 1.19 2006/06/12 06:09:55 hno Exp $ +# $Id: Makefile.in,v 1.22 2006/09/22 09:09:43 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -109,6 +109,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -149,6 +151,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -186,6 +190,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -203,6 +209,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/external_acl/ldap_group/Makefile.in squid-2.6.STABLE4/helpers/external_acl/ldap_group/Makefile.in --- squid-2.6.STABLE3/helpers/external_acl/ldap_group/Makefile.in Mon Jun 12 00:09:59 2006 +++ squid-2.6.STABLE4/helpers/external_acl/ldap_group/Makefile.in Fri Sep 22 03:09:44 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.20 2006/06/12 06:09:59 hno Exp $ +# $Id: Makefile.in,v 1.23 2006/09/22 09:09:44 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -114,6 +114,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -154,6 +156,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -191,6 +195,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -208,6 +214,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/external_acl/mswin_lm_group/Makefile.in squid-2.6.STABLE4/helpers/external_acl/mswin_lm_group/Makefile.in --- squid-2.6.STABLE3/helpers/external_acl/mswin_lm_group/Makefile.in Mon Jun 12 00:09:59 2006 +++ squid-2.6.STABLE4/helpers/external_acl/mswin_lm_group/Makefile.in Fri Sep 22 03:09:44 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.5 2006/06/12 06:09:59 hno Exp $ +# $Id: Makefile.in,v 1.8 2006/09/22 09:09:44 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -109,6 +109,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -149,6 +151,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -186,6 +190,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -203,6 +209,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/external_acl/mswin_lm_group/win32_check_group.c squid-2.6.STABLE4/helpers/external_acl/mswin_lm_group/win32_check_group.c --- squid-2.6.STABLE3/helpers/external_acl/mswin_lm_group/win32_check_group.c Wed Jul 5 09:22:56 2006 +++ squid-2.6.STABLE4/helpers/external_acl/mswin_lm_group/win32_check_group.c Sun Sep 17 03:23:51 2006 @@ -135,10 +135,11 @@ LSA_HANDLE PolicyHandle; LSA_OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS status; - PPOLICY_PRIMARY_DOMAIN_INFO ppdiDomainInfo; + PPOLICY_PRIMARY_DOMAIN_INFO ppdiDomainInfo = NULL; PWKSTA_INFO_100 pwkiWorkstationInfo; DWORD netret; char *DomainName = NULL; + LPBYTE pwkiWorkstationInfoTmp; /* * Always initialize the object attributes to all zeroes. @@ -152,7 +153,8 @@ * The wki100_computername field contains a pointer to a UNICODE * string containing the local computer name. */ - netret = NetWkstaGetInfo(NULL, 100, (LPBYTE *) & pwkiWorkstationInfo); + netret = NetWkstaGetInfo(NULL, 100, &pwkiWorkstationInfoTmp); + pwkiWorkstationInfo = (PWKSTA_INFO_100) pwkiWorkstationInfoTmp; if (netret == NERR_Success) { /* * We have the workstation name in: @@ -174,6 +176,7 @@ if (status) { debug("OpenPolicy Error: %ld\n", status); } else { + PVOID ppdiDomainInfoTmp; /* * You have a handle to the policy object. Now, get the @@ -181,7 +184,8 @@ */ status = LsaQueryInformationPolicy(PolicyHandle, PolicyPrimaryDomainInformation, - (PVOID *) & ppdiDomainInfo); + &ppdiDomainInfoTmp); + ppdiDomainInfo = (PPOLICY_PRIMARY_DOMAIN_INFO) ppdiDomainInfoTmp; if (status) { debug("LsaQueryInformationPolicy Error: %ld\n", status); } else { @@ -218,7 +222,7 @@ } /* returns 0 on match, -1 if no match */ -static int +static int wcstrcmparray(const wchar_t * str, const char **array) { WCHAR wszGroup[GNLEN + 1]; // Unicode Group @@ -242,7 +246,7 @@ char *Domain_Separator; WCHAR wszUserName[UNLEN + 1]; // Unicode user name - LPLOCALGROUP_USERS_INFO_0 pBuf = NULL; + LPLOCALGROUP_USERS_INFO_0 pBuf; LPLOCALGROUP_USERS_INFO_0 pTmpBuf; DWORD dwLevel = 0; DWORD dwFlags = LG_INCLUDE_INDIRECT; @@ -252,6 +256,7 @@ NET_API_STATUS nStatus; DWORD i; DWORD dwTotalCount = 0; + LPBYTE pBufTmp = NULL; if ((Domain_Separator = strchr(UserName, '/')) != NULL) *Domain_Separator = '\\'; @@ -271,15 +276,15 @@ * function should also return the names of the local * groups in which the user is indirectly a member. */ - nStatus = NetUserGetLocalGroups( - NULL, + nStatus = NetUserGetLocalGroups(NULL, wszUserName, dwLevel, dwFlags, - (LPBYTE *) & pBuf, + &pBufTmp, dwPrefMaxLen, &dwEntriesRead, &dwTotalEntries); + pBuf = (LPLOCALGROUP_USERS_INFO_0) pBufTmp; /* * If the call succeeds, */ @@ -322,7 +327,7 @@ WCHAR wszUserDomain[DNLEN + 1]; // Unicode User Domain char NTDomain[DNLEN + UNLEN + 2]; - char *domain_qualify; + char *domain_qualify = NULL; char User[UNLEN + 1]; size_t j; @@ -330,7 +335,7 @@ LPWSTR UsrDCptr = NULL; LPGROUP_USERS_INFO_0 pUsrBuf = NULL; LPGROUP_USERS_INFO_0 pTmpBuf; - LPSERVER_INFO_101 pSrvBuf = NULL; + LPSERVER_INFO_101 pSrvBuf; DWORD dwLevel = 0; DWORD dwPrefMaxLen = -1; DWORD dwEntriesRead = 0; @@ -338,6 +343,7 @@ NET_API_STATUS nStatus; DWORD i; DWORD dwTotalCount = 0; + LPBYTE pBufTmp = NULL; strncpy(NTDomain, UserName, sizeof(NTDomain)); @@ -367,7 +373,8 @@ /* Call the NetServerGetInfo function for local computer, specifying level 101. */ dwLevel = 101; - nStatus = NetServerGetInfo(NULL, dwLevel, (LPBYTE *) & pSrvBuf); + nStatus = NetServerGetInfo(NULL, dwLevel, &pBufTmp); + pSrvBuf = (LPSERVER_INFO_101) pBufTmp; if (nStatus == NERR_Success) { /* Check if we are running on a Domain Controller */ @@ -375,8 +382,11 @@ (pSrvBuf->sv101_type & SV_TYPE_DOMAIN_BAKCTRL)) { LclDCptr = NULL; debug("Running on a DC.\n"); - } else - nStatus = (use_PDC_only ? NetGetDCName(NULL, wszLocalDomain, (LPBYTE *) & LclDCptr) : NetGetAnyDCName(NULL, wszLocalDomain, (LPBYTE *) & LclDCptr)); + } else { + pBufTmp = NULL; + nStatus = (use_PDC_only ? NetGetDCName(NULL, wszLocalDomain, &pBufTmp) : NetGetAnyDCName(NULL, wszLocalDomain, &pBufTmp)); + LclDCptr = (LPWSTR) pBufTmp; + } } else { fprintf(stderr, "%s NetServerGetInfo() failed.'\n", myname); if (pSrvBuf != NULL) @@ -390,7 +400,9 @@ if (strcmp(NTDomain, machinedomain) != 0) { MultiByteToWideChar(CP_ACP, 0, NTDomain, strlen(NTDomain) + 1, wszUserDomain, sizeof(wszUserDomain) / sizeof(wszUserDomain[0])); - nStatus = (use_PDC_only ? NetGetDCName(LclDCptr, wszUserDomain, (LPBYTE *) & UsrDCptr) : NetGetAnyDCName(LclDCptr, wszUserDomain, (LPBYTE *) & UsrDCptr)); + pBufTmp = NULL; + nStatus = (use_PDC_only ? NetGetDCName(LclDCptr, wszUserDomain, &pBufTmp) : NetGetAnyDCName(LclDCptr, wszUserDomain, &pBufTmp)); + UsrDCptr = (LPWSTR) pBufTmp; if (nStatus != NERR_Success) { fprintf(stderr, "%s Can't find DC for user's domain '%s'\n", myname, NTDomain); if (pSrvBuf != NULL) @@ -410,13 +422,15 @@ * specifying information level 0. */ dwLevel = 0; + pBufTmp = NULL; nStatus = NetUserGetGroups(UsrDCptr, wszUserName, dwLevel, - (LPBYTE *) & pUsrBuf, + &pBufTmp, dwPrefMaxLen, &dwEntriesRead, &dwTotalEntries); + pUsrBuf = (LPGROUP_USERS_INFO_0) pBufTmp; /* * If the call succeeds, */ diff -ruN squid-2.6.STABLE3/helpers/external_acl/session/Makefile.in squid-2.6.STABLE4/helpers/external_acl/session/Makefile.in --- squid-2.6.STABLE3/helpers/external_acl/session/Makefile.in Mon Jun 12 00:10:00 2006 +++ squid-2.6.STABLE4/helpers/external_acl/session/Makefile.in Fri Sep 22 03:09:44 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.6 2006/06/12 06:10:00 hno Exp $ +# $Id: Makefile.in,v 1.9 2006/09/22 09:09:44 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -112,6 +112,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -152,6 +154,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -189,6 +193,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -206,6 +212,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/external_acl/unix_group/Makefile.in squid-2.6.STABLE4/helpers/external_acl/unix_group/Makefile.in --- squid-2.6.STABLE3/helpers/external_acl/unix_group/Makefile.in Mon Jun 12 00:10:01 2006 +++ squid-2.6.STABLE4/helpers/external_acl/unix_group/Makefile.in Fri Sep 22 03:09:44 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.19 2006/06/12 06:10:01 hno Exp $ +# $Id: Makefile.in,v 1.22 2006/09/22 09:09:44 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -111,6 +111,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -151,6 +153,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -188,6 +192,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -205,6 +211,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/external_acl/wbinfo_group/Makefile.in squid-2.6.STABLE4/helpers/external_acl/wbinfo_group/Makefile.in --- squid-2.6.STABLE3/helpers/external_acl/wbinfo_group/Makefile.in Mon Jun 12 00:10:04 2006 +++ squid-2.6.STABLE4/helpers/external_acl/wbinfo_group/Makefile.in Fri Sep 22 03:09:44 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.18 2006/06/12 06:10:04 hno Exp $ +# $Id: Makefile.in,v 1.21 2006/09/22 09:09:44 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -94,6 +94,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -134,6 +136,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -171,6 +175,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -188,6 +194,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/negotiate_auth/Makefile.in squid-2.6.STABLE4/helpers/negotiate_auth/Makefile.in --- squid-2.6.STABLE3/helpers/negotiate_auth/Makefile.in Mon Jun 12 00:10:04 2006 +++ squid-2.6.STABLE4/helpers/negotiate_auth/Makefile.in Fri Sep 22 03:09:45 2006 @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.7 2006/06/12 06:10:04 hno Exp $ +# $Id: Makefile.in,v 1.10 2006/09/22 09:09:45 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -95,6 +95,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -135,6 +137,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -172,6 +176,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -189,6 +195,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/negotiate_auth/mswin_sspi/Makefile.in squid-2.6.STABLE4/helpers/negotiate_auth/mswin_sspi/Makefile.in --- squid-2.6.STABLE3/helpers/negotiate_auth/mswin_sspi/Makefile.in Mon Jun 12 00:10:06 2006 +++ squid-2.6.STABLE4/helpers/negotiate_auth/mswin_sspi/Makefile.in Fri Sep 22 03:09:45 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.5 2006/06/12 06:10:06 hno Exp $ +# $Id: Makefile.in,v 1.8 2006/09/22 09:09:45 hno Exp $ # srcdir = @srcdir@ @@ -108,6 +108,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -148,6 +150,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -185,6 +189,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -202,6 +208,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/ntlm_auth/Makefile.in squid-2.6.STABLE4/helpers/ntlm_auth/Makefile.in --- squid-2.6.STABLE3/helpers/ntlm_auth/Makefile.in Mon Jun 12 00:10:08 2006 +++ squid-2.6.STABLE4/helpers/ntlm_auth/Makefile.in Fri Sep 22 03:09:46 2006 @@ -16,7 +16,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.33 2006/06/12 06:10:08 hno Exp $ +# $Id: Makefile.in,v 1.36 2006/09/22 09:09:46 hno Exp $ # srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -95,6 +95,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -135,6 +137,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -172,6 +176,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -189,6 +195,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/ntlm_auth/SMB/Makefile.in squid-2.6.STABLE4/helpers/ntlm_auth/SMB/Makefile.in --- squid-2.6.STABLE3/helpers/ntlm_auth/SMB/Makefile.in Mon Jun 12 00:10:08 2006 +++ squid-2.6.STABLE4/helpers/ntlm_auth/SMB/Makefile.in Fri Sep 22 03:09:46 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.32 2006/06/12 06:10:08 hno Exp $ +# $Id: Makefile.in,v 1.35 2006/09/22 09:09:46 hno Exp $ # srcdir = @srcdir@ @@ -115,6 +115,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -155,6 +157,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -192,6 +196,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -209,6 +215,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/ntlm_auth/SMB/smbval/Makefile.in squid-2.6.STABLE4/helpers/ntlm_auth/SMB/smbval/Makefile.in --- squid-2.6.STABLE3/helpers/ntlm_auth/SMB/smbval/Makefile.in Mon Jun 12 00:10:08 2006 +++ squid-2.6.STABLE4/helpers/ntlm_auth/SMB/smbval/Makefile.in Fri Sep 22 03:09:46 2006 @@ -103,6 +103,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -143,6 +145,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -180,6 +184,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -197,6 +203,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/ntlm_auth/fakeauth/Makefile.in squid-2.6.STABLE4/helpers/ntlm_auth/fakeauth/Makefile.in --- squid-2.6.STABLE3/helpers/ntlm_auth/fakeauth/Makefile.in Mon Jun 12 00:10:08 2006 +++ squid-2.6.STABLE4/helpers/ntlm_auth/fakeauth/Makefile.in Fri Sep 22 03:09:47 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.31 2006/06/12 06:10:08 hno Exp $ +# $Id: Makefile.in,v 1.34 2006/09/22 09:09:47 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -110,6 +110,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -150,6 +152,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -187,6 +191,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -204,6 +210,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/ntlm_auth/fakeauth/fakeauth_auth.c squid-2.6.STABLE4/helpers/ntlm_auth/fakeauth/fakeauth_auth.c --- squid-2.6.STABLE3/helpers/ntlm_auth/fakeauth/fakeauth_auth.c Tue Aug 15 18:54:15 2006 +++ squid-2.6.STABLE4/helpers/ntlm_auth/fakeauth/fakeauth_auth.c Tue Aug 29 09:44:49 2006 @@ -88,7 +88,7 @@ if (n % 16 == 1) { /* store address for this line */ snprintf(addrstr, sizeof(addrstr), "%.4x", - (unsigned int)(p - (unsigned char *)data)); + (unsigned int) (p - (unsigned char *) data)); } c = *p; if (isalnum(c) == 0) { @@ -280,7 +280,7 @@ fprintf(stderr, "ntlmDecodeAuth: header check fails\n"); return -1; } - debug("ntlmDecodeAuth: size of %d\n", (int)size); + debug("ntlmDecodeAuth: size of %d\n", (int) size); debug("ntlmDecodeAuth: flg %08x\n", auth->flags); debug("ntlmDecodeAuth: usr o(%d) l(%d)\n", auth->user.offset, auth->user.len); @@ -388,8 +388,9 @@ if ((p = strchr(buf, '\n')) != NULL) *p = '\0'; /* strip \n */ - if ((strlen(buf) > 3) && NTLM_packet_debug_enabled) { + if (strlen(buf) > 3) decoded = base64_decode(buf + 3); + if ((strlen(buf) > 3) && NTLM_packet_debug_enabled) { strncpy(helper_command, buf, 2); helper_command[2] = '\0'; debug("Got '%s' from Squid with data:\n", helper_command); diff -ruN squid-2.6.STABLE3/helpers/ntlm_auth/fakeauth/ntlm.h squid-2.6.STABLE4/helpers/ntlm_auth/fakeauth/ntlm.h --- squid-2.6.STABLE3/helpers/ntlm_auth/fakeauth/ntlm.h Wed Aug 16 12:37:42 2006 +++ squid-2.6.STABLE4/helpers/ntlm_auth/fakeauth/ntlm.h Mon Aug 28 03:19:29 2006 @@ -1,5 +1,5 @@ /* - * $Id: ntlm.h,v 1.6 2006/08/16 18:37:42 serassio Exp $ + * $Id: ntlm.h,v 1.7 2006/08/28 09:19:29 serassio Exp $ * * AUTHOR: Andrew Doran * @@ -119,9 +119,9 @@ #ifdef DEBUG #include #include -static char *__foo; +static const char *__foo; #define debug(X...) if (debug_enabled) { \ - fprintf(stderr,"ntlm-auth[%d](%s:%d): ", (int)getpid(), \ + fprintf(stderr,"ntlm-auth[%ld](%s:%d): ", (long)getpid(), \ ((__foo=strrchr(__FILE__,'/'))==NULL?__FILE__:__foo+1),\ __LINE__);\ fprintf(stderr,X); } @@ -142,7 +142,7 @@ va_list args; va_start(args, format); - fprintf(stderr, "ntlm-auth[%d]: ", getpid()); + fprintf(stderr, "ntlm-auth[%ld]: ", (long)getpid()); vfprintf(stderr, format, args); va_end(args); #if FAIL_DEBUG diff -ruN squid-2.6.STABLE3/helpers/ntlm_auth/mswin_sspi/Makefile.in squid-2.6.STABLE4/helpers/ntlm_auth/mswin_sspi/Makefile.in --- squid-2.6.STABLE3/helpers/ntlm_auth/mswin_sspi/Makefile.in Mon Jun 12 00:10:08 2006 +++ squid-2.6.STABLE4/helpers/ntlm_auth/mswin_sspi/Makefile.in Fri Sep 22 03:09:47 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.5 2006/06/12 06:10:08 hno Exp $ +# $Id: Makefile.in,v 1.8 2006/09/22 09:09:47 hno Exp $ # srcdir = @srcdir@ @@ -107,6 +107,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -147,6 +149,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -184,6 +188,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -201,6 +207,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/helpers/ntlm_auth/mswin_sspi/libntlmssp.c squid-2.6.STABLE4/helpers/ntlm_auth/mswin_sspi/libntlmssp.c --- squid-2.6.STABLE3/helpers/ntlm_auth/mswin_sspi/libntlmssp.c Sat May 27 02:58:30 2006 +++ squid-2.6.STABLE4/helpers/ntlm_auth/mswin_sspi/libntlmssp.c Sun Sep 17 03:23:52 2006 @@ -33,7 +33,7 @@ WCHAR wszGroup[GNLEN + 1]; // Unicode Group - LPLOCALGROUP_USERS_INFO_0 pBuf = NULL; + LPLOCALGROUP_USERS_INFO_0 pBuf; LPLOCALGROUP_USERS_INFO_0 pTmpBuf; DWORD dwLevel = 0; DWORD dwFlags = LG_INCLUDE_INDIRECT; @@ -43,6 +43,7 @@ NET_API_STATUS nStatus; DWORD i; DWORD dwTotalCount = 0; + LPBYTE pBufTmp = NULL; /* Convert ANSI User Name and Group to Unicode */ @@ -64,7 +65,11 @@ wszUserName, dwLevel, dwFlags, - (LPBYTE *) & pBuf, dwPrefMaxLen, &dwEntriesRead, &dwTotalEntries); + &pBufTmp, + dwPrefMaxLen, + &dwEntriesRead, + &dwTotalEntries); + pBuf = (LPLOCALGROUP_USERS_INFO_0) pBufTmp; /* * If the call succeeds, */ @@ -123,10 +128,11 @@ LSA_HANDLE PolicyHandle; LSA_OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS status; - PPOLICY_PRIMARY_DOMAIN_INFO ppdiDomainInfo; + PPOLICY_PRIMARY_DOMAIN_INFO ppdiDomainInfo = NULL; PWKSTA_INFO_100 pwkiWorkstationInfo; DWORD netret; char *DomainName = NULL; + LPBYTE pwkiWorkstationInfoTmp; /* * Always initialize the object attributes to all zeroes. @@ -140,7 +146,8 @@ * The wki100_computername field contains a pointer to a UNICODE * string containing the local computer name. */ - netret = NetWkstaGetInfo(NULL, 100, (LPBYTE *) & pwkiWorkstationInfo); + netret = NetWkstaGetInfo(NULL, 100, &pwkiWorkstationInfoTmp); + pwkiWorkstationInfo = (PWKSTA_INFO_100) pwkiWorkstationInfoTmp; if (netret == NERR_Success) { /* * We have the workstation name in: @@ -162,6 +169,7 @@ if (status) { debug("OpenPolicy Error: %ld\n", status); } else { + PVOID ppdiDomainInfoTmp; /* * You have a handle to the policy object. Now, get the @@ -169,7 +177,8 @@ */ status = LsaQueryInformationPolicy(PolicyHandle, PolicyPrimaryDomainInformation, - (void **) &ppdiDomainInfo); + &ppdiDomainInfoTmp); + ppdiDomainInfo = (PPOLICY_PRIMARY_DOMAIN_INFO) ppdiDomainInfoTmp; if (status) { debug("LsaQueryInformationPolicy Error: %ld\n", status); } else { diff -ruN squid-2.6.STABLE3/helpers/ntlm_auth/no_check/Makefile.in squid-2.6.STABLE4/helpers/ntlm_auth/no_check/Makefile.in --- squid-2.6.STABLE3/helpers/ntlm_auth/no_check/Makefile.in Mon Jun 12 00:10:08 2006 +++ squid-2.6.STABLE4/helpers/ntlm_auth/no_check/Makefile.in Fri Sep 22 03:09:47 2006 @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.33 2006/06/12 06:10:08 hno Exp $ +# $Id: Makefile.in,v 1.36 2006/09/22 09:09:47 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -94,6 +94,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -134,6 +136,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -171,6 +175,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -188,6 +194,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/icons/Makefile.in squid-2.6.STABLE4/icons/Makefile.in --- squid-2.6.STABLE3/icons/Makefile.in Mon Jun 12 00:10:08 2006 +++ squid-2.6.STABLE4/icons/Makefile.in Fri Sep 22 03:09:47 2006 @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.43 2006/06/12 06:10:08 hno Exp $ +# $Id: Makefile.in,v 1.46 2006/09/22 09:09:47 hno Exp $ # srcdir = @srcdir@ @@ -95,6 +95,8 @@ EGREP = @EGREP@ ENABLE_HTCP_FALSE = @ENABLE_HTCP_FALSE@ ENABLE_HTCP_TRUE = @ENABLE_HTCP_TRUE@ +ENABLE_MINGW32SPECIFIC_FALSE = @ENABLE_MINGW32SPECIFIC_FALSE@ +ENABLE_MINGW32SPECIFIC_TRUE = @ENABLE_MINGW32SPECIFIC_TRUE@ ENABLE_PINGER_FALSE = @ENABLE_PINGER_FALSE@ ENABLE_PINGER_TRUE = @ENABLE_PINGER_TRUE@ ENABLE_SSL_FALSE = @ENABLE_SSL_FALSE@ @@ -135,6 +137,8 @@ MAKE_LEAKFINDER_TRUE = @MAKE_LEAKFINDER_TRUE@ MKDIR = @MKDIR@ MV = @MV@ +NEED_COSSDUMP_FALSE = @NEED_COSSDUMP_FALSE@ +NEED_COSSDUMP_TRUE = @NEED_COSSDUMP_TRUE@ NEED_DISKD_FALSE = @NEED_DISKD_FALSE@ NEED_DISKD_TRUE = @NEED_DISKD_TRUE@ NEED_OWN_MD5_FALSE = @NEED_OWN_MD5_FALSE@ @@ -172,6 +176,8 @@ STORE_OBJS = @STORE_OBJS@ STRIP = @STRIP@ TRUE = @TRUE@ +USE_AIOPS_WIN32_FALSE = @USE_AIOPS_WIN32_FALSE@ +USE_AIOPS_WIN32_TRUE = @USE_AIOPS_WIN32_TRUE@ USE_DELAY_POOLS_FALSE = @USE_DELAY_POOLS_FALSE@ USE_DELAY_POOLS_TRUE = @USE_DELAY_POOLS_TRUE@ USE_DNSSERVER_FALSE = @USE_DNSSERVER_FALSE@ @@ -189,6 +195,7 @@ USE_SNMP_FALSE = @USE_SNMP_FALSE@ USE_SNMP_TRUE = @USE_SNMP_TRUE@ VERSION = @VERSION@ +WIN32_PSAPI = @WIN32_PSAPI@ XTRA_LIBS = @XTRA_LIBS@ XTRA_OBJS = @XTRA_OBJS@ ac_ct_CC = @ac_ct_CC@ diff -ruN squid-2.6.STABLE3/include/autoconf.h.in squid-2.6.STABLE4/include/autoconf.h.in --- squid-2.6.STABLE3/include/autoconf.h.in Wed Jul 12 09:00:31 2006 +++ squid-2.6.STABLE4/include/autoconf.h.in Sat Sep 16 14:30:43 2006 @@ -45,6 +45,9 @@ /* If gettimeofday is known to take only one argument */ #undef GETTIMEOFDAY_NO_TZP +/* Define to 1 if you have the header file. */ +#undef HAVE_AIO_H + /* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA @@ -324,6 +327,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_SSL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_PATHS_H + /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL @@ -584,6 +590,9 @@ /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF + +/* Define if you have PSAPI.DLL on Windows systems */ +#undef HAVE_WIN32_PSAPI /* Some systems support __va_copy */ #undef HAVE___VA_COPY diff -ruN squid-2.6.STABLE3/include/cache_snmp.h squid-2.6.STABLE4/include/cache_snmp.h --- squid-2.6.STABLE3/include/cache_snmp.h Mon May 15 19:08:26 2006 +++ squid-2.6.STABLE4/include/cache_snmp.h Thu Sep 21 20:49:24 2006 @@ -1,5 +1,5 @@ /* - * $Id: cache_snmp.h,v 1.28 2006/05/16 01:08:26 hno Exp $ + * $Id: cache_snmp.h,v 1.29 2006/09/22 02:49:24 hno Exp $ */ #ifndef SQUID_CACHE_SNMP_H @@ -212,6 +212,8 @@ PERF_SYS_CURUNLREQ, PERF_SYS_CURUNUSED_FD, PERF_SYS_CURRESERVED_FD, + PERF_SYS_CURUSED_FD, + PERF_SYS_CURMAX_FD, PERF_SYS_END }; @@ -254,6 +256,7 @@ PERF_MEDIAN_DNS, PERF_MEDIAN_RHR, PERF_MEDIAN_BHR, + PERF_MEDIAN_HTTP_NH, PERF_MEDIAN_END }; diff -ruN squid-2.6.STABLE3/include/config.h squid-2.6.STABLE4/include/config.h --- squid-2.6.STABLE3/include/config.h Fri Jun 2 11:32:44 2006 +++ squid-2.6.STABLE4/include/config.h Fri Sep 8 13:41:23 2006 @@ -1,5 +1,5 @@ /* - * $Id: config.h,v 1.12 2006/06/02 17:32:44 serassio Exp $ + * $Id: config.h,v 1.14 2006/09/08 19:41:23 serassio Exp $ * * AUTHOR: Duane Wessels * @@ -121,6 +121,7 @@ #elif defined(WIN32) || defined(WINNT) || defined(__WIN32__) || defined(__WIN32) #define _SQUID_MSWIN_ #define _SQUID_WIN32_ +#include "squid_mswin.h" #elif defined(__APPLE__) #define _SQUID_APPLE_ @@ -142,6 +143,14 @@ #define fd_mask unsigned long #endif #endif + +/* Large cache file support needs SIZEOF_INT64_T. + * On system with __int64 type could be not defined, so here we define it if needed. + */ +#if (SIZEOF_INT64_T == 0) && (SIZEOF___INT64 > 0) +#undef SIZEOF_INT64_T +#define SIZEOF_INT64_T SIZEOF___INT64 +#endif /* * Don't allow inclusion of malloc.h on FreeBSD, Next and OpenBSD diff -ruN squid-2.6.STABLE3/include/squid_mswin.h squid-2.6.STABLE4/include/squid_mswin.h --- squid-2.6.STABLE3/include/squid_mswin.h Wed Dec 31 17:00:00 1969 +++ squid-2.6.STABLE4/include/squid_mswin.h Fri Sep 22 05:30:17 2006 @@ -0,0 +1,436 @@ +/* + * $Id: squid_mswin.h,v 1.3 2006/09/22 11:30:17 serassio Exp $ + * + * AUTHOR: Andrey Shorin + * AUTHOR: Guido Serassio + * + * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from the + * Internet community. Development is led by Duane Wessels of the + * National Laboratory for Applied Network Research and funded by the + * National Science Foundation. Squid is Copyrighted (C) 1998 by + * the Regents of the University of California. Please see the + * COPYRIGHT file for full details. Squid incorporates software + * developed and/or copyrighted by other sources. Please see the + * CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#ifndef STDC_HEADERS +#define STDC_HEADERS 1 +#endif + +#define _WIN32_WINNT 0x0500 + +#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64 +# define __USE_FILE_OFFSET64 1 +#endif + +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ + +typedef unsigned char u_char; + +typedef int SOCKET; +typedef int ssize_t; +typedef int mode_t; + +#if defined __USE_FILE_OFFSET64 +typedef int64_t off_t; +typedef uint64_t ino_t; + +#else +typedef long off_t; +typedef unsigned long ino_t; + +#endif + +#define INT64_MAX _I64_MAX +#define INT64_MIN _I64_MIN + +#include "default_config_file.h" +/* Some tricks for MS Compilers */ +#define __STDC__ 1 +#pragma include_alias(, ) +#define THREADLOCAL __declspec(thread) + +#elif defined(__GNUC__) /* gcc environment */ + +#define THREADLOCAL __attribute__((section(".tls"))) + +#endif + +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ +#define alloca _alloca +#endif +#define chdir _chdir +#define dup _dup +#define dup2 _dup2 +#define fdopen _fdopen +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ +#define fileno _fileno +#endif +#define ftruncate WIN32_ftruncate +#define getcwd _getcwd +#define getpid _getpid +#define getrusage WIN32_getrusage +#define ioctl ioctlsocket +#define memccpy _memccpy +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ +#define mkdir(p) _mkdir(p) +#endif +#define mktemp _mktemp +#define open _open +#define pclose _pclose +#define pipe WIN32_pipe +#define popen _popen +#define putenv _putenv +#define setmode _setmode +#define sleep(t) Sleep((t)*1000) +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ +#define snprintf _snprintf +#endif +#define strcasecmp _stricmp +#define strdup _strdup +#define strlwr _strlwr +#define strncasecmp _strnicmp +#define tempnam _tempnam +#define truncate WIN32_truncate +#define umask _umask +#define unlink _unlink +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ +#define vsnprintf _vsnprintf +#endif + +#define O_RDONLY _O_RDONLY +#define O_WRONLY _O_WRONLY +#define O_RDWR _O_RDWR +#define O_APPEND _O_APPEND + +#define O_CREAT _O_CREAT +#define O_TRUNC _O_TRUNC +#define O_EXCL _O_EXCL + +#define O_TEXT _O_TEXT +#define O_BINARY _O_BINARY +#define O_RAW _O_BINARY +#define O_TEMPORARY _O_TEMPORARY +#define O_NOINHERIT _O_NOINHERIT +#define O_SEQUENTIAL _O_SEQUENTIAL +#define O_RANDOM _O_RANDOM +#define O_NDELAY 0 + +#define S_IRWXO 007 +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ +#define S_ISDIR(m) (((m) & _S_IFDIR) == _S_IFDIR) +#define S_ISREG(m) (((m) & _S_IFREG) == _S_IFREG) +#endif + +#ifndef SIGHUP +#define SIGHUP 1 /* hangup */ +#endif +#ifndef SIGBUS +#define SIGBUS 7 /* bus error */ +#endif +#ifndef SIGKILL +#define SIGKILL 9 /* kill (cannot be caught or ignored) */ +#endif +#ifndef SIGSEGV +#define SIGSEGV 11 /* segment violation */ +#endif +#ifndef SIGPIPE +#define SIGPIPE 13 /* write on a pipe with no one to read it */ +#endif +#ifndef SIGCHLD +#define SIGCHLD 20 /* to parent on child stop or exit */ +#endif +#ifndef SIGUSR1 +#define SIGUSR1 30 /* user defined signal 1 */ +#endif +#ifndef SIGUSR2 +#define SIGUSR2 31 /* user defined signal 2 */ +#endif + +typedef unsigned short in_port_t; +typedef unsigned short int ushort; +typedef int uid_t; +typedef int gid_t; + +#if defined __USE_FILE_OFFSET64 +#define stat _stati64 +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ +#define lseek _lseeki64 +#endif +#define fstat _fstati64 +#define tell _telli64 + +#else +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ +#define stat _stat +#define lseek _lseek +#define fstat _fstat +#define tell _tell +#endif + +#endif + +struct passwd { + char *pw_name; /* user name */ + char *pw_passwd; /* user password */ + uid_t pw_uid; /* user id */ + gid_t pw_gid; /* group id */ + char *pw_gecos; /* real name */ + char *pw_dir; /* home directory */ + char *pw_shell; /* shell program */ +}; + +struct group { + char *gr_name; /* group name */ + char *gr_passwd; /* group password */ + gid_t gr_gid; /* group id */ + char **gr_mem; /* group members */ +}; + +struct statfs { + long f_type; /* type of filesystem (see below) */ + long f_bsize; /* optimal transfer block size */ + long f_blocks; /* total data blocks in file system */ + long f_bfree; /* free blocks in fs */ + long f_bavail; /* free blocks avail to non-superuser */ + long f_files; /* total file nodes in file system */ + long f_ffree; /* free file nodes in fs */ + long f_fsid; /* file system id */ + long f_namelen; /* maximum length of filenames */ + long f_spare[6]; /* spare for later */ +}; + +struct timezone + { + int tz_minuteswest; /* minutes west of Greenwich */ + int tz_dsttime; /* type of dst correction */ + }; + +#define CHANGE_FD_SETSIZE 1 +#if CHANGE_FD_SETSIZE && SQUID_MAXFD > DEFAULT_FD_SETSIZE +#define FD_SETSIZE SQUID_MAXFD +#endif + +#include +#include +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ +/* Hack to suppress compiler warnings on FD_SET() & FD_CLR() */ +#pragma warning (push) +#pragma warning (disable:4142) +#endif +/* prevent inclusion of wingdi.h */ +#define NOGDI +#include +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ +#pragma warning (pop) +#include "readdir.h" +#else +#include +#include +#include +#endif + +typedef char * caddr_t; + +#undef FD_CLOSE +#undef FD_OPEN +#undef FD_READ +#undef FD_WRITE +#define EISCONN WSAEISCONN +#define EINPROGRESS WSAEINPROGRESS +#define EWOULDBLOCK WSAEWOULDBLOCK +#define EALREADY WSAEALREADY +#define ETIMEDOUT WSAETIMEDOUT +#define ECONNREFUSED WSAECONNREFUSED +#define ECONNRESET WSAECONNRESET +#define ERESTART WSATRY_AGAIN +#define ENOTCONN WSAENOTCONN + +#undef h_errno +#define h_errno errno /* we'll set it ourselves */ + +#undef FD_CLR +#define FD_CLR(fd, set) do { \ + u_int __i; \ + SOCKET __sock = _get_osfhandle(fd); \ + for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count ; __i++) { \ + if (((fd_set FAR *)(set))->fd_array[__i] == __sock) { \ + while (__i < ((fd_set FAR *)(set))->fd_count-1) { \ + ((fd_set FAR *)(set))->fd_array[__i] = \ + ((fd_set FAR *)(set))->fd_array[__i+1]; \ + __i++; \ + } \ + ((fd_set FAR *)(set))->fd_count--; \ + break; \ + } \ + } \ +} while(0) + +#undef FD_SET +#define FD_SET(fd, set) do { \ + u_int __i; \ + SOCKET __sock = _get_osfhandle(fd); \ + for (__i = 0; __i < ((fd_set FAR *)(set))->fd_count; __i++) { \ + if (((fd_set FAR *)(set))->fd_array[__i] == (__sock)) { \ + break; \ + } \ + } \ + if (__i == ((fd_set FAR *)(set))->fd_count) { \ + if (((fd_set FAR *)(set))->fd_count < FD_SETSIZE) { \ + ((fd_set FAR *)(set))->fd_array[__i] = (__sock); \ + ((fd_set FAR *)(set))->fd_count++; \ + } \ + } \ +} while(0) + +#undef FD_ISSET +#define FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)(_get_osfhandle(fd)), (fd_set FAR *)(set)) + +extern THREADLOCAL int ws32_result; + +#define strerror(e) WIN32_strerror(e) + +#define socket(f,t,p) \ + (INVALID_SOCKET == ((SOCKET)(ws32_result = (int)socket(f,t,p))) ? \ + ((WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1), -1) : \ + (SOCKET)_open_osfhandle(ws32_result,0)) +#define accept(s,a,l) \ + (INVALID_SOCKET == ((SOCKET)(ws32_result = (int)accept(_get_osfhandle(s),a,l))) ? \ + ((WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1), -1) : \ + (SOCKET)_open_osfhandle(ws32_result,0)) +#define bind(s,n,l) \ + (SOCKET_ERROR == bind(_get_osfhandle(s),n,l) ? \ + (errno = WSAGetLastError()), -1 : 0) +#define connect(s,n,l) \ + (SOCKET_ERROR == connect(_get_osfhandle(s),n,l) ? \ + (WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1, -1) : 0) +#define listen(s,b) \ + (SOCKET_ERROR == listen(_get_osfhandle(s),b) ? \ + (WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1, -1) : 0) +#define shutdown(s,h) \ + (SOCKET_ERROR == shutdown(_get_osfhandle(s),h) ? \ + (errno = WSAGetLastError()), -1 : 0) +#define select(n,r,w,e,t) \ + (SOCKET_ERROR == (ws32_result = select(n,r,w,e,t)) ? \ + (errno = WSAGetLastError()), -1 : ws32_result) +#define recv(s,b,l,f) \ + (SOCKET_ERROR == (ws32_result = recv(_get_osfhandle(s),b,l,f)) ? \ + (errno = WSAGetLastError()), -1 : ws32_result) +#define recvfrom(s,b,l,f,fr,frl) \ + (SOCKET_ERROR == (ws32_result = recvfrom(_get_osfhandle(s),b,l,f,fr,frl)) ? \ + (errno = WSAGetLastError()), -1 : ws32_result) +#define send(s,b,l,f) \ + (SOCKET_ERROR == (ws32_result = send(_get_osfhandle(s),b,l,f)) ? \ + (errno = WSAGetLastError()), -1 : ws32_result) +#define sendto(s,b,l,f,t,tl) \ + (SOCKET_ERROR == (ws32_result = sendto(_get_osfhandle(s),b,l,f,t,tl)) ? \ + (errno = WSAGetLastError()), -1 : ws32_result) +#define getsockname(s,n,l) \ + (SOCKET_ERROR == getsockname(_get_osfhandle(s),n,l) ? \ + (errno = WSAGetLastError()), -1 : 0) +#define getsockopt(s,l,o,v,n) \ + (Sleep(1), SOCKET_ERROR == getsockopt(_get_osfhandle(s),l,o,(char*)v,n) ? \ + (errno = WSAGetLastError()), -1 : 0) +#define setsockopt(s,l,o,v,n) \ + (SOCKET_ERROR == setsockopt(_get_osfhandle(s),l,o,v,n) ? \ + (errno = WSAGetLastError()), -1 : 0) +#define ioctlsocket(s,c,a) \ + (SOCKET_ERROR == ioctlsocket(_get_osfhandle(s),c,a) ? \ + (errno = WSAGetLastError()), -1 : 0) +#define gethostname(n,l) \ + (SOCKET_ERROR == gethostname(n,l) ? \ + (errno = WSAGetLastError()), -1 : 0) +#define gethostbyname(n) \ + (NULL == ((HOSTENT FAR*)(ws32_result = (int)gethostbyname(n))) ? \ + (errno = WSAGetLastError()), NULL : (HOSTENT FAR*)ws32_result) +#define getservbyname(n,p) \ + (NULL == ((SERVENT FAR*)(ws32_result = (int)getservbyname(n,p))) ? \ + (errno = WSAGetLastError()), NULL : (SERVENT FAR*)ws32_result) +#define gethostbyaddr(a,l,t) \ + (NULL == ((HOSTENT FAR*)(ws32_result = (int)gethostbyaddr(a,l,t))) ? \ + (errno = WSAGetLastError()), NULL : (HOSTENT FAR*)ws32_result) +#undef WSASocket +#ifdef UNICODE +#define WSASocket(a,t,p,i,g,f) \ + (INVALID_SOCKET == ((SOCKET)(ws32_result = (int)WSASocketW(a,t,p,i,g,f))) ? \ + ((WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1), -1) : \ + (SOCKET)_open_osfhandle(ws32_result,0)) +#else +#define WSASocket(a,t,p,i,g,f) \ + (INVALID_SOCKET == ((SOCKET)(ws32_result = (int)WSASocketA(a,t,p,i,g,f))) ? \ + ((WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1), -1) : \ + (SOCKET)_open_osfhandle(ws32_result,0)) +#endif /* !UNICODE */ +#undef WSADuplicateSocket +#ifdef UNICODE +#define WSADuplicateSocket(s,n,l) \ + (SOCKET_ERROR == WSADuplicateSocketW(_get_osfhandle(s),n,l) ? \ + (errno = WSAGetLastError()), -1 : 0) +#else +#define WSADuplicateSocket(s,n,l) \ + (SOCKET_ERROR == WSADuplicateSocketA(_get_osfhandle(s),n,l) ? \ + (errno = WSAGetLastError()), -1 : 0) +#endif /* !UNICODE */ + +#if defined(UTIL_C) +#define read _read +#define write _write +#else +extern THREADLOCAL int _so_err; +extern THREADLOCAL int _so_err_siz; +#define read(fd,buf,siz) \ + (_so_err_siz = sizeof(_so_err), \ + getsockopt((fd),SOL_SOCKET,SO_ERROR,&_so_err,&_so_err_siz) \ + == 0 ? recv((fd),(buf),(siz),0) : _read((fd),(buf),(siz))) +#define write(fd,buf,siz) \ + (_so_err_siz = sizeof(_so_err), \ + getsockopt((fd),SOL_SOCKET,SO_ERROR,&_so_err,&_so_err_siz) \ + == 0 ? send((fd),(buf),(siz),0) : _write((fd),(buf),(siz))) +#endif + +#if defined(COMM_C) || defined(TOOLS_C) +#define close WIN32_Close_FD_Socket +#else +#define close _close +#endif + +#define RUSAGE_SELF 0 /* calling process */ +#define RUSAGE_CHILDREN -1 /* terminated child processes */ + +struct rusage { + struct timeval ru_utime; /* user time used */ + struct timeval ru_stime; /* system time used */ + long ru_maxrss; /* integral max resident set size */ + long ru_ixrss; /* integral shared text memory size */ + long ru_idrss; /* integral unshared data size */ + long ru_isrss; /* integral unshared stack size */ + long ru_minflt; /* page reclaims */ + long ru_majflt; /* page faults */ + long ru_nswap; /* swaps */ + long ru_inblock; /* block input operations */ + long ru_oublock; /* block output operations */ + long ru_msgsnd; /* messages sent */ + long ru_msgrcv; /* messages received */ + long ru_nsignals; /* signals received */ + long ru_nvcsw; /* voluntary context switches */ + long ru_nivcsw; /* involuntary context switches */ +}; diff -ruN squid-2.6.STABLE3/include/sspwin32.h squid-2.6.STABLE4/include/sspwin32.h --- squid-2.6.STABLE3/include/sspwin32.h Sat May 27 02:58:31 2006 +++ squid-2.6.STABLE4/include/sspwin32.h Sat Sep 9 09:41:45 2006 @@ -1,18 +1,36 @@ + /* - * (C) 2002 Guido Serassio + * $Id: sspwin32.h,v 1.2 2006/09/09 15:41:45 serassio Exp $ + * + * AUTHOR: Guido Serassio * Based on previous work of Francesco Chemolli, Robert Collins and Andrew Doran * - * Distributed freely under the terms of the GNU General Public License, - * version 2. See the file COPYING for licensing details + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ #ifndef _LIBSSPWIN32_H_ diff -ruN squid-2.6.STABLE3/include/util.h squid-2.6.STABLE4/include/util.h --- squid-2.6.STABLE3/include/util.h Fri May 12 16:06:51 2006 +++ squid-2.6.STABLE4/include/util.h Mon Sep 18 16:54:38 2006 @@ -1,5 +1,5 @@ /* - * $Id: util.h,v 1.65 2006/05/12 22:06:51 hno Exp $ + * $Id: util.h,v 1.67 2006/09/18 22:54:38 hno Exp $ * * AUTHOR: Harvest Derived * @@ -59,7 +59,6 @@ extern char *xstrdup(const char *); extern char *xstrndup(const char *, size_t); extern const char *xstrerror(void); -extern const char *xbstrerror(int); extern int tvSubMsec(struct timeval, struct timeval); extern int tvSubUsec(struct timeval, struct timeval); extern double tvSubDsec(struct timeval, struct timeval); @@ -121,6 +120,35 @@ /* * Returns the amount of known allocated memory */ -int statMemoryAccounted(void); +extern size_t statMemoryAccounted(void); + +/* Cygwin & Windows NT Port */ +/* win32lib.c */ +#ifdef _SQUID_MSWIN_ +#if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ +extern int64_t WIN32_strtoll(const char *nptr, char **endptr, int base); +#endif +extern int chroot(const char *); +extern int ftruncate(int, off_t); +extern int gettimeofday(struct timeval *, struct timezone *); +extern int inet_aton(const char *, struct in_addr *)