From 02f95cf0d146819e0cf8762e0a55ba8afe35f807 Mon Sep 17 00:00:00 2001
From: hno <>
Date: Sat, 15 Dec 2007 03:07:15 +0000
Subject: [PATCH] Sync store meta assignments with Squid-2.

---
 src/StoreMeta.cc | 6 ++++--
 src/enums.h      | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/StoreMeta.cc b/src/StoreMeta.cc
index 62db930241..ae656d2cad 100644
--- a/src/StoreMeta.cc
+++ b/src/StoreMeta.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: StoreMeta.cc,v 1.7 2007/12/14 19:48:51 hno Exp $
+ * $Id: StoreMeta.cc,v 1.8 2007/12/14 20:07:15 hno Exp $
  *
  * DEBUG: section 20    Storage Manager Swapfile Metadata
  * AUTHOR: Kostas Anagnostakis
@@ -54,7 +54,9 @@ StoreMeta::validType(char type)
     }
 
     /* Not yet implemented */
-    if (type >= STORE_META_END) {
+    if (type >= STORE_META_END ||
+	    type == STORE_META_STOREURL ||
+	    type == STORE_META_VARY_ID) {
         debugs(20, 3, "storeSwapMetaUnpack: Not yet implemented (" << type << ") in disk metadata");
         return false;
     }
diff --git a/src/enums.h b/src/enums.h
index 72da6d4a5c..5aea411e67 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.259 2007/12/14 19:48:51 hno Exp $
+ * $Id: enums.h,v 1.260 2007/12/14 20:07:15 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -442,7 +442,8 @@ enum {
     STORE_META_VARY_HEADERS,	/* Stores Vary request headers */
     STORE_META_STD_LFS,         /* standard metadata in lfs format */
     STORE_META_OBJSIZE,         /* object size, not impleemented, squid26 compatibility */
-    /* STORE_META_VARY_ID,	/ * Unique ID linking variants */
+    STORE_META_STOREURL,	/* the store url, if different to the normal URL */
+    STORE_META_VARY_ID,		/* Unique ID linking variants */
     STORE_META_END
 };
 
-- 
2.47.3