--------------------- PatchSet 253 Date: 2000/05/02 23:21:53 Author: hno Branch: hno-devel Tag: (none) Log: Cleanup after patch merges into cvs.squid-cache.org Members: configure.in:1.1.1.3.6.7.2.4->1.1.1.3.6.7.2.5 src/HttpMsg.c:1.1.1.1.12.2->1.1.1.1.12.2.2.1 src/acl.c:1.1.1.3.10.5.2.1->1.1.1.3.10.5.2.2 src/cf.data.pre:1.1.1.3.10.6.2.2->1.1.1.3.10.6.2.3 src/client_side.c:1.1.1.3.10.7.2.2->1.1.1.3.10.7.2.3 src/protos.h:1.1.1.3.10.8.2.2->1.1.1.3.10.8.2.3 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.1.1.3.6.7.2.4 retrieving revision 1.1.1.3.6.7.2.5 diff -u -r1.1.1.3.6.7.2.4 -r1.1.1.3.6.7.2.5 --- squid/configure.in 2 May 2000 23:04:11 -0000 1.1.1.3.6.7.2.4 +++ squid/configure.in 2 May 2000 23:21:53 -0000 1.1.1.3.6.7.2.5 @@ -3,13 +3,13 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.1.1.3.6.7.2.4 2000/05/02 23:04:11 hno Exp $ +dnl $Id: configure.in,v 1.1.1.3.6.7.2.5 2000/05/02 23:21:53 hno Exp $ dnl dnl dnl AC_INIT(src/main.c) AC_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.1.1.3.6.7.2.4 $)dnl +AC_REVISION($Revision: 1.1.1.3.6.7.2.5 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AC_CONFIG_AUX_DIR(cfgaux) @@ -642,6 +642,32 @@ fi ]) +dnl Disable "unlinkd" cde +AC_ARG_ENABLE(unlinkd, +[ --disable-unlinkd Do not use unlinkd], +[ if test "$enableval" = "no" ; then + USE_UNLINKD=0 + else + USE_UNLINKD=1 + fi +],[ + # Here we should probably use some magic depending on the selected + # storage models + USE_UNLINKD=1 +]) +if test $USE_UNLINKD; then + echo "unlinkd enabled" + AC_DEFINE(USE_UNLINKD) + OPT_UNLINKD_EXE='$(OPT_UNLINKD_EXE)' + UNLINKD_OBJS='unlinkd.o' +else + echo "unlinkd disabled" + OPT_UNLINKD_EXE='' + UNLINKD_OBJS='' +fi +AC_SUBST(OPT_UNLINKD_EXE) +AC_SUBST(UNLINKD_OBJS) + # Force some compilers to use ANSI features # case "$host" in Index: squid/src/HttpMsg.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/HttpMsg.c,v retrieving revision 1.1.1.1.12.2 retrieving revision 1.1.1.1.12.2.2.1 diff -u -r1.1.1.1.12.2 -r1.1.1.1.12.2.2.1 --- squid/src/HttpMsg.c 20 Apr 2000 18:14:21 -0000 1.1.1.1.12.2 +++ squid/src/HttpMsg.c 2 May 2000 23:21:53 -0000 1.1.1.1.12.2.2.1 @@ -1,6 +1,6 @@ /* - * $Id: HttpMsg.c,v 1.1.1.1.12.2 2000/04/20 18:14:21 hno Exp $ + * $Id: HttpMsg.c,v 1.1.1.1.12.2.2.1 2000/05/02 23:21:53 hno Exp $ * * DEBUG: section 74 HTTP Message * AUTHOR: Alex Rousskov @@ -91,12 +91,7 @@ int httpMsgIsPersistent(float http_ver, const HttpHeader * hdr) { - if (Config.Timeout.pconn < 10) { - /* - * Persistent connections are disabled by configuration - */ - return 0; - } else if (http_ver >= 1.1) { + if (http_ver >= 1.1) { /* * for modern versions of HTTP: persistent unless there is * a "Connection: close" header. Index: squid/src/acl.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/acl.c,v retrieving revision 1.1.1.3.10.5.2.1 retrieving revision 1.1.1.3.10.5.2.2 diff -u -r1.1.1.3.10.5.2.1 -r1.1.1.3.10.5.2.2 --- squid/src/acl.c 2 May 2000 22:50:28 -0000 1.1.1.3.10.5.2.1 +++ squid/src/acl.c 2 May 2000 23:21:53 -0000 1.1.1.3.10.5.2.2 @@ -1,6 +1,6 @@ /* - * $Id: acl.c,v 1.1.1.3.10.5.2.1 2000/05/02 22:50:28 hno Exp $ + * $Id: acl.c,v 1.1.1.3.10.5.2.2 2000/05/02 23:21:53 hno Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -1117,7 +1117,7 @@ /* store validated user in hash, after filling in expiretime */ xstrncpy(checklist->request->user_ident, user, USER_IDENT_SZ); auth_user->expiretime = current_time.tv_sec + Config.authenticateTTL; - auth_user->ip_expiretime = squid_curtime + abs(Config.authenticateIpTTL); + auth_user->ip_expiretime = squid_curtime + Config.authenticateIpTTL; auth_user->ipaddr = checklist->src_addr; hash_join(proxy_auth_cache, (hash_link *) auth_user); /* Continue checking below, as normal */ @@ -1138,7 +1138,7 @@ debug(28, 5) ("aclMatchProxyAuth: user '%s' previously validated\n", user); /* Update IP ttl */ - auth_user->ip_expiretime = squid_curtime + abs(Config.authenticateIpTTL); + auth_user->ip_expiretime = squid_curtime + Config.authenticateIpTTL; auth_user->ipaddr = checklist->src_addr; /* copy username to request for logging on client-side */ xstrncpy(checklist->request->user_ident, user, USER_IDENT_SZ); Index: squid/src/cf.data.pre =================================================================== RCS file: /cvsroot/squid-sf//squid/src/cf.data.pre,v retrieving revision 1.1.1.3.10.6.2.2 retrieving revision 1.1.1.3.10.6.2.3 diff -u -r1.1.1.3.10.6.2.2 -r1.1.1.3.10.6.2.3 --- squid/src/cf.data.pre 2 May 2000 22:50:28 -0000 1.1.1.3.10.6.2.2 +++ squid/src/cf.data.pre 2 May 2000 23:21:53 -0000 1.1.1.3.10.6.2.3 @@ -1,6 +1,6 @@ # -# $Id: cf.data.pre,v 1.1.1.3.10.6.2.2 2000/05/02 22:50:28 hno Exp $ +# $Id: cf.data.pre,v 1.1.1.3.10.6.2.3 2000/05/02 23:21:53 hno Exp $ # # # SQUID Internet Object Cache http://squid.nlanr.net/Squid/ @@ -1033,10 +1033,6 @@ yet allow a dialup user to reconnect on a different dialup port. - If the TTL is set to a negative value then the check is - strict, completely denying access from other IP addresses - until the TTL has expired. - The default is 0 to disable the check. Recommended value if you have dialup users are no more than 60 seconds to allow the user to redial without hassle. If all your users are Index: squid/src/client_side.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v retrieving revision 1.1.1.3.10.7.2.2 retrieving revision 1.1.1.3.10.7.2.3 diff -u -r1.1.1.3.10.7.2.2 -r1.1.1.3.10.7.2.3 --- squid/src/client_side.c 2 May 2000 23:01:48 -0000 1.1.1.3.10.7.2.2 +++ squid/src/client_side.c 2 May 2000 23:21:53 -0000 1.1.1.3.10.7.2.3 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.1.1.3.10.7.2.2 2000/05/02 23:01:48 hno Exp $ + * $Id: client_side.c,v 1.1.1.3.10.7.2.3 2000/05/02 23:21:53 hno Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -59,9 +59,7 @@ #endif #ifdef ATHY_COMPRESSION - #include - #endif #if LINGERING_CLOSE Index: squid/src/protos.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/protos.h,v retrieving revision 1.1.1.3.10.8.2.2 retrieving revision 1.1.1.3.10.8.2.3 diff -u -r1.1.1.3.10.8.2.2 -r1.1.1.3.10.8.2.3 --- squid/src/protos.h 2 May 2000 22:50:29 -0000 1.1.1.3.10.8.2.2 +++ squid/src/protos.h 2 May 2000 23:21:53 -0000 1.1.1.3.10.8.2.3 @@ -1,6 +1,6 @@ /* - * $Id: protos.h,v 1.1.1.3.10.8.2.2 2000/05/02 22:50:29 hno Exp $ + * $Id: protos.h,v 1.1.1.3.10.8.2.3 2000/05/02 23:21:53 hno Exp $ * * * SQUID Internet Object Cache http://squid.nlanr.net/Squid/ @@ -41,7 +41,6 @@ extern void fvdbCountVia(const char *key); extern void fvdbCountForw(const char *key); #endif -char *log_quote(const char *header); #if HEADERS_LOG extern void headersLog(int cs, int pq, method_t m, void *data); #endif