Summary: Fix bad commit, and update test suite.

Keywords:

Astyling Makefile.am and cf.data.pre is bad... updated the reverted files to the intended content.
http_range_test's eventAdd dummy function needed updating to the new
signature.
cache_cf's parseBytesLine had a type in strcmp usage, preventing parsing.

diff --git a/src/Makefile.am b/src/Makefile.am
index 573a58b09f31c2b29d6dbc8dcffc18b53ba5cd43..96b926bfec2f006171262072070f8bf1df5418d6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.77 2003/05/21 00:31:09 hno Exp $
+#  $Id: Makefile.am,v 1.78 2003/05/21 02:58:10 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -37,10 +37,10 @@ DELAY_POOL_ALL_SOURCE = \
        DelayPools.h \
        DelaySpec.cc \
        DelaySpec.h \
-       DelayUser.cc \
-       DelayUser.h \
        DelayTagged.cc \
        DelayTagged.h \
+       DelayUser.cc \
+       DelayUser.h \
        DelayVector.cc \
        DelayVector.h \
        NullDelayId.cc \

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index fe59d3c591e8f2f6c7b696f136a757ef989e0f10..f7932fd5886adb94f96fc53f0be30cb7ca96577a 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.441 2003/05/17 17:35:05 hno Exp $
+ * $Id: cache_cf.cc,v 1.442 2003/05/21 02:58:11 robertc Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -668,7 +668,7 @@ parseBytesLine(size_t * bptr, const char *units)
     if ((token = strtok(NULL, w_space)) == NULL)
         self_destruct();
 
-    if (strcmp(token, "none")) {
+    if (strcmp(token, "none") == 0) {
         *bptr = static_cast<size_t>(1);
         return;
     }

diff --git a/src/cf.data.pre b/src/cf.data.pre
index fcf6dee1be733f0ff0aa0d8a966c17bc96a779f7..e34b5c4c57087639a0aa29a5ac8d24c74fe15aba 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.316 2003/05/21 00:50:09 hno Exp $
+# $Id: cf.data.pre,v 1.317 2003/05/21 02:58:11 robertc Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1770,6 +1770,8 @@ DOC_START
 
          user=         The users name (login)
          error=        Error description (only defined for ERR results)
+         tag=          Apply a tag to a request (for both ERR and OK results)
+                         Only sets a tag, does not alter existing tags.
 
        Keyword values need to be enclosed in quotes if they may
        contain whitespace, or the whitespace escaped using \. Any
@@ -3552,9 +3554,9 @@ Example:
                                in advance - by forcing authentication in your
                                http_access rules.
 
-               class 5         Requests are grouped according their tag (see
+               class 5         Requests are grouped according their tag (see 
                                external_acl's tag= reply).
-       
+
        NOTE: If an IP address is a.b.c.d
                -> bits 25 through 32 are "d"
                -> bits 17 through 24 are "c"
@@ -3607,9 +3609,9 @@ delay_parameters pool aggregate network individual
 delay_parameters pool aggregate network individual user
 
        For a class 5 delay pool:
-    
+
 delay_parameters pool tag
-       
+
        The variables here are:
 
                pool            a pool number - ie, a number between 1 and the
@@ -3630,7 +3632,7 @@ delay_parameters pool tag
 
                tag             the delay parameters for the tag buckets
                                (class 5).
-       
+
        A pair of delay parameters is written restore/maximum, where restore is
        the number of bytes (not bits - modem and network speeds are usually
        quoted in bits) per second placed into the bucket, and maximum is the

diff --git a/test-suite/http_range_test.cc b/test-suite/http_range_test.cc
index 1e24158c41139989c0d54706626ff6b7aa2128d6..e396e14fb082396a24af328bc4a8a0a8f7653791 100644 (file)
--- a/test-suite/http_range_test.cc
+++ b/test-suite/http_range_test.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: http_range_test.cc,v 1.5 2003/03/10 04:57:29 robertc Exp $
+ * $Id: http_range_test.cc,v 1.6 2003/05/21 02:58:10 robertc Exp $
  *
  * DEBUG: section 64    HTTP Range Header
  * AUTHOR: Alex Rousskov
@@ -60,7 +60,7 @@ SQUIDCEXTERN void storeAppendPrintf()
     fatal ("dummy function\n");
 }
 
-SQUIDCEXTERN void eventAdd(const char *name, EVH * func, void *arg, double when, int)
+SQUIDCEXTERN void eventAdd(const char *name, EVH * func, void *arg, double when, int, bool)
 {
     fatal ("dummy function\n");
 }