--------------------- PatchSet 5712 Date: 2003/05/02 13:01:19 Author: serassio Branch: nt-2_5 Tag: (none) Log: Added OpenSSL support Members: lib/md5.c:1.7->1.7.10.1 port/win32/include/autoconf.h.ssl:1.1->1.1.2.1 port/win32/squid/squid.dsp:1.1.2.8->1.1.2.9 src/ssl_support.c:1.6.14.2->1.6.14.3 Index: squid/lib/md5.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/md5.c,v retrieving revision 1.7 retrieving revision 1.7.10.1 diff -u -r1.7 -r1.7.10.1 --- squid/lib/md5.c 21 Nov 2001 23:48:57 -0000 1.7 +++ squid/lib/md5.c 2 May 2003 13:01:19 -0000 1.7.10.1 @@ -1,5 +1,5 @@ /* - * $Id: md5.c,v 1.7 2001/11/21 23:48:57 squidadm Exp $ + * $Id: md5.c,v 1.7.10.1 2003/05/02 13:01:19 serassio Exp $ */ /* taken from RFC-1321/Appendix A.3 */ @@ -30,8 +30,10 @@ * documentation and/or software. */ + #include "config.h" +#if !USE_SSL #if HAVE_STRING_H #include #endif @@ -356,3 +358,4 @@ } #endif +#endif --- /dev/null Wed Feb 14 01:07:22 2007 +++ squid/port/win32/include/autoconf.h.ssl Wed Feb 14 01:08:52 2007 @@ -0,0 +1,957 @@ +/* include/autoconf.h. Generated automatically by configure. */ +/* include/autoconf.h.in. Generated automatically from configure.in by autoheader. */ +/* + * All configurable options are enabled by using --enable-.... + * when running configure. See configure --help for a list + * of all available options. + * + * You are free to edit this file, but it will be overwritten + * each time you run configure. You may need to edit this file + * if configure falsely picks up a library function or structure + * that doesn't really work on your system. + * + * Another way to block a function that should not be detected + * is to + * setenv ac_cv_func_ no + * before running configure, as in + * setenv ac_cv_func_setresuid no + * + * It is possible to enable some of the configurable options + * by editing this file alone, but some of them requires changes + * in the Makefiles, wich is done automatically by configure. + * + */ + +/* $Id: autoconf.h.ssl,v 1.1.2.1 2003/05/02 13:01:25 serassio Exp $ */ + +/* + * configure command line used to configure Squid + */ + +#undef SQUID_CONFIGURE_OPTIONS +#define SQUID_CONFIGURE_OPTIONS "--enable-win32-service --enable-htcp --enable-icmp --disable-wccp --enable-underscores --enable-storeio='ufs awin32 null' --enable-removal-policies='heap lru' --enable-snmp --enable-win32-service --enable-useragent-log --enable-referer-log --enable-auth='basic ntlm digest' --enable-basic-auth-helpers=win32_locallogon --enable-ntlm-auth-helpers=NTLMSSP-WIN32 --enable-external-acl-helpers=win32_group --prefix=c:/squid" + +/********************************* + * START OF CONFIGURABLE OPTIONS * + *********************************/ +/* + * If you are upset that the cachemgr.cgi form comes up with the hostname + * field blank, then define this to getfullhostname() + */ +#undef CACHEMGR_HOSTNAME + +/* + * What default TCP port to use for HTTP listening? + */ +#ifndef CACHE_HTTP_PORT +#define CACHE_HTTP_PORT 3128 +#endif + +/* + * What default UDP port to use for ICP listening? + */ +#ifndef CACHE_ICP_PORT +#define CACHE_ICP_PORT 3130 +#endif + +/* Define to do simple malloc debugging */ +#undef XMALLOC_DEBUG + +/* Define for log file trace of mem alloc/free */ +#undef MEM_GEN_TRACE + +/* Define to have malloc statistics */ +#undef XMALLOC_STATISTICS + +/* Define to have a detailed trace of memory allocations */ +#undef XMALLOC_TRACE + +#undef FORW_VIA_DB + +/* Defines how many threads aufs uses for I/O */ +#undef AUFS_IO_THREADS + +/* + * If you want to use Squid's ICMP features (highly recommended!) then + * define this. When USE_ICMP is defined, Squid will send ICMP pings + * to origin server sites. This information is used in numerous ways: + * - Sent in ICP replies so neighbor caches know how close + * you are to the source. + * - For finding the closest instance of a URN. + * - With the 'test_reachability' option. Squid will return + * ICP_OP_MISS_NOFETCH for sites which it cannot ping. + */ +#undef USE_ICMP +#define USE_ICMP 1 +/* + * Traffic management via "delay pools". + */ +#undef DELAY_POOLS +// #define DELAY_POOLS 1 +/* + * If you want to log User-Agent request header values, define this. + * By default, they are written to useragent.log in the Squid log + * directory. + */ +#undef USE_USERAGENT_LOG +#define USE_USERAGENT_LOG 1 + +/* + * If you want to log Referer request header values, define this. + * By default, they are written to referer.log in the Squid log + * directory. + */ +#undef USE_REFERER_LOG +#define USE_REFERER_LOG 1 +/* + * A dangerous feature which causes Squid to kill its parent process + * (presumably the RunCache script) upon receipt of SIGTERM or SIGINT. + * Use with caution. + */ +/* #undef KILL_PARENT_OPT */ + +/* Define to enable SNMP monitoring of Squid */ +#undef SQUID_SNMP +#define SQUID_SNMP 1 + +/* + * Define to enable WCCP + */ +/* #undef USE_WCCP */ + +/* + * Squid frequently calls gettimeofday() for accurate timestamping. + * If you are concerned that gettimeofday() is called too often, and + * could be causing performance degradation, then you can define + * ALARM_UPDATES_TIME and cause Squid's clock to be updated at regular + * intervals (one second) with ALARM signals. + */ +#undef ALARM_UPDATES_TIME + +/* + * Define this to include code which lets you specify access control + * elements based on ethernet hardware addresses. This code uses + * functions found in 4.4 BSD derviations (e.g. FreeBSD, ?). + */ +#undef USE_ARP_ACL + +/* + * Define this to include code for the Hypertext Cache Protocol (HTCP) + */ +#undef USE_HTCP +#define USE_HTCP 1 + +/* + * Use Cache Digests for locating objects in neighbor caches. This + * code is still semi-experimental. + */ +#undef USE_CACHE_DIGESTS + +/* + * Cache Array Routing Protocol + */ +#undef USE_CARP + +/* Define if NTLM is allowed to fail gracefully when a helper has problems */ +#undef NTLM_FAIL_OPEN + +/* + * Define Windows NT & Windows 2000 run service mode + */ +#undef USE_WIN32_SERVICE +#define USE_WIN32_SERVICE 1 + +/******************************** + * END OF CONFIGURABLE OPTIONS * + ********************************/ + +/* Define if struct tm has tm_gmtoff member */ +#undef HAVE_TM_GMTOFF + +/* Define if struct mallinfo has mxfast member */ +#undef HAVE_EXT_MALLINFO + +/* Default FD_SETSIZE value */ +#undef DEFAULT_FD_SETSIZE +#define DEFAULT_FD_SETSIZE 64 + +/* Maximum number of open filedescriptors */ +#undef SQUID_MAXFD +#define SQUID_MAXFD 2048 + +/* UDP send buffer size */ +#undef SQUID_UDP_SO_SNDBUF +#define SQUID_UDP_SO_SNDBUF 8192 + +/* UDP receive buffer size */ +#undef SQUID_UDP_SO_RCVBUF +#define SQUID_UDP_SO_RCVBUF 8192 + +/* TCP send buffer size */ +#undef SQUID_TCP_SO_SNDBUF +#define SQUID_TCP_SO_SNDBUF 8192 + +/* TCP receive buffer size */ +#undef SQUID_TCP_SO_RCVBUF +#define SQUID_TCP_SO_RCVBUF 8192 + +/* Host type from configure */ +#undef CONFIG_HOST_TYPE +#define CONFIG_HOST_TYPE "i686-pc-winnt" + +/* If we need to declare sys_errlist[] as external */ +#undef NEED_SYS_ERRLIST + +/* If gettimeofday is known to take only one argument */ +#undef GETTIMEOFDAY_NO_TZP + +/* If libresolv.a has been hacked to export _dns_ttl_ */ +#undef LIBRESOLV_DNS_TTL_HACK + +/* Define if struct ip has ip_hl member */ +#undef HAVE_IP_HL + +/* Define if your compiler supports prototyping */ +#undef HAVE_ANSI_PROTOTYPES + +/* Define if we should use GNU regex */ +#undef USE_GNUREGEX +#define USE_GNUREGEX 1 + +/* signed size_t, grr */ +/* #undef ssize_t */ + +/* + * Yay! Another Linux brokenness. Its not good enough to know that + * setresuid() exists, because RedHat 5.0 declare setresuid() but + * doesn't implement it. + */ +#undef HAVE_SETRESUID + +/* Define if you have struct rusage */ +#undef HAVE_STRUCT_RUSAGE +#define HAVE_STRUCT_RUSAGE 1 + +/* Define if you have PSAPI.DLL on Windows systems */ +#undef HAVE_WIN32_PSAPI +#define HAVE_WIN32_PSAPI 1 + +/* + * This makes warnings go away. If you have socklen_t defined in your + * /usr/include files, then this should remain undef'd. Otherwise it + * should be defined to int. + */ +#undef socklen_t +#define socklen_t int + +/* + * By default (for now anyway) Squid includes options which allows + * the cache administrator to violate the HTTP protocol specification + * in terms of cache behaviour. Setting this to '0' will disable + * such code. + */ +#define HTTP_VIOLATIONS 1 + +/* + * Enable support for Transparent Proxy on systems using IP-Filter + * address redirection. This provides "masquerading" support for non + * Linux system. + */ +#undef IPF_TRANSPARENT + +/* + * Enable code for assiting in finding memory leaks. Hacker stuff only. + */ +#undef USE_LEAKFINDER + +/* + * type of fd_set array + */ +#undef fd_mask +#define fd_mask int + +/* + * If _res structure has nsaddr_list member + */ +#undef HAVE_RES_NSADDR_LIST + +/* + * If _res structure has ns_list member + */ +#undef HAVE_RES_NS_LIST + +/* + * Compile in support for Ident (RFC 931) lookups? Enabled by default. + */ +#undef USE_IDENT +#define USE_IDENT 1 + +/* + * If your system has statvfs(), and if it actually works! + */ +#undef HAVE_STATVFS + +/* + * If --disable-internal-dns was given to configure, then we'll use + * the dnsserver processes instead. + */ +#undef USE_DNSSERVERS +// #define USE_DNSSERVERS 1 + +/* + * we check for the existance of struct mallinfo + */ +#undef HAVE_STRUCT_MALLINFO + +/* + * Do we want to use truncate(2) or unlink(2)? + */ +#undef USE_TRUNCATE + +/* + * Allow underscores in host names + */ +#undef ALLOW_HOSTNAME_UNDERSCORES +#define ALLOW_HOSTNAME_UNDERSCORES 1 + +/* + * Use the heap-based replacement techniques + */ +#undef HEAP_REPLACEMENT + +/* + * message type for message queues + */ +#define mtyp_t long + +/* + * Define this to include code for SSL encryption. + */ +#undef USE_SSL +#define USE_SSL 1 + +/* + * Define this to make use of the OpenSSL libraries for + * MD5 calculation rather than Squid's own MD5 implementation + * or if building with SSL encryption (USE_SSL) + */ +#undef USE_OPENSSL +#define USE_OPENSSL 1 + +/* Define if you want to set the COSS membuf size */ +#undef COSS_MEMBUF_SZ + +/* Print stacktraces on fatal errors */ +#undef PRINT_STACK_TRACE + +/* + * Define this if unlinkd is required + * (strongly recommended for ufs storage type) + */ +#undef USE_UNLINKD +#define USE_UNLINKD 1 + +/* + * Enable support for Transparent Proxy on Linux 2.4 systems + */ +#undef LINUX_NETFILTER + +/* + * Do we have unix sockets? (required for the winbind ntlm helper + */ +#undef HAVE_UNIXSOCKET + +/* + * Known-size intgers + */ + +#undef int16_t +typedef short int16_t; + +#undef u_int16_t +typedef unsigned short u_int16_t; + +#undef int32_t +typedef int int32_t; + +#undef u_int32_t +typedef unsigned int u_int32_t; + +#undef int64_t +typedef __int64 int64_t; + +#undef u_int64_t +typedef unsigned __int64 u_int64_t; +/* + * Enable support for the X-Accelerator-Vary HTTP header + */ +#undef X_ACCELERATOR_VARY + + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +#undef CRAY_STACKSEG_END + +/* Define if using `alloca.c'. */ +#undef C_ALLOCA + +/* Define if you have `alloca', as a function or macro. */ +#undef HAVE_ALLOCA +#define HAVE_ALLOCA 1 + +/* Define if you have and it should be used (not on Ultrix). */ +#undef HAVE_ALLOCA_H + +/* Define if you have the header file. */ +#undef HAVE_ARPA_INET_H + +/* Define if you have the header file. */ +#undef HAVE_ARPA_NAMESER_H + +/* Define if you have the header file. */ +#undef HAVE_ASSERT_H +#define HAVE_ASSERT_H 1 + +/* Define if you have the `backtrace_symbols_fd' function. */ +#undef HAVE_BACKTRACE_SYMBOLS_FD + +/* Define if you have the `bcopy' function. */ +#undef HAVE_BCOPY + +/* Define if you have the header file. */ +#undef HAVE_BSTRING_H + +/* Define if you have the `bswap_16' function. */ +#undef HAVE_BSWAP_16 + +/* Define if you have the `bswap_32' function. */ +#undef HAVE_BSWAP_32 + +/* Define if you have the header file. */ +#undef HAVE_BYTESWAP_H + +/* Define if you have the `crypt' function. */ +#undef HAVE_CRYPT +#define HAVE_CRYPT 1 + +/* Define if you have the header file. */ +#undef HAVE_CRYPT_H +#define HAVE_CRYPT_H 1 + +/* Define if you have the header file. */ +#undef HAVE_CTYPE_H +#define HAVE_CTYPE_H 1 + +/* Define if you have the header file, and it defines `DIR'. */ +#undef HAVE_DIRENT_H +#define HAVE_DIRENT_H 1 + +/* Define if you have the `drand48' function. */ +#undef HAVE_DRAND48 + +/* Define if you have the header file. */ +#undef HAVE_ERRNO_H +#define HAVE_ERRNO_H 1 + +/* Define if you have the header file. */ +#undef HAVE_EXECINFO_H + +/* Define if you have the `fchmod' function. */ +#undef HAVE_FCHMOD + +/* Define if you have the header file. */ +#undef HAVE_FCNTL_H +#define HAVE_FCNTL_H 1 + +/* Define if you have the `getdtablesize' function. */ +#undef HAVE_GETDTABLESIZE + +/* Define if you have the header file. */ +#undef HAVE_GETOPT_H +#define HAVE_GETOPT_H 1 + +/* Define if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE +#define HAVE_GETPAGESIZE 1 + +/* Define if you have the `getrlimit' function. */ +#undef HAVE_GETRLIMIT + +/* Define if you have the `getrusage' function. */ +#undef HAVE_GETRUSAGE +#define HAVE_GETRUSAGE 1 + +/* Define if you have the `getspnam' function. */ +#undef HAVE_GETSPNAM + +/* Define if you have the header file. */ +#undef HAVE_GLIB_H + +/* Define if you have the header file. */ +#undef HAVE_GNUMALLOC_H + +/* Define if you have the header file. */ +#undef HAVE_GRP_H + +/* Define if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define if you have the header file. */ +#undef HAVE_IP_COMPAT_H + +/* Define if you have the header file. */ +#undef HAVE_IP_FIL_COMPAT_H + +/* Define if you have the header file. */ +#undef HAVE_IP_FIL_H + +/* Define if you have the header file. */ +#undef HAVE_IP_NAT_H + +/* Define if you have the `44bsd' library (-l44bsd). */ +#undef HAVE_LIB44BSD + +/* Define if you have the `bind' library (-lbind). */ +#undef HAVE_LIBBIND + +/* Define if you have the `bsd' library (-lbsd). */ +#undef HAVE_LIBBSD + +/* Define if you have the header file. */ +#undef HAVE_LIBC_H + +/* Define if you have the `gnumalloc' library (-lgnumalloc). */ +#undef HAVE_LIBGNUMALLOC + +/* Define if you have the `intl' library (-lintl). */ +#undef HAVE_LIBINTL + +/* Define if you have the `m' library (-lm). */ +#undef HAVE_LIBM + +/* Define if you have the `malloc' library (-lmalloc). */ +#undef HAVE_LIBMALLOC + +/* Define if you have the `nsl' library (-lnsl). */ +#undef HAVE_LIBNSL + +/* Define if you have the `resolv' library (-lresolv). */ +#undef HAVE_LIBRESOLV + +/* Define if you have the `socket' library (-lsocket). */ +#undef HAVE_LIBSOCKET + +/* Define if you have the header file. */ +#undef HAVE_LIMITS_H +#define HAVE_LIMITS_H 1 + +/* Define if you have the header file. */ +#undef HAVE_LINUX_NETFILTER_IPV4_H + +/* Define if you have the `lrand48' function. */ +#undef HAVE_LRAND48 + +/* Define if you have the `mallinfo' function. */ +#undef HAVE_MALLINFO + +/* Define if you have the `mallocblksize' function. */ +#undef HAVE_MALLOCBLKSIZE + +/* Define if you have the header file. */ +#undef HAVE_MALLOC_H +#define HAVE_MALLOC_H 1 + +/* Define if you have the `mallopt' function. */ +#undef HAVE_MALLOPT + +/* Define if you have the header file. */ +#undef HAVE_MATH_H +#define HAVE_MATH_H 1 + +/* Define if you have the `memcpy' function. */ +#undef HAVE_MEMCPY +#define HAVE_MEMCPY 1 + +/* Define if you have the `memmove' function. */ +#undef HAVE_MEMMOVE +#define HAVE_MEMMOVE 1 + +/* Define if you have the header file. */ +#undef HAVE_MEMORY_H +#define HAVE_MEMORY_H 1 + +/* Define if you have the `memset' function. */ +#undef HAVE_MEMSET +#define HAVE_MEMSET 1 + +/* Define if you have the `mkstemp' function. */ +#undef HAVE_MKSTEMP + +/* Define if you have the `mktime' function. */ +#undef HAVE_MKTIME +#define HAVE_MKTIME 1 + +/* Define if you have the header file. */ +#undef HAVE_MOUNT_H + +/* Define if you have the `mstats' function. */ +#undef HAVE_MSTATS + +/* Define if you have the header file, and it defines `DIR'. */ +#undef HAVE_NDIR_H + +/* Define if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define if you have the header file. */ +#undef HAVE_NETINET_IF_ETHER_H + +/* Define if you have the header file. */ +#undef HAVE_NETINET_IN_H + +/* Define if you have the header file. */ +#undef HAVE_NETINET_IP_COMPAT_H + +/* Define if you have the header file. */ +#undef HAVE_NETINET_IP_FIL_COMPAT_H + +/* Define if you have the header file. */ +#undef HAVE_NETINET_IP_FIL_H + +/* Define if you have the header file. */ +#undef HAVE_NETINET_IP_NAT_H + +/* Define if you have the header file. */ +#undef HAVE_NETINET_TCP_H + +/* Define if you have the header file. */ +#undef HAVE_NET_IF_H + +/* Define if you have the header file. */ +#undef HAVE_NSS_COMMON_H + +/* Define if you have the header file. */ +#undef HAVE_NSS_H + +/* Define if you have the header file. */ +#undef HAVE_OPENSSL_ERR_H +#define HAVE_OPENSSL_ERR_H 1 + +/* Define if you have the header file. */ +#undef HAVE_OPENSSL_MD5_H +#define HAVE_OPENSSL_MD5_H 1 + +/* Define if you have the header file. */ +#undef HAVE_OPENSSL_SSL_H +#define HAVE_OPENSSL_SSL_H 1 + +/* Define if you have the `poll' function. */ +#undef HAVE_POLL + +/* Define if you have the header file. */ +#undef HAVE_POLL_H + +/* Define if you have the `pthread_attr_setschedparam' function. */ +#undef HAVE_PTHREAD_ATTR_SETSCHEDPARAM + +/* Define if you have the `pthread_attr_setscope' function. */ +#undef HAVE_PTHREAD_ATTR_SETSCOPE + +/* Define if you have the `pthread_setschedparam' function. */ +#undef HAVE_PTHREAD_SETSCHEDPARAM + +/* Define if you have the `pthread_sigmask' function. */ +#undef HAVE_PTHREAD_SIGMASK + +/* Define if you have the `putenv' function. */ +#undef HAVE_PUTENV +#define HAVE_PUTENV 1 + +/* Define if you have the header file. */ +#undef HAVE_PWD_H + +/* Define if you have the `random' function. */ +#undef HAVE_RANDOM + +/* Define if you have the `regcomp' function. */ +#undef HAVE_REGCOMP +#define HAVE_REGCOMP 1 + +/* Define if you have the `regexec' function. */ +#undef HAVE_REGEXEC +#define HAVE_REGEXEC 1 + +/* Define if you have the header file. */ +#undef HAVE_REGEX_H + +/* Define if you have the `regfree' function. */ +#define HAVE_REGFREE 1 + +/* Define if you have the header file. */ +#undef HAVE_RESOLV_H + +/* Define if you have the `res_init' function. */ +#undef HAVE_RES_INIT + +/* Define if you have the `rint' function. */ +#undef HAVE_RINT + +/* Define if you have the header file. */ +#undef HAVE_SCHED_H + +/* Define if you have the `seteuid' function. */ +#undef HAVE_SETEUID + +/* Define if you have the `setgroups' function. */ +#undef HAVE_SETGROUPS + +/* Define if you have the `setpgrp' function. */ +#undef HAVE_SETPGRP + +/* Define if you have the `setrlimit' function. */ +#undef HAVE_SETRLIMIT + +/* Define if you have the `setsid' function. */ +#undef HAVE_SETSID + +/* Define if you have the `sigaction' function. */ +#undef HAVE_SIGACTION + +/* Define if you have the header file. */ +#undef HAVE_SIGNAL_H +#define HAVE_SIGNAL_H 1 + +/* Define if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF +#define HAVE_SNPRINTF 1 + +/* Define if you have the `srand48' function. */ +#undef HAVE_SRAND48 + +/* Define if you have the `srandom' function. */ +#undef HAVE_SRANDOM + +/* Define if you have the `statfs' function. */ +#define HAVE_STATFS 1 + +/* Define if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define if you have the header file. */ +#define HAVE_STDDEF_H 1 + +/* Define if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define if you have the header file. */ +#undef HAVE_SYSCALL_H + +/* Define if you have the `sysconf' function. */ +#undef HAVE_SYSCONF + +/* Define if you have the `syslog' function. */ +#undef HAVE_SYSLOG + +/* Define if you have the header file. */ +#undef HAVE_SYSLOG_H + +/* Define if you have the header file, and it defines `DIR'. */ +#undef HAVE_SYS_DIR_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_FILE_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_IOCTL_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_MOUNT_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_MSG_H + +/* Define if you have the header file, and it defines `DIR'. */ +#undef HAVE_SYS_NDIR_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_STATVFS_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_STAT_H +#define HAVE_SYS_STAT_H 1 + +/* Define if you have the header file. */ +#undef HAVE_SYS_SYSCALL_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_TIME_H + +/* Define if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the header file. */ +#undef HAVE_SYS_UN_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_VFS_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_WAIT_H + +/* Define if you have the `tempnam' function. */ +#define HAVE_TEMPNAM 1 + +/* Define if you have the `timegm' function. */ +#undef HAVE_TIMEGM + +/* Define if you have the header file. */ +#undef HAVE_TIME_H +#define HAVE_TIME_H 1 + +/* Define if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define if you have the header file. */ +#undef HAVE_UTIME_H + +/* Define if you have the header file. */ +#undef HAVE_VARARGS_H +#define HAVE_VARARGS_H 1 + +/* Define if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + +/* Name of package */ +#define PACKAGE "squid" + +/* The size of a `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of a `int16_t', as computed by sizeof. */ +#define SIZEOF_INT16_T 2 + +/* The size of a `int32_t', as computed by sizeof. */ +#define SIZEOF_INT32_T 4 + +/* The size of a `int64_t', as computed by sizeof. */ +#define SIZEOF_INT64_T 8 + +/* The size of a `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of a `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* The size of a `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* The size of a `uint16_t', as computed by sizeof. */ +#define SIZEOF_UINT16_T 0 + +/* The size of a `uint32_t', as computed by sizeof. */ +#define SIZEOF_UINT32_T 0 + +/* The size of a `uint64_t', as computed by sizeof. */ +#define SIZEOF_UINT64_T 0 + +/* The size of a `u_int16_t', as computed by sizeof. */ +#define SIZEOF_U_INT16_T 2 + +/* The size of a `u_int32_t', as computed by sizeof. */ +#define SIZEOF_U_INT32_T 4 + +/* The size of a `u_int64_t', as computed by sizeof. */ +#define SIZEOF_U_INT64_T 8 + +/* The size of a `void *', as computed by sizeof. */ +#define SIZEOF_VOID_P 4 + +/* The size of a `__int64', as computed by sizeof. */ +#define SIZEOF___INT64 0 + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "2.5.STABLE2.NT-CVS" + +/* Define if your processor stores words with the most significant byte first + (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef WORDS_BIGENDIAN */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `int' if does not define. */ +/* #undef fd_mask */ + +/* Define to `int' if does not define. */ +/* #undef int16_t */ + +/* Define to `long' if does not define. */ +/* #undef int32_t */ + +/* Define to `unsigned __int64' if does not define. */ +/* #undef int64_t */ + +/* Define to `int' if does not define. */ +/* #undef off_t */ + +/* Define to `int' if does not define. */ +/* #undef pid_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define to `int' if does not define. */ +/* #undef ssize_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef u_int16_t */ + +/* Define to `unsigned long' if does not define. */ +/* #undef u_int32_t */ + +/* Define to `unsigned long long' if does not define. */ +/* #undef u_int64_t */ + +typedef unsigned char u_char; Index: squid/port/win32/squid/squid.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/squid.dsp,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- squid/port/win32/squid/squid.dsp 29 Jun 2002 10:42:05 -0000 1.1.2.8 +++ squid/port/win32/squid/squid.dsp 2 May 2003 13:01:26 -0000 1.1.2.9 @@ -50,7 +50,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "squid - Win32 Debug" @@ -74,7 +74,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF @@ -375,6 +375,10 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\ssl_support.c +# End Source File +# Begin Source File + SOURCE=..\..\..\src\stat.c # End Source File # Begin Source File Index: squid/src/ssl_support.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/ssl_support.c,v retrieving revision 1.6.14.2 retrieving revision 1.6.14.3 diff -u -r1.6.14.2 -r1.6.14.3 --- squid/src/ssl_support.c 9 Feb 2003 17:37:26 -0000 1.6.14.2 +++ squid/src/ssl_support.c 2 May 2003 13:01:27 -0000 1.6.14.3 @@ -35,6 +35,7 @@ #include "squid.h" +#if USE_SSL extern int commUnsetNonBlocking(int fd); extern int commSetNonBlocking(int fd); @@ -401,3 +402,4 @@ } SSL_shutdown(ssl); } +#endif