removed the report of db filesize in GetStorageInUse.

git-svn-id: svn://10.0.0.236/branches/CacheIntegration_BRANCH@55763 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/netwerk/cache/Makefile.in

@@ -0,0 +1,38 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= \
+        public \
+        memcache \
+        filecache \
+        mgr \
+        build \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/netwerk/cache/Makefile.win

@@ -0,0 +1,33 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+
+DEPTH=..\..
+DIRS= 	\
+	public                  \
+	mgr			\
+	memcache		\
+	filecache		\
+	build                   \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/netwerk/cache/build/Makefile.in

@@ -0,0 +1,54 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= nkcacke
+LIBRARY_NAME	= necko_cache
+IS_COMPONENT	= 1
+
+CPPSRCS		= nsNetDataCacheModule.cpp
+
+SHARED_LIBRARY_LIBS = \
+		$(DIST)/lib/libnkcachemgr_s.a \
+		$(DIST)/lib/libnkfilecache_s.a \
+		$(DIST)/lib/libnkmemcache_s.a \
+        $(DIST)/lib/libmozdbm_s.a     \
+        $(DIST)/lib/libxpcomio_s.a \
+		$(NULL)
+
+LOCAL_INCLUDES	= \
+		-I$(DEPTH)/netwerk/cache/memcache \
+		-I$(DEPTH)/netwerk/cache/filecache \
+		-I$(DEPTH)/netwerk/cache/mgr \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS = \
+		$(MKSHLIB_FORCE_ALL) \
+		$(SHARED_LIBRARY_LIBS) \
+		$(MKSHLIB_UNFORCE_ALL) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
+

mozilla/netwerk/cache/build/makefile.win

@@ -0,0 +1,51 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+
+DEPTH=..\..\..
+MODULE=nkcache
+
+MAKE_OBJ_TYPE=DLL
+DLLNAME=nkcache
+DLL=.\$(OBJDIR)\$(DLLNAME).dll
+
+CPP_OBJS=                                    \
+        .\$(OBJDIR)\nsNetDataCacheModule.obj \
+	$(NULL)
+
+LLIBS=                                \
+        $(DIST)\lib\nkcachemgr_s.lib  \
+        $(DIST)\lib\nkfilecache_s.lib \
+        $(DIST)\lib\nkmemcache_s.lib  \
+        $(DIST)\lib\dbm32.lib         \
+        $(DIST)\lib\xpcom.lib         \
+        $(LIBNSPR)  
+
+INCS = $(INCS)                             \
+        -I$(DEPTH)\netwerk\cache\memcache  \
+        -I$(DEPTH)\netwerk\cache\filecache \
+        -I$(DEPTH)\netwerk\cache\mgr       \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
+

mozilla/netwerk/cache/build/nsNetDataCacheModule.cpp

@@ -0,0 +1,49 @@
+ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+#include "nsCOMPtr.h"
+#include "nsIModule.h"
+#include "nscore.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsIGenericFactory.h"
+
+#include "nsINetDataCache.h"
+#include "nsINetDataCacheManager.h"
+#include "nsMemCacheCID.h"
+#include "nsMemCache.h"
+#include "nsNetDiskCache.h"
+#include "nsNetDiskCacheCID.h"
+#include "nsCacheManager.h"
+
+// Factory method to create a new nsMemCache instance.  Used
+// by nsNetDataCacheModule
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMemCache, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNetDiskCache, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCacheManager, Init)
+
+static nsModuleComponentInfo components[] = {
+    { "Memory Cache", NS_MEM_CACHE_FACTORY_CID, NS_NETWORK_MEMORY_CACHE_PROGID, nsMemCacheConstructor },
+    { "File Cache",   NS_NETDISKCACHE_CID,      NS_NETWORK_FILE_CACHE_PROGID,   nsNetDiskCacheConstructor },
+    { "Cache Manager",NS_CACHE_MANAGER_CID,     NS_NETWORK_CACHE_MANAGER_PROGID,nsCacheManagerConstructor }
+};
+
+NS_IMPL_NSGETMODULE("Network Data Cache", components)

mozilla/netwerk/cache/filecache/Makefile.in

@@ -0,0 +1,60 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is Mozilla Communicator.
+# 
+# The Initial Developer of the Original Code is Intel Corp.
+# Portions created by Intel Corp. are
+# Copyright (C) 1999, 1999 Intel Corp.  All
+# Rights Reserved.
+# 
+# Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+#                 Carl Wong <carl.wong@intel.com>
+# 
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+VPATH       = @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = nkcache
+
+LIBRARY_NAME = nkfilecache_s
+
+REQUIRES	= nspr dbm 
+
+EXTRA_DSO_LDOPTS  +=  -L$(DIST)/lib  -lmozdbm_s
+
+EXPORTS=nsNetDiskCacheCID.h \
+	nsNetDiskCache.h \
+	nsIDBAccessor.h \
+	nsDBAccessor.h \
+	$(NULL)
+
+CPPSRCS		= \
+        nsDBAccessor.cpp\
+        nsDBEnumerator.cpp \
+        nsNetDiskCache.cpp \
+        nsDiskCacheRecord.cpp \
+        nsDiskCacheRecordChannel.cpp \
+		$(NULL)
+
+EXTRA_LIBS	= $(NSPR_LIBS) 
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/netwerk/cache/filecache/makefile.win

@@ -0,0 +1,44 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..
+
+include <$(DEPTH)/config/config.mak>
+
+MODULE = nkcache
+
+LIBRARY_NAME = nkfilecache_s
+
+CPP_OBJS=                                    \
+        .\$(OBJDIR)\nsDBAccessor.obj         \
+        .\$(OBJDIR)\nsDBEnumerator.obj       \
+        .\$(OBJDIR)\nsNetDiskCache.obj       \
+        .\$(OBJDIR)\nsDiskCacheRecord.obj    \
+        .\$(OBJDIR)\nsDiskCacheRecordChannel.obj    \
+	$(NULL)
+
+EXPORTS=nsNetDiskCacheCID.h
+
+include <$(DEPTH)\config\rules.mak> 
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -rf $(OBJDIR)
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+

mozilla/netwerk/cache/filecache/nsDBAccessor.cpp

@@ -0,0 +1,416 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+/*
+ * This file is part of filecache implementation.
+ * 
+ * nsIDBAccessor is a interface that shields all the direct database access 
+ * method from nsNetDiskCache. 
+ * 
+ * nsDBAccessor is a implementation of the nsIDBAccessor interface. It
+ * uses dbm(Berkely) as the database. 
+ * 
+ * a nsDiskCacheRecord is mapped into two entries in the database, 
+ *    key->recordID
+ *    recordID->metadata
+ */
+
+#include "nsDBAccessor.h"
+#include "nscore.h"
+
+#include "prtypes.h"
+#include "plhash.h"
+#include "nsCRT.h"
+
+nsDBAccessor::nsDBAccessor() :
+  mDB(0) ,
+  mDBFile(0) ,
+  mSessionID(0) ,
+  mSessionCntr(0) ,
+  mDBFilesize(0) 
+{
+  mLastSyncTime = PR_IntervalNow() ;
+
+  NS_INIT_REFCNT();
+}
+
+nsDBAccessor::~nsDBAccessor()
+{
+  Shutdown() ;
+}
+
+//
+// Implement nsISupports methods
+//
+NS_IMPL_ISUPPORTS(nsDBAccessor, NS_GET_IID(nsIDBAccessor))
+
+
+///////////////////////////////////////////////////////////
+// nsIDBAccessor methods 
+
+NS_IMETHODIMP
+nsDBAccessor::Init(nsIFileSpec* dbfile)
+{
+  char* dbname ;
+
+  // this should cover all platforms. 
+  dbfile->GetNativePath(&dbname) ;
+  
+  mDBFile = dbfile ;
+
+  // FUR - how is page size chosen ?  It's worth putting a comment
+  // in here about the possible usefulness of tuning these parameters
+  HASHINFO hash_info = {
+    16*1024 , /* bucket size */
+    0 ,       /* fill factor */
+    0 ,       /* number of elements */
+    0 ,       /* bytes to cache */
+    0 ,       /* hash function */
+    0} ;      /* byte order */
+
+  mDB = dbopen(dbname,
+               O_RDWR | O_CREAT ,
+               0600 ,
+               DB_HASH ,
+               & hash_info) ;
+
+  nsCRT::free(dbname) ;
+
+  if(!mDB)
+    return NS_ERROR_FAILURE ;
+
+  // set mSessionID
+  DBT db_key, db_data ;
+
+  db_key.data = NS_CONST_CAST(char*, SessionKey) ;
+  db_key.size = PL_strlen(SessionKey) ;
+
+  int status = (*mDB->get)(mDB, &db_key, &db_data, 0) ;
+  if(status == -1) {
+    NS_ERROR("ERROR: failed get session id in database.") ;
+    return NS_ERROR_FAILURE ;
+  }
+
+  if(status == 0) {
+    // get the last session id
+    PRInt16 *old_ID = NS_STATIC_CAST(PRInt16*, db_data.data) ;
+    if(*old_ID < ini_sessionID) {
+      NS_ERROR("ERROR: Bad Session ID in database, corrupted db.") ;
+      return NS_ERROR_FAILURE ;
+    }
+
+    mSessionID = *old_ID + 1 ;
+  } 
+  else if(status == 1) {
+    // must be a new db
+    mSessionID = ini_sessionID ;
+  }
+  db_data.data = NS_REINTERPRET_CAST(void*, &mSessionID) ;
+  db_data.size = sizeof(PRInt16) ;
+
+  // store the new session id
+  status = (*mDB->put)(mDB, &db_key, &db_data, 0) ;
+
+  if(status == 0) {
+    (*mDB->sync)(mDB, 0) ;
+
+    // initialize database filesize
+    return mDBFile->GetFileSize(&mDBFilesize) ;
+  } 
+  else {
+    NS_ERROR("reset session ID failure.") ;
+    return NS_ERROR_FAILURE ;
+  }
+  
+}
+
+NS_IMETHODIMP
+nsDBAccessor::Shutdown(void)
+{
+  if(mDB) {
+    (*mDB->sync)(mDB, 0) ;
+    (*mDB->close)(mDB) ;
+    mDB = nsnull ;
+  }
+
+  return NS_OK ;
+}
+  
+NS_IMETHODIMP
+nsDBAccessor::Get(PRInt32 aID, void** anEntry, PRUint32 *aLength) 
+{
+  if(!anEntry)
+    return NS_ERROR_NULL_POINTER ;
+
+  *anEntry = nsnull ;
+  *aLength = 0 ;
+
+  NS_ASSERTION(mDB, "no database") ;
+
+  DBT db_key, db_data ;
+
+  db_key.data = NS_REINTERPRET_CAST(void*, &aID) ;
+  db_key.size = sizeof(PRInt32) ;
+  
+  int status = 0 ;
+  status = (*mDB->get)(mDB, &db_key, &db_data, 0) ;
+
+  if(status == 0) {
+    *anEntry = db_data.data ;
+    *aLength = db_data.size ;
+    return NS_OK ;
+  } 
+  else if(status == 1)
+    return NS_OK ;
+  else
+    return NS_ERROR_FAILURE ;
+
+}
+
+NS_IMETHODIMP
+nsDBAccessor::Put(PRInt32 aID, void* anEntry, PRUint32 aLength)
+{
+  NS_ASSERTION(mDB, "no database") ;
+
+  DBT db_key, db_data ;
+
+  db_key.data = NS_REINTERPRET_CAST(void*, &aID) ;
+  db_key.size = sizeof(PRInt32) ;
+
+  db_data.data = anEntry ;
+  db_data.size = aLength ;
+
+  if(0 == (*mDB->put)(mDB, &db_key, &db_data, 0)) {
+    return Sync() ;
+  }
+  else {
+    return NS_ERROR_FAILURE ;
+  }
+}
+
+/*
+ * It's more important to remove the id->metadata entry first since
+ * key->id mapping is just a reference
+ */
+NS_IMETHODIMP
+nsDBAccessor::Del(PRInt32 aID, void* anEntry, PRUint32 aLength)
+{
+  NS_ASSERTION(mDB, "no database") ;
+
+  DBT db_key ;
+
+  // delete recordID->metadata
+  db_key.data = NS_REINTERPRET_CAST(void*, &aID) ;
+  db_key.size = sizeof(PRInt32) ;
+
+  PRInt32 status = -1 ;
+  status = (*mDB->del)(mDB, &db_key, 0) ;
+
+  if(-1 == status) {
+    return NS_ERROR_FAILURE ;
+  } 
+
+  // delete key->recordID
+  db_key.data = anEntry ;
+  db_key.size = aLength ;
+  status = (*mDB->del)(mDB, &db_key, 0) ;
+  if(-1 == status) {
+    return NS_ERROR_FAILURE ;
+  } 
+
+  return Sync() ;
+}
+
+NS_IMETHODIMP
+nsDBAccessor::GetID(const char* key, PRUint32 length, PRInt32* aID) 
+{
+  NS_ASSERTION(mDB, "no database") ;
+
+  DBT db_key, db_data ;
+
+  db_key.data = NS_CONST_CAST(char*, key) ;
+  db_key.size = length ;
+
+  int status = (*mDB->get)(mDB, &db_key, &db_data, 0) ;
+  if(status == 0) {
+    // found recordID
+    *aID = *(NS_REINTERPRET_CAST(PRInt32*, db_data.data)) ;
+    return NS_OK ;
+  }
+  else if(status == 1) {
+    // create a new one
+    PRInt32 id = 0 ;
+    id = mSessionID << 16 | mSessionCntr++ ;
+
+    // add new id into mDB
+    db_data.data = NS_REINTERPRET_CAST(void*, &id) ;
+    db_data.size = sizeof(PRInt32) ;
+
+    status = (*mDB->put)(mDB, &db_key, &db_data, 0) ;
+    if(status != 0) {
+      NS_ERROR("updating db failure.") ;
+      return NS_ERROR_FAILURE ;
+    }
+    *aID = id ;
+    return Sync() ;
+  } 
+  else {
+    NS_ERROR("ERROR: keydb failure.") ;
+    return NS_ERROR_FAILURE ;
+  }
+}
+
+NS_IMETHODIMP
+nsDBAccessor::EnumEntry(void** anEntry, PRUint32* aLength, PRBool bReset) 
+{
+  if(!anEntry)
+    return NS_ERROR_NULL_POINTER ;
+
+  *anEntry = nsnull ;
+  *aLength = 0 ;
+
+  NS_ASSERTION(mDB, "no database") ;
+
+  PRUint32 flag ;
+
+  if(bReset) 
+    flag = R_FIRST ;
+  else
+    flag = R_NEXT ;
+
+  DBT db_key, db_data ;
+
+  PRUint32 len = PL_strlen(SessionKey) ;
+
+  int status ;
+
+  do {
+    status = (*mDB->seq)(mDB, &db_key, &db_data, flag) ;
+    flag = R_NEXT ;
+    if(status == -1)
+      return NS_ERROR_FAILURE ;
+    // get next if it's a key->recordID 
+    if(db_key.size > sizeof(PRInt32) && db_data.size == sizeof(PRInt32))
+      continue ;
+    // get next if it's a sessionID entry
+    if(db_key.size == len && db_data.size == sizeof(PRInt16))
+      continue ;
+    // recordID is always 32 bits long
+    if(db_key.size == sizeof(PRInt32))
+      break ;
+  } while(!status) ;
+
+  if (0 == status) {
+    *anEntry = db_data.data ;
+    *aLength = db_data.size ;
+  }
+  return NS_OK ;
+}
+
+/*
+ * returns the cached database file size.
+ * mDBFilesize will be updated during Sync().
+ */
+NS_IMETHODIMP
+nsDBAccessor::GetDBFilesize(PRUint32* aSize)
+{
+  *aSize = mDBFilesize ;
+  return NS_OK ; 
+}
+
+NS_IMETHODIMP
+nsDBAccessor::GetSpecialEntry(void** anEntry, PRUint32* aLength)
+{
+  if(!anEntry)
+    return NS_ERROR_NULL_POINTER ;
+
+  *anEntry = nsnull ;
+  *aLength = 0 ;
+
+  DBT db_key, db_data ;
+
+  db_key.data = NS_CONST_CAST(char*, SpecialEntry) ;
+  db_key.size = PL_strlen(SpecialEntry) ;
+
+  int status = (*mDB->get)(mDB, &db_key, &db_data, 0) ;
+
+  if(status == -1) {
+    NS_ERROR("ERROR: failed get special entry in database.") ;
+    return NS_ERROR_FAILURE ;
+  }
+
+  if(status == 0) {
+    *anEntry = db_data.data ;
+    *aLength = db_data.size ;
+  } 
+  
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDBAccessor::SetSpecialEntry(void* anEntry, PRUint32 aLength)
+{
+  DBT db_key, db_data ;
+
+  db_key.data = NS_CONST_CAST(char*, SpecialEntry) ;
+  db_key.size = PL_strlen(SpecialEntry) ;
+
+  db_data.data = anEntry ;
+  db_data.size = aLength ;
+
+  if(0 == (*mDB->put)(mDB, &db_key, &db_data, 0)) {
+    (*mDB->sync)(mDB, 0) ;
+    return NS_OK ;
+  }
+  else {
+    return NS_ERROR_FAILURE ;
+  }
+}
+
+/*
+ * sync routine is only called when the SyncInterval is reached. Otherwise
+ * it just returns. If db synced, the filesize will be updated at the
+ * same time.
+ */
+nsresult
+nsDBAccessor::Sync(void)
+{
+  PRIntervalTime time = PR_IntervalNow() ;
+  PRIntervalTime duration = time - mLastSyncTime ;
+  
+  if (PR_IntervalToMilliseconds(duration) > SyncInterval) {
+    int status = (*mDB->sync)(mDB, 0) ;
+    if(status == 0) {
+//      printf("\tsynced\n") ;
+      mLastSyncTime = time ;
+      
+      // update db filesize here
+      return mDBFile->GetFileSize(&mDBFilesize) ;
+      
+    } else
+      return NS_ERROR_FAILURE ;
+  } else {
+//    printf("\tnot synced\n") ;
+    return NS_OK ;
+  }
+}

mozilla/netwerk/cache/filecache/nsDBAccessor.h

@@ -0,0 +1,93 @@
+/*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+/*
+ * This file is part of filecache implementation.
+ * 
+ * nsIDBAccessor is a interface that shields all the direct database access 
+ * method from nsNetDiskCache. 
+ * 
+ * nsDBAccessor is a implementation of the nsIDBAccessor interface. It
+ * uses dbm(Berkely) as the database. 
+ *
+ */
+
+#ifndef _NSIDBACCESSOR_H_
+#define _NSIDBACCESSOR_H_
+
+#include "nsIDBAccessor.h"
+#include "mcom_db.h"
+#include "prinrval.h"
+#include "nsCOMPtr.h"
+
+// bogus string for the key of session id 
+static const char * const SessionKey = "SK" ;
+
+// bogus string for the size 
+static const char * const SpecialEntry = "SE" ;
+
+// initial session id number 
+static const PRInt16 ini_sessionID = 0xff ;
+
+static const PRUint16 SyncInterval = 1000 ;
+
+class nsDBAccessor : public nsIDBAccessor
+{
+  public:
+  NS_DECL_ISUPPORTS
+
+  nsDBAccessor() ;
+  virtual ~nsDBAccessor() ;
+  
+  NS_IMETHOD Init(nsIFileSpec* dbfile) ;
+  NS_IMETHOD Shutdown(void) ; 
+
+  NS_IMETHOD Put(PRInt32 aID, void* anEntry, PRUint32 aLength) ;
+
+  NS_IMETHOD Get(PRInt32 aID, void** anEntry, PRUint32 *aLength) ;
+
+  NS_IMETHOD Del(PRInt32 aID, void* anEntry, PRUint32 aLength) ;
+
+  NS_IMETHOD GetID(const char* key, PRUint32 length, PRInt32* aID) ;
+
+  NS_IMETHOD EnumEntry(void* *anEntry, PRUint32* aLength, PRBool bReset) ;
+  
+  NS_IMETHOD GetDBFilesize(PRUint32* aSize) ;
+  
+  NS_IMETHOD GetSpecialEntry(void** anEntry, PRUint32 *aLength) ;
+  NS_IMETHOD SetSpecialEntry(void* anEntry, PRUint32 aLength) ;
+
+  protected:
+  nsresult Sync(void) ;
+
+  private:
+  DB *                          mDB ;
+  nsCOMPtr<nsIFileSpec>         mDBFile ;
+  PRInt16                       mSessionID ;
+  PRInt16                       mSessionCntr ;
+  PRIntervalTime                mLastSyncTime ;
+  PRUint32                      mDBFilesize ; // cached DB filesize, 
+                                              // updated on every sync for now
+} ;
+
+#endif // _NSIDBACCESSOR_H_

mozilla/netwerk/cache/filecache/nsDBEnumerator.cpp

@@ -0,0 +1,108 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+/*
+ * This file is part of filecache implementation.
+ *
+ * It implements a simple iterator for the database, see nsDBAccessor. 
+ */
+
+#include "nsDBEnumerator.h"
+#include "nsDiskCacheRecord.h"
+
+nsDBEnumerator::nsDBEnumerator(nsIDBAccessor* aDB, nsNetDiskCache* aCache) :
+  m_DB(aDB) ,
+  m_DiskCache(aCache) ,
+  m_tempEntry(0) ,
+  m_tempEntry_length(0) ,
+  m_CacheEntry(0) ,
+  m_bReset(PR_TRUE) 
+{
+  NS_INIT_REFCNT();
+
+}
+
+nsDBEnumerator::~nsDBEnumerator()
+{
+  NS_IF_RELEASE(m_CacheEntry) ;
+}
+
+//
+// Implement nsISupports methods
+//
+NS_IMPL_ISUPPORTS(nsDBEnumerator, NS_GET_IID(nsIEnumerator))
+
+/////////////////////////////////////////////////////////////////
+// nsISimpleEnumerator methods
+
+NS_IMETHODIMP
+nsDBEnumerator::HasMoreElements(PRBool *_retval)
+{
+  *_retval = PR_FALSE ;
+
+  nsresult rv = m_DB->EnumEntry(&m_tempEntry, &m_tempEntry_length, m_bReset) ;
+
+  if(NS_FAILED(rv)) {
+    // do some error recovery
+    m_DiskCache->DBRecovery() ;
+    return rv ;
+  }
+
+  m_bReset = PR_FALSE ;
+
+  if(m_tempEntry && m_tempEntry_length != 0)
+    *_retval = PR_TRUE ;
+
+  return NS_OK ;
+}
+
+// this routine does not create a new item by itself  
+// Rather it reuses the item inside the object. So if you need to use the 
+// item later, you have to
+// create a new item specifically, using copy constructor or some other dup 
+// function. And don't forget to release it after you're done
+//
+NS_IMETHODIMP
+nsDBEnumerator::GetNext(nsISupports **_retval)
+{
+  if(!m_CacheEntry) {
+    m_CacheEntry = new nsDiskCacheRecord(m_DB, m_DiskCache) ;
+    if(m_CacheEntry)
+      NS_ADDREF(m_CacheEntry) ;
+    else
+      return NS_ERROR_OUT_OF_MEMORY ;
+  }
+
+  if(!_retval)
+    return NS_ERROR_NULL_POINTER ;
+  *_retval = nsnull ;
+
+  nsresult rv = m_CacheEntry->RetrieveInfo(m_tempEntry, m_tempEntry_length) ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  *_retval = NS_STATIC_CAST(nsISupports*, m_CacheEntry) ;
+  NS_ADDREF(*_retval) ; // all good getter addref 
+
+  return NS_OK ;
+}

mozilla/netwerk/cache/filecache/nsDBEnumerator.h

@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+/*
+ * This file is part of filecache implementation.
+ *
+ * It implements a simple iterator for the database, see nsDBAccessor. 
+ */
+
+#ifndef _NS_DBENUMERATOR_H_
+#define _NS_DBENUMERATOR_H_
+
+#include "nsISimpleEnumerator.h"
+#include "nsINetDataCacheRecord.h"
+#include "nsIDBAccessor.h"
+#include "nsCOMPtr.h"
+#include "nsNetDiskCache.h"
+#include "nsDiskCacheRecord.h"
+
+class nsCachedDiskData ; /* forward decl */
+
+class nsDBEnumerator : public nsISimpleEnumerator {
+public:
+    NS_DECL_ISUPPORTS
+
+    NS_DECL_NSISIMPLEENUMERATOR 
+
+    nsDBEnumerator(nsIDBAccessor* aDB, nsNetDiskCache* aCache) ;
+    virtual ~nsDBEnumerator() ;
+
+private:
+    nsCOMPtr<nsIDBAccessor>                m_DB ;
+    nsCOMPtr<nsNetDiskCache>               m_DiskCache ;
+    void *                                 m_tempEntry ;
+    PRUint32                               m_tempEntry_length ;
+    nsDiskCacheRecord*                     m_CacheEntry ;
+    PRBool                                 m_bReset ;
+};
+
+#endif // _NS_DBENUMERATOR_H_

mozilla/netwerk/cache/filecache/nsDiskCacheRecord.cpp

@@ -0,0 +1,456 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#include "nsDiskCacheRecord.h"
+#include "nsINetDataDiskCache.h"
+#include "nsNetDiskCacheCID.h"
+#include "nsDiskCacheRecordChannel.h"
+#include "nsFileStream.h"
+
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsIProtocolHandler.h"
+#include "nsIIOService.h"
+#include "nsIAllocator.h"
+
+#include "plstr.h"
+#include "prprf.h"
+#include "prmem.h"
+#include "prlog.h"
+#include "prtypes.h"
+#include "netCore.h"
+
+#include "nsDBAccessor.h"
+
+#if !defined(IS_LITTLE_ENDIAN) && !defined(IS_BIG_ENDIAN)
+ERROR! Must have a byte order
+#endif
+
+#ifdef IS_LITTLE_ENDIAN
+#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32))
+#else
+#define COPY_INT32(_a,_b)  /* swap */                   \
+    do {                                                \
+    ((char *)(_a))[0] = ((char *)(_b))[3];              \
+    ((char *)(_a))[1] = ((char *)(_b))[2];              \
+    ((char *)(_a))[2] = ((char *)(_b))[1];              \
+    ((char *)(_a))[3] = ((char *)(_b))[0];              \
+    } while(0)
+#endif
+
+nsDiskCacheRecord::nsDiskCacheRecord(nsIDBAccessor* db, nsNetDiskCache* aCache) :
+  mKey(0) ,
+  mKeyLength(0) ,
+  mRecordID(0) ,
+  mMetaData(0) ,
+  mMetaDataLength(0) ,
+  mDB(db) ,
+  mInfo(0) ,
+  mInfoSize(0) ,
+  mNumChannels(0) ,
+  mDiskCache(aCache) 
+{
+  NS_INIT_REFCNT();
+  NS_ASSERTION(mDiskCache, "Must have an nsNetDiskCache");
+  NS_ADDREF(mDiskCache);
+}
+
+// mem alloced. so caller should do free() on key. 
+NS_IMETHODIMP
+nsDiskCacheRecord::Init(const char* key, PRUint32 length, PRInt32 ID) 
+{
+  NS_NewFileSpec(getter_AddRefs(mFile));
+  if(!mFile)
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  // copy key
+  mKeyLength = length ;
+  mKey = NS_STATIC_CAST(char*, nsAllocator::Alloc(mKeyLength*sizeof(char))) ;
+  if(!mKey) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  memcpy(mKey, key, length) ;
+
+  // get RecordID
+  mRecordID = ID ;
+
+  // setup the file name
+  nsCOMPtr<nsIFileSpec> dbFolder ;
+  mDiskCache->GetDiskCacheFolder(getter_AddRefs(dbFolder)) ;
+
+  nsresult rv = mFile->FromFileSpec(dbFolder) ;
+  if(NS_FAILED(rv))
+    return NS_ERROR_FAILURE ;
+
+  // dir is a hash result of mRecordID%32, hope it's enough 
+  char filename[9], dirName[3] ;
+  
+  PR_snprintf(dirName, 3, "%02x", (((PRUint32)mRecordID) % 32)) ;
+  mFile->AppendRelativeUnixPath(dirName) ;
+
+  PR_snprintf(filename, 9, "%08x", mRecordID) ;
+  mFile->AppendRelativeUnixPath(filename) ;
+
+  return NS_OK ;
+}
+
+nsDiskCacheRecord::~nsDiskCacheRecord()
+{
+  if(mKey)
+    nsAllocator::Free(mKey) ;
+  if(mMetaData)
+    nsAllocator::Free(mMetaData) ;
+  if(mInfo) 
+    nsAllocator::Free(mInfo) ;
+
+  NS_IF_RELEASE(mDiskCache);
+}
+
+//
+// Implement nsISupports methods
+//
+NS_IMPL_ISUPPORTS(nsDiskCacheRecord, NS_GET_IID(nsINetDataCacheRecord))
+
+///////////////////////////////////////////////////////////////////////
+// nsINetDataCacheRecord methods
+
+// yes, mem alloced on *_retval.
+NS_IMETHODIMP
+nsDiskCacheRecord::GetKey(PRUint32 *length, char** _retval) 
+{
+  if(!_retval)
+    return NS_ERROR_NULL_POINTER ;
+
+  *length = mKeyLength ;
+  *_retval = NS_STATIC_CAST(char*, nsAllocator::Alloc(mKeyLength*sizeof(char))) ;
+  if(!*_retval)
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  memcpy(*_retval, mKey, mKeyLength) ;
+
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::GetRecordID(PRInt32* aRecordID)
+{
+  *aRecordID = mRecordID ;
+  return NS_OK ;
+}
+
+// yes, mem alloced on *_retval. 
+NS_IMETHODIMP
+nsDiskCacheRecord::GetMetaData(PRUint32 *length, char **_retval) 
+{
+  if(!_retval)
+    return NS_ERROR_NULL_POINTER ;
+
+  // always null the return value first. 
+  *_retval = nsnull ;
+
+  *length = mMetaDataLength ;
+
+  if(mMetaDataLength) {
+    *_retval = NS_STATIC_CAST(char*, nsAllocator::Alloc(mMetaDataLength*sizeof(char))) ;
+    if(!*_retval)
+      return NS_ERROR_OUT_OF_MEMORY ;
+
+    memcpy(*_retval, mMetaData, mMetaDataLength) ;
+  }
+
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::SetMetaData(PRUint32 length, const char* data)
+{
+  // set the mMetaData
+  mMetaDataLength = length ;
+  if(mMetaData)
+    nsAllocator::Free(mMetaData) ;
+  mMetaData = NS_STATIC_CAST(char*, nsAllocator::Alloc(mMetaDataLength*sizeof(char))) ;
+  if(!mMetaData) {
+    return NS_ERROR_OUT_OF_MEMORY ;
+  }
+  memcpy(mMetaData, data, length) ;
+
+  // Generate mInfo
+  nsresult rv = GenInfo() ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  // write through into mDB
+  rv = mDB->Put(mRecordID, mInfo, mInfoSize) ;
+
+  return rv ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::GetStoredContentLength(PRUint32 *aStoredContentLength)
+{
+  return mFile->GetFileSize(aStoredContentLength) ;
+}
+
+// untill nsIFileSpec::Truncate() is in, we have to do all this ugly stuff
+NS_IMETHODIMP
+nsDiskCacheRecord::SetStoredContentLength(PRUint32 aStoredContentLength)
+{
+  PRUint32 len = 0 ;
+  nsresult rv = mFile->GetFileSize(&len) ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  if(len < aStoredContentLength)
+  {
+    NS_ERROR("Error: can not set filesize to something bigger than itself.\n") ;
+    return NS_ERROR_FAILURE ;
+  }
+  else {
+    rv = mFile->Truncate(aStoredContentLength) ;
+    if(NS_FAILED(rv))
+      return rv ;
+    
+    mDiskCache->m_StorageInUse -= (len - aStoredContentLength) ;
+    return NS_OK ;
+  }
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::Delete(void)
+{
+  if(mNumChannels)
+    return NS_ERROR_NOT_AVAILABLE ;
+
+  PRUint32 len ;
+  mFile->GetFileSize(&len) ;
+
+  nsFileSpec cache_file ;
+  nsresult rv = mFile->GetFileSpec(&cache_file) ;
+
+  if(NS_FAILED(rv)) 
+    return NS_ERROR_FAILURE ;
+
+  cache_file.Delete(PR_TRUE) ;
+
+  // updata the storage size
+  mDiskCache->m_StorageInUse -= len ;
+
+  rv = mDB->Del(mRecordID, mKey, mKeyLength) ;
+  if(NS_FAILED(rv)) 
+    return NS_ERROR_FAILURE ;
+  else
+    return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::GetFilename(nsIFileSpec * *aFilename) 
+{
+  if(!aFilename)
+    return NS_ERROR_NULL_POINTER ;
+
+  *aFilename = mFile ;
+  NS_ADDREF(*aFilename) ;
+
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecord::NewChannel(nsILoadGroup *loadGroup, nsIChannel **_retval) 
+{
+  nsDiskCacheRecordChannel* channel = new nsDiskCacheRecordChannel(this, loadGroup) ;
+  if(!channel) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  nsresult rv = channel->Init() ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  NS_ADDREF(channel) ;
+  *_retval = NS_STATIC_CAST(nsIChannel*, channel) ;
+  return NS_OK ;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// nsDiskCacheRecord methods
+
+// file name is represented by a url string. I hope this would be more
+// generic
+nsresult
+nsDiskCacheRecord::GenInfo() 
+{
+  if(mInfo)
+    nsAllocator::Free(mInfo) ;
+
+  char* file_url=nsnull ;
+  PRUint32 name_len ;
+  mFile->GetURLString(&file_url) ;
+  name_len = PL_strlen(file_url)+1 ;
+
+  mInfoSize  = sizeof(PRUint32) ;    // checksum for mInfoSize
+  mInfoSize += sizeof(PRInt32) ;     // RecordID
+  mInfoSize += sizeof(PRUint32) ;    // key length
+  mInfoSize += mKeyLength ;          // key 
+  mInfoSize += sizeof(PRUint32) ;    // metadata length
+  mInfoSize += mMetaDataLength ;     // metadata 
+  mInfoSize += sizeof(PRUint32) ;    // filename length
+  mInfoSize += name_len ;            // filename 
+
+  void* newInfo = nsAllocator::Alloc(mInfoSize*sizeof(char)) ;
+  if(!newInfo) {
+    return NS_ERROR_OUT_OF_MEMORY ;
+  }
+
+  // copy the checksum mInfoSize
+  char* cur_ptr = NS_STATIC_CAST(char*, newInfo) ;
+  COPY_INT32(cur_ptr, &mInfoSize) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // copy RecordID
+  COPY_INT32(cur_ptr, &mRecordID) ;
+  cur_ptr += sizeof(PRInt32) ;
+
+  // copy key length
+  COPY_INT32(cur_ptr, &mKeyLength) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // copy key
+  memcpy(cur_ptr, mKey, mKeyLength) ;
+  cur_ptr += mKeyLength ;
+
+  // copy metadata length
+  COPY_INT32(cur_ptr, &mMetaDataLength) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // copy metadata
+  memcpy(cur_ptr, mMetaData, mMetaDataLength) ;
+  cur_ptr += mMetaDataLength ;
+
+  // copy file name length 
+  COPY_INT32(cur_ptr, &name_len) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // copy file name
+  memcpy(cur_ptr, file_url, name_len) ;
+  cur_ptr += name_len ;
+
+  PR_ASSERT(cur_ptr == NS_STATIC_CAST(char*, newInfo) + mInfoSize);
+  mInfo = newInfo ;
+
+  return NS_OK ;
+}
+
+/*
+ * This Method suppose to get all the info from the db record
+ * and set them to accroding members. the original values
+ * will all be overwritten. only minimal error checking is performed.
+ */
+NS_IMETHODIMP
+nsDiskCacheRecord::RetrieveInfo(void* aInfo, PRUint32 aInfoLength) 
+{
+  // reset everything
+  if(mInfo) {
+    nsAllocator::Free(mInfo) ;
+    mInfo = nsnull ;
+  }
+
+  if(mKey) {
+    nsAllocator::Free(mKey) ;
+    mKey = nsnull ;
+  }
+  if(mMetaData) {
+    nsAllocator::Free(mMetaData) ;
+    mMetaData = nsnull ;
+  }
+
+  char * cur_ptr = NS_STATIC_CAST(char*, aInfo) ;
+
+  char* file_url ;
+  PRUint32 name_len ;
+
+  // set mInfoSize 
+  COPY_INT32(&mInfoSize, cur_ptr) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // check this at least
+  if(mInfoSize != aInfoLength) 
+    return NS_ERROR_FAILURE ;
+
+  // set mRecordID 
+  COPY_INT32(&mRecordID, cur_ptr) ;
+  cur_ptr += sizeof(PRInt32) ;
+
+  // set mKeyLength
+  COPY_INT32(&mKeyLength, cur_ptr) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // set mKey
+  mKey = NS_STATIC_CAST(char*, nsAllocator::Alloc(mKeyLength*sizeof(char))) ;
+  if(!mKey) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+  
+  memcpy(mKey, cur_ptr, mKeyLength) ;
+  cur_ptr += mKeyLength ;
+
+  PRInt32 id ;
+  mDB->GetID(mKey, mKeyLength, &id) ;
+  NS_ASSERTION(id==mRecordID, "\t ++++++ bad record, somethings wrong\n") ;
+
+  // set mMetaDataLength
+  COPY_INT32(&mMetaDataLength, cur_ptr) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // set mMetaData
+  mMetaData = NS_STATIC_CAST(char*, nsAllocator::Alloc(mMetaDataLength*sizeof(char))) ;
+  if(!mMetaData) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+  
+  memcpy(mMetaData, cur_ptr, mMetaDataLength) ;
+  cur_ptr += mMetaDataLength ;
+
+  // get mFile name length
+  COPY_INT32(&name_len, cur_ptr) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  // get mFile native name
+  file_url = NS_STATIC_CAST(char*, nsAllocator::Alloc(name_len*sizeof(char))) ;
+  if(!file_url) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+  
+  memcpy(file_url, cur_ptr, name_len) ;
+  cur_ptr += name_len ;
+
+  PR_ASSERT(cur_ptr == NS_STATIC_CAST(char*, aInfo) + mInfoSize);
+
+  // create mFile if Init() isn't called 
+  if(!mFile) {
+    NS_NewFileSpec(getter_AddRefs(mFile));
+    if(!mFile)
+      return NS_ERROR_OUT_OF_MEMORY ;
+  }
+
+  // setup mFile
+  mFile->SetURLString(file_url) ;
+
+  return NS_OK ;
+}
+

mozilla/netwerk/cache/filecache/nsDiskCacheRecord.h

@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#ifndef _NET_CACHEDDISKDATA_H_
+#define _NET_CACHEDDISKDATA_H_
+
+#include "nsINetDataCacheRecord.h"
+#include "nsCOMPtr.h"
+#include "nsIDBAccessor.h"
+#include "prtypes.h"
+#include "nsILoadGroup.h"
+#include "nsIFileChannel.h" 
+#include "nsNetDiskCache.h"
+
+class nsDiskCacheRecord : public nsINetDataCacheRecord
+{
+  public:
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSINETDATACACHERECORD
+
+  protected: 
+
+  nsDiskCacheRecord(nsIDBAccessor* db, nsNetDiskCache* aCache) ;
+  virtual ~nsDiskCacheRecord() ;
+
+  NS_IMETHOD RetrieveInfo(void* aInfo, PRUint32 aInfoLength) ;
+  NS_IMETHOD Init(const char* key, PRUint32 length, PRInt32 ID) ;
+
+  nsresult GenInfo(void) ;
+
+  private:
+
+  char*                     mKey ;
+  PRUint32                  mKeyLength ;
+  PRInt32                   mRecordID ;
+  char*                     mMetaData ;
+  PRUint32                  mMetaDataLength ;
+  nsCOMPtr<nsIFileSpec>     mFile ;
+  nsCOMPtr<nsIDBAccessor>            mDB ; 
+  void*                     mInfo ;
+  PRUint32                  mInfoSize ;
+  PRUint32                  mNumChannels ;
+  nsNetDiskCache*           mDiskCache ;
+
+  friend class nsDiskCacheRecordChannel ;
+  friend class nsDBEnumerator ;
+  friend class nsNetDiskCache ;
+} ;
+
+#endif // _NET_CACHEDDISKDATA_H_

mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.cpp

@@ -0,0 +1,552 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+/*
+ * Most of the code are taken from nsFileChannel.  
+ */
+
+#include "nsDiskCacheRecordChannel.h"
+#include "nsIFileTransportService.h"
+//#include "nsIIOService.h"
+#include "nsIServiceManager.h"
+#include "nsIURL.h"
+#include "nsIOutputStream.h"
+#include "netCore.h"
+#include "nsIMIMEService.h"
+#include "nsISupportsUtils.h"
+
+//static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
+static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
+static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
+static NS_DEFINE_CID(kMIMEServiceCID, NS_MIMESERVICE_CID);
+
+// This is copied from nsMemCacheChannel, We should consolidate these two.
+class WriteStreamWrapper : public nsIOutputStream 
+{
+  public:
+  WriteStreamWrapper(nsDiskCacheRecordChannel* aChannel,
+                     nsIOutputStream *aBaseStream) ;
+
+  virtual ~WriteStreamWrapper() ;
+
+  static nsresult
+  Create(nsDiskCacheRecordChannel* aChannel, nsIOutputStream *aBaseStream, nsIOutputStream* *aWrapper) ;
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIBASESTREAM
+  NS_DECL_NSIOUTPUTSTREAM
+
+  private:
+  nsDiskCacheRecordChannel*         mChannel;
+  nsCOMPtr<nsIOutputStream>         mBaseStream;
+} ;
+
+// implement nsISupports
+NS_IMPL_ISUPPORTS(WriteStreamWrapper, NS_GET_IID(nsIOutputStream))
+
+WriteStreamWrapper::WriteStreamWrapper(nsDiskCacheRecordChannel* aChannel, 
+                                       nsIOutputStream *aBaseStream) 
+  : mChannel(aChannel), mBaseStream(aBaseStream)
+{ 
+  NS_INIT_REFCNT(); 
+  NS_ADDREF(mChannel);
+}
+
+WriteStreamWrapper::~WriteStreamWrapper()
+{
+  NS_RELEASE(mChannel);
+}
+
+nsresult 
+WriteStreamWrapper::Create(nsDiskCacheRecordChannel*aChannel, nsIOutputStream *aBaseStream, nsIOutputStream* * aWrapper) 
+{
+  WriteStreamWrapper *wrapper = new WriteStreamWrapper(aChannel, aBaseStream);
+  if (!wrapper) return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(wrapper);
+  *aWrapper = wrapper;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+WriteStreamWrapper::Write(const char *aBuffer, PRUint32 aCount, PRUint32 *aNumWritten) 
+{
+  *aNumWritten = 0;
+  nsresult rv = mBaseStream->Write(aBuffer, aCount, aNumWritten);
+  mChannel->NotifyStorageInUse(*aNumWritten);
+  return rv;
+}
+
+NS_IMETHODIMP
+WriteStreamWrapper::Flush() 
+{ 
+  return mBaseStream->Flush(); 
+}
+
+NS_IMETHODIMP
+WriteStreamWrapper::Close() 
+{ 
+  return mBaseStream->Close(); 
+}
+
+nsDiskCacheRecordChannel::nsDiskCacheRecordChannel(nsDiskCacheRecord *aRecord, 
+                                                   nsILoadGroup *aLoadGroup)
+  : mRecord(aRecord) ,
+    mLoadGroup(aLoadGroup) 
+{
+  NS_INIT_REFCNT() ;
+  NS_ADDREF(mRecord);
+  mRecord->mNumChannels++ ;
+}
+
+nsDiskCacheRecordChannel::~nsDiskCacheRecordChannel()
+{
+  mRecord->mNumChannels-- ;
+  NS_RELEASE(mRecord);
+}
+
+//  I know that I gave conflicting advice on the issue of file
+//  transport versus file protocol handler, but I thought that the
+//  last word was that we would use the raw transport, when I wrote:
+//
+//   > I just thought of an argument for the other side of the coin, i.e. the
+//   > benefit of *not* reusing the file protocol handler: On the Mac, it's
+//   > expensive to convert from a string URL to an nsFileSpec, because the Mac
+//   > is brain-dead and scans every directory on the path to the file.  It's
+//   > cheaper to create a nsFileSpec for a cache file by combining a single,
+//   > static nsFileSpec that corresponds to the cache directory with the
+//   > relative path to the cache file (using nsFileSpec's operator +).  This
+//   > operation is optimized on the Mac to avoid the scanning operation.
+//
+//  The Mac guys will eat us alive if we do path string to nsFileSpec
+//  conversions for every cache file we open.
+
+nsresult 
+nsDiskCacheRecordChannel::Init(void) 
+{
+  nsresult rv = mRecord->mFile->GetFileSpec(&mSpec) ;
+  
+#ifdef XP_MAC
+
+  // Don't assume we actually created a good file spec
+  FSSpec theSpec = mSpec.GetFSSpec();
+  if (!theSpec.name[0]) {
+    NS_ERROR("failed to create a file spec");
+
+    // Since we didn't actually create the file spec
+    // we return an error
+    return NS_ERROR_MALFORMED_URI;
+  }
+#endif
+  
+  return rv ;
+
+}
+
+nsresult 
+nsDiskCacheRecordChannel::NotifyStorageInUse(PRInt32 aBytesUsed)
+{
+  return mRecord->mDiskCache->m_StorageInUse += aBytesUsed ;
+}
+
+// implement nsISupports
+NS_IMPL_ISUPPORTS4(nsDiskCacheRecordChannel, 
+                   nsIChannel, 
+                   nsIRequest,
+                   nsIStreamListener,
+                   nsIStreamObserver)
+
+// implement nsIRequest
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::IsPending(PRBool *aIsPending) 
+{
+  *aIsPending = PR_FALSE ;
+  if(!mFileTransport)
+    return NS_OK ;
+
+  return mFileTransport->IsPending(aIsPending) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::Cancel(void)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->Cancel() ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::Suspend(void)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->Suspend() ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::Resume(void)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->Resume() ;
+}
+
+// implement nsIChannel
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetOriginalURI(nsIURI* *aURI)
+{
+  // FUR - might need to implement this - not sure
+  return NS_ERROR_NOT_IMPLEMENTED ;
+}
+  
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetURI(nsIURI * *aURI)
+{
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->GetURI(aURI) ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::OpenInputStream(PRUint32 aStartPosition, 
+                                          PRInt32 aReadCount,
+                                          nsIInputStream* *aResult)
+{
+  nsresult rv ;
+
+  if(mFileTransport)
+    return NS_ERROR_IN_PROGRESS ;
+
+  NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv) ;
+  if(NS_FAILED(rv)) return rv ;
+  
+  rv = fts->CreateTransport(mSpec, "load", 0, 0, getter_AddRefs(mFileTransport)) ;
+  if(NS_FAILED(rv))
+    return rv ;
+  
+  // we don't need to worry about notification callbacks
+  
+  rv = mFileTransport->OpenInputStream(aStartPosition, aReadCount, aResult) ;
+  if(NS_FAILED(rv)) 
+    mFileTransport = nsnull ;
+
+  return rv ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::OpenOutputStream(PRUint32 startPosition, 
+                                           nsIOutputStream* *aResult)
+{
+  nsresult rv ;
+  NS_ENSURE_ARG(aResult) ;
+  
+  if(mFileTransport)
+    return NS_ERROR_IN_PROGRESS ;
+
+  nsCOMPtr<nsIOutputStream> outputStream ;
+
+  NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv) ;
+  if(NS_FAILED(rv)) return rv ;
+  
+  rv = fts->CreateTransport(mSpec, "load", 0, 0, getter_AddRefs(mFileTransport)) ;
+  if(NS_FAILED(rv))
+    return rv ;
+ 
+  // we don't need to worry about notification callbacks
+  
+  rv = mFileTransport->OpenOutputStream(startPosition, getter_AddRefs(outputStream)) ;
+  if(NS_FAILED(rv)) {
+    mFileTransport = nsnull ;
+    return rv ;
+  }
+ 
+  return WriteStreamWrapper::Create(this, outputStream, aResult) ;
+
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::AsyncOpen(nsIStreamObserver *observer, 
+                                    nsISupports *ctxt)
+{
+  return NS_ERROR_NOT_IMPLEMENTED ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::AsyncRead(PRUint32 aStartPosition, 
+                                    PRInt32 aReadCount,
+                                    nsISupports *aContext, 
+                                    nsIStreamListener *aListener)
+{
+  nsresult rv ;
+
+  if(mFileTransport)
+    return NS_ERROR_IN_PROGRESS ;
+  
+  mRealListener = aListener;
+  nsCOMPtr<nsIStreamListener> tempListener = this;
+
+  if (mLoadGroup) {
+    nsCOMPtr<nsILoadGroupListenerFactory> factory;
+    //
+    // Create a load group "proxy" listener...
+    //
+    rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
+    if (factory) {
+      nsIStreamListener *newListener;
+      rv = factory->CreateLoadGroupListener(mRealListener, &newListener);
+      if (NS_SUCCEEDED(rv)) {
+        mRealListener = newListener;
+        NS_RELEASE(newListener);
+        }
+      }
+
+      rv = mLoadGroup->AddChannel(this, nsnull);
+      if (NS_FAILED(rv)) return rv;
+  }
+
+
+  NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv);
+  if (NS_FAILED(rv)) return rv;
+
+  rv = fts->CreateTransport(mSpec, "load", 0, 0, getter_AddRefs(mFileTransport));
+  if (NS_FAILED(rv)) return rv;
+
+  // no callbacks
+
+  rv = mFileTransport->AsyncRead(aStartPosition, 
+                                 aReadCount, 
+                                 aContext, 
+                                 tempListener);
+
+  if (NS_FAILED(rv)) {
+    // release the transport so that we don't think we're in progress
+    mFileTransport = nsnull;
+  }
+  return rv;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::AsyncWrite(nsIInputStream *fromStream, 
+                                     PRUint32 startPosition,
+                                     PRInt32 writeCount, 
+                                     nsISupports *ctxt,
+                                     nsIStreamObserver *observer)
+
+{
+  /*
+  if(!mFileTransport)
+    return NS_ERROR_FAILURE ;
+
+  return mFileTransport->AsyncWrite(fromStream, 
+                                    startPosition,
+                                    writeCount,
+                                    ctxt,
+                                    observer) ;
+  */
+
+  // I can't do this since the write is not monitored, and I won't be
+  // able to updata the storage. 
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
+{
+  // Not required to be implemented, since it is implemented by cache manager
+  NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
+{
+  // Not required to be implemented, since it is implemented by cache manager
+  NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+#define DUMMY_TYPE "text/html"
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetContentType(char * *aContentType)
+{
+  nsresult rv ;
+
+  if (mSpec.IsDirectory()) {
+    *aContentType = nsCRT::strdup("application/http-index-format");
+    return *aContentType ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+  }
+  else {
+    // I wish I can make this simplier
+
+    char* urlStr ;
+    mRecord->mFile->GetURLString(&urlStr) ;
+
+    // file: URLs (currently) have no additional structure beyond that provided by standard
+    // URLs, so there is no "outer" given to CreateInstance 
+
+    nsCOMPtr<nsIURI> url;
+    rv = nsComponentManager::CreateInstance(kStandardURLCID, nsnull,
+                                            NS_GET_IID(nsIURI),
+                                            //(void**)&url);
+                                            getter_AddRefs(url)) ;
+    if (NS_FAILED(rv)) return rv;
+
+    rv = url->SetSpec((char*)urlStr);
+    if (NS_FAILED(rv)) 
+        return rv;
+
+    NS_WITH_SERVICE(nsIMIMEService, MIMEService, kMIMEServiceCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = MIMEService->GetTypeFromURI(url, aContentType);
+    if (NS_SUCCEEDED(rv)) return rv;
+  }
+
+  // if all else fails treat it as text/html?
+  *aContentType = nsCRT::strdup(DUMMY_TYPE);
+  if (!*aContentType) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  } else {
+    return NS_OK;
+  }
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetContentLength(PRInt32 *aContentLength)
+{
+  nsresult rv;
+  PRUint32 length;
+
+  rv = mRecord->mFile->GetFileSize(&length);
+  if (NS_SUCCEEDED(rv)) {
+    *aContentLength = (PRInt32)length;
+  } else {
+    *aContentLength = -1;
+  }
+  return rv;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetOwner(nsISupports* *aOwner)
+{
+  *aOwner = mOwner.get() ;
+  NS_IF_ADDREF(*aOwner) ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::SetOwner(nsISupports* aOwner) 
+{
+  mOwner = aOwner ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
+      return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
+      return NS_OK;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
+      return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsDiskCacheRecordChannel method unexpectedly called");
+      return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIStreamListener methods:
+////////////////////////////////////////////////////////////////////////////////
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::OnStartRequest(nsIChannel* transportChannel, nsISupports* context)
+{
+  NS_ASSERTION(mRealListener, "No listener...");
+  return mRealListener->OnStartRequest(this, context);
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::OnStopRequest(nsIChannel* transportChannel, nsISupports* context,
+                             nsresult aStatus, const PRUnichar* aMsg)
+{
+  nsresult rv;
+
+  rv = mRealListener->OnStopRequest(this, context, aStatus, aMsg);
+
+  if (mLoadGroup) {
+    if (NS_SUCCEEDED(rv)) {
+      mLoadGroup->RemoveChannel(this, context, aStatus, aMsg);
+    }
+  }
+
+  // Release the reference to the consumer stream listener...
+  mRealListener = null_nsCOMPtr();
+  mFileTransport = null_nsCOMPtr();
+  return rv;
+}
+
+NS_IMETHODIMP
+nsDiskCacheRecordChannel::OnDataAvailable(nsIChannel* transportChannel, nsISupports* context,
+                               nsIInputStream *aIStream, PRUint32 aSourceOffset,
+                               PRUint32 aLength)
+{
+  nsresult rv;
+
+  rv = mRealListener->OnDataAvailable(this, context, aIStream,
+                                      aSourceOffset, aLength);
+
+  //
+  // If the connection is being aborted cancel the transport.  This will
+  // insure that the transport will go away even if it is blocked waiting
+  // for the consumer to empty the pipe...
+  //
+  if (NS_FAILED(rv)) {
+    mFileTransport->Cancel();
+  }
+  return rv;
+}
+

mozilla/netwerk/cache/filecache/nsDiskCacheRecordChannel.h

@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#ifndef _ns_DiskCacheRecordChannel_h_
+#define _ns_DiskCacheRecordChannel_h_
+
+#include "nsIChannel.h"
+#include "nsCOMPtr.h"
+#include "nsDiskCacheRecord.h"
+#include "nsIStreamListener.h"
+
+/*
+ * This class is plagiarized from nsMemCacheChannel
+ */
+
+class nsDiskCacheRecordChannel : public nsIChannel,
+                                 public nsIStreamListener 
+{
+  public:
+
+  nsDiskCacheRecordChannel(nsDiskCacheRecord *aRecord, nsILoadGroup *aLoadGroup);
+  virtual ~nsDiskCacheRecordChannel() ;
+
+  // Declare nsISupports methods
+  NS_DECL_ISUPPORTS
+
+  // Declare nsIRequest methods
+  NS_DECL_NSIREQUEST
+
+  // Declare nsIChannel methods
+  NS_DECL_NSICHANNEL
+
+  // Declare nsIStreamObserver methods
+  NS_DECL_NSISTREAMOBSERVER
+
+  // Declare nsIStreamListener methods
+  NS_DECL_NSISTREAMLISTENER
+
+  nsresult Init(void) ;
+
+  private:
+
+  nsresult NotifyStorageInUse(PRInt32 aBytesUsed) ;
+
+  nsDiskCacheRecord*                    mRecord ;
+  nsCOMPtr<nsILoadGroup>                mLoadGroup ;
+  nsCOMPtr<nsISupports>                 mOwner ;
+  nsCOMPtr<nsIChannel>                  mFileTransport ;
+  nsFileSpec                            mSpec ;
+  nsCOMPtr<nsIStreamListener>           mRealListener;
+
+  friend class WriteStreamWrapper ;
+} ;
+
+#endif // _ns_DiskCacheRecordChannel_h_
+

mozilla/netwerk/cache/filecache/nsIDBAccessor.h

@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#ifndef _NS_IDBACCESSOR_H_
+#define _NS_IDBACCESSOR_H_
+
+#include "nsISupports.h"
+#include "nsIFileSpec.h"
+
+// nsIDBAccessorIID {6AADD4D0-7785-11d3-87FE-000629D01344}
+#define NS_IDBACCESSOR_IID \
+{ 0x6aadd4d0, 0x7785, 0x11d3, \
+ {0x87, 0xfe, 0x0, 0x6, 0x29, 0xd0, 0x13, 0x44}}
+
+// nsDBAccessorCID {6AADD4D1-7785-11d3-87FE-000629D01344}
+#define NS_DBACCESSOR_CID \
+{ 0x6aadd4d1, 0x7785, 0x11d3, \
+  { 0x87, 0xfe, 0x0, 0x6, 0x29, 0xd0, 0x13, 0x44 }} 
+
+class nsIDBAccessor : public nsISupports
+{
+  public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDBACCESSOR_IID)
+
+  NS_IMETHOD Init(nsIFileSpec* DBFile) = 0 ;
+  NS_IMETHOD Shutdown(void) = 0 ;
+
+  NS_IMETHOD Put(PRInt32 aID, void* anEntry, PRUint32 aLength) = 0 ;
+
+  NS_IMETHOD Get(PRInt32 aID, void** anEntry, PRUint32 *aLength) = 0 ;
+
+  NS_IMETHOD Del(PRInt32 aID, void* anEntry, PRUint32 aLength) = 0 ;
+
+  NS_IMETHOD GetID(const char* key, PRUint32 length, PRInt32* aID) = 0 ;
+
+  NS_IMETHOD EnumEntry(void* *anEntry, PRUint32* aLength, PRBool bReset) = 0 ;
+  
+  NS_IMETHOD GetDBFilesize(PRUint32* aSize) = 0 ;
+    
+  NS_IMETHOD GetSpecialEntry(void** anEntry, PRUint32 *aLength) = 0 ;
+  NS_IMETHOD SetSpecialEntry(void* anEntry, PRUint32 aLength) = 0 ;
+
+} ;
+
+#endif // _NS_IDBACCESSOR_H_
+

mozilla/netwerk/cache/filecache/nsNetDiskCache.cpp

@@ -0,0 +1,704 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#include "nsNetDiskCache.h"
+#include "nscore.h"
+
+#include "plstr.h"
+#include "prprf.h"
+#include "prtypes.h"
+#include "prio.h"
+#include "prsystem.h" // Directory Seperator
+#include "plhash.h"
+#include "prclist.h"
+#include "prmem.h"
+#include "prlog.h"
+
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+
+#include "nsIPref.h"
+#include "mcom_db.h"
+#include "nsDBEnumerator.h"
+
+#include "nsDiskCacheRecord.h"
+#include "netCore.h"
+
+#if !defined(IS_LITTLE_ENDIAN) && !defined(IS_BIG_ENDIAN)
+ERROR! Must have a byte order
+#endif
+
+#ifdef IS_LITTLE_ENDIAN
+#define COPY_INT32(_a,_b)  memcpy(_a, _b, sizeof(int32))
+#else
+#define COPY_INT32(_a,_b)  /* swap */                   \
+    do {                                                \
+    ((char *)(_a))[0] = ((char *)(_b))[3];              \
+    ((char *)(_a))[1] = ((char *)(_b))[2];              \
+    ((char *)(_a))[2] = ((char *)(_b))[1];              \
+    ((char *)(_a))[3] = ((char *)(_b))[0];              \
+    } while(0)
+#endif
+
+static NS_DEFINE_CID(kPrefCID, NS_PREF_CID) ;
+static NS_DEFINE_CID(kDBAccessorCID, NS_DBACCESSOR_CID) ;
+
+static const PRUint32 DISK_CACHE_SIZE_DEFAULT = 5*1024*1024 ; // 5MB
+static const char * const DISK_CACHE_PREF  = "browser.cache.disk_cache_size";
+static const char * const CACHE_DIR_PREF   = "browser.cache.directory";
+
+class nsDiskCacheRecord ;
+
+nsNetDiskCache::nsNetDiskCache() :
+  m_Enabled(PR_TRUE) ,
+  m_NumEntries(0) ,
+  m_pNextCache(0) ,
+  m_pDiskCacheFolder(0) ,
+  m_StorageInUse(0) ,
+  m_DB(0) ,
+  m_DBCorrupted(PR_FALSE) 
+{
+  // set it to INF for now 
+  m_MaxEntries = (PRUint32)-1 ;
+
+  NS_INIT_REFCNT();
+
+}
+
+nsNetDiskCache::~nsNetDiskCache()
+{
+  SetSpecialEntry() ;
+
+  NS_IF_RELEASE(m_DB) ;
+  
+
+  // FUR
+  // I think that, eventually, we also want a distinguished key in the DB which
+  // means "clean cache shutdown".  You clear this flag when the db is first
+  // opened and set it just before the db is closed.  If the db wasn't shutdown
+  // cleanly in a prior session, i.e. because the app crashed, on startup you
+  // scan all the individual files in directories and look for "orphans",
+  // i.e. cache files which don't have corresponding entries in the db.  That's
+  // also when storage-in-use and number of entries would be recomputed.
+  //
+  // We don't necessarily need all this functionality immediately, though.
+
+
+  if(m_DBCorrupted) {
+    
+    nsFileSpec cacheFolder ;
+    m_pDiskCacheFolder->GetFileSpec(&cacheFolder) ;
+    
+    char nameInt[6] ;
+
+    for(nsDirectoryIterator di(cacheFolder, PR_FALSE); di.Exists(); di++) {
+      char* filename = di.Spec().GetLeafName() ;
+      char* pname = nameInt ;
+      pname = PL_strncpyz(pname, filename, 6) ;
+
+      if(PL_strcmp(pname, "trash") == 0)
+        RemoveFolder(di.Spec()) ;
+      
+      nsCRT::free(filename) ;  
+    }
+  }
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::Init(void) 
+{
+  nsresult rv ;
+  
+  // don't initialize if no cache folder is set. 
+  if(!m_pDiskCacheFolder) return NS_OK ;
+
+  if(!m_DB) {
+    m_DB = new nsDBAccessor() ;
+    if(!m_DB)
+      return NS_ERROR_OUT_OF_MEMORY ;
+    else
+      NS_ADDREF(m_DB) ;
+  }
+
+  // create cache sub directories
+  nsCOMPtr<nsIFileSpec> cacheSubDir;
+  rv = NS_NewFileSpec(getter_AddRefs(cacheSubDir));
+
+  for (int i=0; i < 32; i++) {
+    rv = cacheSubDir->FromFileSpec(m_pDiskCacheFolder) ;
+    if(NS_FAILED(rv))
+      return rv ;
+
+    char dirName[3];
+    PR_snprintf (dirName, 3, "%0.2x", i);
+    cacheSubDir->AppendRelativeUnixPath (dirName) ;
+    CreateDir(cacheSubDir);
+  }
+
+  return InitDB() ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::InitDB(void)
+{
+  nsresult rv ; 
+
+  if(!m_DBFile) {
+    NS_NewFileSpec(getter_AddRefs(m_DBFile)) ;
+    if(!m_DBFile)
+      return NS_ERROR_OUT_OF_MEMORY ;
+  }
+
+  rv = m_DBFile->FromFileSpec(m_pDiskCacheFolder) ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  m_DBFile->AppendRelativeUnixPath("cache.db") ;
+
+  rv = m_DB->Init(m_DBFile) ;
+
+  if(rv == NS_ERROR_FAILURE) {
+    // try recovery if error 
+    DBRecovery() ;
+  }
+
+  rv = GetSpecialEntry() ;
+  if(rv == NS_ERROR_FAILURE) {
+    // try recovery if error 
+    DBRecovery() ;
+  }
+
+  return rv ;
+}
+
+//////////////////////////////////////////////////////////////////////////
+// nsISupports methods
+
+NS_IMPL_ISUPPORTS3(nsNetDiskCache,
+                   nsINetDataDiskCache,
+                   nsINetDataCache,
+                   nsISupports) 
+
+///////////////////////////////////////////////////////////////////////////
+// nsINetDataCache Method 
+
+NS_IMETHODIMP
+nsNetDiskCache::GetDescription(PRUnichar* *aDescription) 
+{
+  nsAutoString description("Disk Cache") ;
+  *aDescription = description.ToNewUnicode() ;
+  if(!*aDescription)
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  return NS_OK ;
+}
+
+/* don't alloc mem for nsICachedNetData. 
+ * RecordID is generated using the same scheme in nsCacheDiskData,
+ * see GetCachedNetData() for detail.
+ */
+NS_IMETHODIMP
+nsNetDiskCache::Contains(const char* key, PRUint32 length, PRBool *_retval) 
+{
+  *_retval = PR_FALSE ;
+
+  NS_ASSERTION(m_DB, "no db.") ;
+
+  PRInt32 id = 0 ;
+  nsresult rv = m_DB->GetID(key, length, &id) ;
+
+  if(NS_FAILED(rv)) {
+    // try recovery if error 
+    DBRecovery() ;
+    return rv ;
+  }
+
+  void* info = 0 ;
+  PRUint32 info_size = 0 ;
+
+  rv = m_DB->Get(id, &info, &info_size) ;
+  if(NS_SUCCEEDED(rv) && info) 
+    *_retval = PR_TRUE ;
+        
+  if(NS_FAILED(rv)) {
+    // try recovery if error 
+    DBRecovery() ;
+  }
+
+  return rv ;
+}
+
+/* regardless if it's cached or not, a copy of nsNetDiskCache would 
+ * always be returned. so release it appropriately. 
+ * if mem alloced, updata m_NumEntries also.
+ * for now, the new nsCachedNetData is not written into db yet since
+ * we have nothing to write.
+ */
+NS_IMETHODIMP
+nsNetDiskCache::GetCachedNetData(const char* key, PRUint32 length, nsINetDataCacheRecord **_retval) 
+{
+  NS_ASSERTION(m_DB, "no db.") ;
+
+  nsresult rv = 0 ;
+  if (!_retval)
+    return NS_ERROR_NULL_POINTER ;
+
+  *_retval = nsnull ;
+
+  PRInt32 id = 0 ;
+  rv = m_DB->GetID(key, length, &id) ;
+  if(NS_FAILED(rv)) {
+    // try recovery if error 
+    DBRecovery() ;
+    return rv ;
+  }
+
+  // construct an empty record
+  nsDiskCacheRecord* newRecord = new nsDiskCacheRecord(m_DB, this) ;
+  if(!newRecord) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+
+  rv = newRecord->Init(key, length, id) ;
+  if(NS_FAILED(rv)) {
+    delete newRecord ;
+    return rv ;
+  }
+
+  NS_ADDREF(newRecord) ; // addref for _retval 
+  *_retval = (nsINetDataCacheRecord*) newRecord ;
+  
+  void* info = 0 ;
+  PRUint32 info_size = 0 ;
+
+  rv = m_DB->Get(id, &info, &info_size) ;
+  if(NS_SUCCEEDED(rv) && info) {
+
+    // this is a previously cached record 
+    nsresult r1 ;
+    r1 = newRecord->RetrieveInfo(info, info_size) ;
+
+    if(NS_SUCCEEDED(rv)) 
+      return NS_OK ;
+    else { 
+      // probably a bad one
+      NS_RELEASE(newRecord) ;
+      *_retval = nsnull ;
+      return r1;
+    }
+    
+  } else if (NS_SUCCEEDED(rv) && !info) {
+    // this is a new record. 
+    m_NumEntries ++ ;
+    return NS_OK ;
+  } else {
+    // database error.
+    DBRecovery() ;
+    return rv ;
+  }
+}
+
+/* get an nsICachedNetData, mem needs to be de-alloced if not found. */
+NS_IMETHODIMP
+nsNetDiskCache::GetCachedNetDataByID(PRInt32 RecordID, nsINetDataCacheRecord **_retval) 
+{
+  NS_ASSERTION(m_DB, "no db.") ;
+
+  if (!_retval)
+    return NS_ERROR_NULL_POINTER ;
+
+  *_retval = nsnull ;
+  
+  nsresult rv ;
+
+  void* info = 0 ;
+  PRUint32 info_size = 0 ;
+
+  rv = m_DB->Get(RecordID, &info, &info_size) ;
+  if(NS_SUCCEEDED(rv) && info) {
+
+    // construct an empty record if only found in db
+    nsDiskCacheRecord* newRecord = new nsDiskCacheRecord(m_DB, this) ;
+    if(!newRecord) 
+      return NS_ERROR_OUT_OF_MEMORY ;
+
+    NS_ADDREF(newRecord) ; // addref for _retval
+    rv = newRecord->RetrieveInfo(info, info_size) ;
+
+    if(NS_SUCCEEDED(rv)) {
+      *_retval = (nsINetDataCacheRecord*) newRecord ;
+      return NS_OK ;
+    } 
+    else {
+      // bad record, I guess
+      NS_RELEASE(newRecord) ; // release if bad things happen
+      return rv ;
+    }
+  } else {
+    NS_ERROR("Error: RecordID not in DB\n") ;
+    DBRecovery() ;
+    return rv ;
+  }
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::GetEnabled(PRBool *aEnabled) 
+{
+  *aEnabled = m_Enabled ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::SetEnabled(PRBool aEnabled) 
+{
+  m_Enabled = aEnabled ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::GetFlags(PRUint32 *aFlags) 
+{
+  *aFlags = FILE_PER_URL_CACHE;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::GetNumEntries(PRUint32 *aNumEntries) 
+{
+  *aNumEntries = m_NumEntries ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::GetMaxEntries(PRUint32 *aMaxEntries)
+{
+  *aMaxEntries = m_MaxEntries ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::NewCacheEntryIterator(nsISimpleEnumerator **_retval) 
+{
+  NS_ASSERTION(m_DB, "no db.") ;
+
+  if(!_retval)
+    return NS_ERROR_NULL_POINTER ;
+
+  *_retval = nsnull ;
+
+  nsISimpleEnumerator* enumerator = new nsDBEnumerator(m_DB, this) ;
+  if(enumerator) {
+    NS_ADDREF(enumerator) ;
+    *_retval = enumerator ;
+    return NS_OK ;
+  }
+  else 
+    return NS_ERROR_OUT_OF_MEMORY ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::GetNextCache(nsINetDataCache * *aNextCache)
+{
+  if(!aNextCache)
+    return NS_ERROR_NULL_POINTER ;
+
+  *aNextCache = m_pNextCache ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::SetNextCache(nsINetDataCache *aNextCache)
+{
+  m_pNextCache = aNextCache ;
+  return NS_OK ;
+}
+
+// db size can always be measured at the last minute. Since it's hard
+// to know before hand. 
+NS_IMETHODIMP
+nsNetDiskCache::GetStorageInUse(PRUint32 *aStorageInUse)
+{
+  NS_ASSERTION(m_DB, "no db.") ;
+
+  PRUint32 total_size = m_StorageInUse ;
+
+  /*
+  PRUint32 len = 0 ;
+  // add the size of the db.
+  m_DB->GetDBFilesize(&len) ;
+  total_size += len ;
+  */
+
+  // we need size in kB
+  total_size = total_size >> 10 ;
+
+  *aStorageInUse = total_size ;
+  return NS_OK ;
+}
+
+/*
+ * The whole cache dirs can be whiped clean since all the cache 
+ * files are resides in seperate hashed dirs. It's safe to do so.
+ */
+ 
+NS_IMETHODIMP
+nsNetDiskCache::RemoveAll(void)
+{
+  NS_ASSERTION(m_DB, "no db.") ;
+  NS_ASSERTION(m_pDiskCacheFolder, "no cache folder.") ;
+
+  // remove all the sub folders
+  nsFileSpec cacheSubDir;
+
+  for (int i=0; i < 32; i++) {
+    m_pDiskCacheFolder->GetFileSpec(&cacheSubDir) ;
+
+    char dirName[3];
+    PR_snprintf (dirName, 3, "%0.2x", i);
+    cacheSubDir += dirName ;
+    RemoveFolder(cacheSubDir) ;
+  }
+
+  // don't forget the db file itself
+  m_DB->Shutdown() ;
+  nsFileSpec dbfile ;
+  m_DBFile->GetFileSpec(&dbfile) ;
+  dbfile.Delete(PR_TRUE) ;
+
+  // reinitilize
+  return Init() ;
+}
+
+//////////////////////////////////////////////////////////////////
+// nsINetDataDiskCache methods
+
+NS_IMETHODIMP
+nsNetDiskCache::GetDiskCacheFolder(nsIFileSpec * *aDiskCacheFolder)
+{
+  *aDiskCacheFolder = nsnull ;
+  NS_ASSERTION(m_pDiskCacheFolder, "no cache folder.") ;
+
+  *aDiskCacheFolder = m_pDiskCacheFolder ;
+  NS_ADDREF(*aDiskCacheFolder) ;
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::SetDiskCacheFolder(nsIFileSpec * aDiskCacheFolder)
+{
+  if(!m_pDiskCacheFolder) {
+    NS_NewFileSpec(getter_AddRefs(m_pDiskCacheFolder));
+    if(!m_pDiskCacheFolder) 
+      return NS_ERROR_OUT_OF_MEMORY ;
+    
+    m_pDiskCacheFolder = aDiskCacheFolder ;
+    return Init() ;
+  } 
+  else {
+    char *newfolder, *oldfolder ;
+    m_pDiskCacheFolder->GetNativePath(&oldfolder) ;
+    aDiskCacheFolder->GetNativePath(&newfolder) ;
+
+    if(PL_strcmp(newfolder, oldfolder) != 0) {
+      m_pDiskCacheFolder = aDiskCacheFolder ;
+
+      // do we need to blow away old cache before building a new one?
+      // return RemoveAll() ;
+
+      m_DB->Shutdown() ;
+      return Init() ;
+
+    } else 
+      return NS_OK ;
+  }
+}
+
+//////////////////////////////////////////////////////////////////
+// nsNetDiskCache methods
+
+// create a directory (recursively)
+NS_IMETHODIMP
+nsNetDiskCache::CreateDir(nsIFileSpec* dir_spec) 
+{
+  PRBool does_exist ;
+  nsCOMPtr<nsIFileSpec> p_spec ;
+
+  dir_spec->Exists(&does_exist) ;
+  if(does_exist) 
+    return NS_OK ;
+
+  nsresult rv = dir_spec->GetParent(getter_AddRefs(p_spec)) ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  p_spec->Exists(&does_exist) ;
+  if(!does_exist) {
+    CreateDir(p_spec) ;
+    rv = dir_spec->CreateDir() ;
+    if(NS_FAILED(rv))
+      return rv ;
+  }
+  else {
+    rv = dir_spec->CreateDir() ;
+    if(NS_FAILED(rv))
+      return rv ;
+  }
+  
+  return NS_OK ;
+}
+
+// We can't afford to make a *separate* pass over the whole db on every
+// startup, just to figure out m_NumEntries and m_StorageInUse.  (This is a
+// several second operation on a large db).  We'll likely need to store
+// distinguished keys in the db that contain these values and update them
+// incrementally, except when failure to shut down the db cleanly is detected.
+
+NS_IMETHODIMP
+nsNetDiskCache::GetSpecialEntry(void)
+{
+  void* pInfo ;
+  PRUint32 InfoSize ;
+
+  nsresult rv = m_DB->GetSpecialEntry(&pInfo, &InfoSize) ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  if(!pInfo && InfoSize == 0) {
+    // must be a new DB
+    m_NumEntries = 0 ;
+    m_StorageInUse = 0 ;
+  } 
+  else {
+    char * cur_ptr = NS_STATIC_CAST(char*, pInfo) ;
+    
+    // get m_NumEntries
+    COPY_INT32(&m_NumEntries, cur_ptr) ;
+    cur_ptr += sizeof(PRUint32) ;
+    
+    // get m_StorageInUse
+    COPY_INT32(&m_StorageInUse, cur_ptr) ;
+    cur_ptr += sizeof(PRUint32) ;
+    
+    PR_ASSERT(cur_ptr == NS_STATIC_CAST(char*, pInfo) + InfoSize);
+  }
+
+  return NS_OK ;
+}
+
+NS_IMETHODIMP
+nsNetDiskCache::SetSpecialEntry(void)
+{
+  PRUint32 InfoSize ;
+  
+  InfoSize = sizeof m_NumEntries ;
+  InfoSize += sizeof m_StorageInUse ;
+  
+  void* pInfo = nsAllocator::Alloc(InfoSize*sizeof(char)) ;
+  if(!pInfo) 
+    return NS_ERROR_OUT_OF_MEMORY ;
+  
+  char* cur_ptr = NS_STATIC_CAST(char*, pInfo) ;
+
+  COPY_INT32(cur_ptr, &m_NumEntries) ;
+  cur_ptr += sizeof(PRUint32) ;
+
+  COPY_INT32(cur_ptr, &m_StorageInUse) ;
+  cur_ptr += sizeof(PRUint32) ;
+  
+  PR_ASSERT(cur_ptr == NS_STATIC_CAST(char*, pInfo) + InfoSize);
+  
+  return m_DB->SetSpecialEntry(pInfo, InfoSize) ;
+}
+
+// this routine will be called everytime we have a db corruption. 
+// m_DB will be re-initialized, m_StorageInUse and m_NumEntries will
+// be reset.
+NS_IMETHODIMP
+nsNetDiskCache::DBRecovery(void)
+{
+  // rename all the sub cache dirs and remove them later during dtor. 
+  nsresult rv = RenameCacheSubDirs() ;
+  if(NS_FAILED(rv))
+    return rv ;
+
+  // remove corrupted db file, don't care if db->shutdown fails or not.
+  m_DB->Shutdown() ;
+  
+  nsFileSpec dbfile ;
+  m_DBFile->GetFileSpec(&dbfile) ;
+  dbfile.Delete(PR_TRUE) ;
+
+  // make sure it's not there any more
+  PRBool exists = dbfile.Exists() ;
+  if(exists) {
+    NS_ERROR("can't remove old db.") ;
+    return NS_ERROR_FAILURE ;
+  }
+
+  // reinitilize DB 
+  return InitDB() ;
+}
+
+// this routine will add string "trash" to current CacheSubDir names. 
+// e.g. 00->trash00, 1f->trash1f. and update the m_DBCorrupted. 
+
+NS_IMETHODIMP
+nsNetDiskCache::RenameCacheSubDirs(void) 
+{
+  nsCOMPtr<nsIFileSpec> cacheSubDir;
+  nsresult rv = NS_NewFileSpec(getter_AddRefs(cacheSubDir)) ;
+
+  for (int i=0; i < 32; i++) {
+    rv = cacheSubDir->FromFileSpec(m_pDiskCacheFolder) ;
+    if(NS_FAILED(rv))
+      return rv ;
+
+    char oldName[3], newName[8];
+    PR_snprintf(oldName, 3, "%0.2x", i) ;
+    cacheSubDir->AppendRelativeUnixPath(oldName) ;
+
+    // re-name the directory
+    PR_snprintf(newName, 8, "trash%0.2x", i) ;
+    rv = cacheSubDir->Rename(newName) ;
+    if(NS_FAILED(rv))
+      // TODO, error checking
+      return NS_ERROR_FAILURE ;
+  }
+
+  // update m_DBCorrupted 
+  m_DBCorrupted = PR_TRUE ;
+
+  return NS_OK ;
+}
+
+// this routine is used by dtor and RemoveAll() to clean up dirs.
+NS_IMETHODIMP
+nsNetDiskCache::RemoveFolder(nsFileSpec aFolder)
+{
+  for(nsDirectoryIterator di(aFolder, PR_FALSE); di.Exists(); di++) {
+    di.Spec().Delete(PR_TRUE) ;
+  }
+  
+  aFolder.Delete(PR_FALSE) ; // recursive delete
+  
+  return NS_OK ;
+}

mozilla/netwerk/cache/filecache/nsNetDiskCache.h

@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+/*
+ * This file is part of filecache implementation.
+ *
+ * nsNetDiskCache is the main disk cache module that will create 
+ * the cache database, and then store and retrieve nsDiskCacheRecord 
+ * objects from it. It also contains some basic error recovery procedure.
+ */
+
+#ifndef __gen_nsNetDiskCache_h__
+#define __gen_nsNetDiskCache_h__
+
+#include "nsINetDataDiskCache.h"
+#include "nsNetDiskCacheCID.h"
+#include "nsCOMPtr.h"
+#include "nsIPref.h"
+#include "nsDBAccessor.h"
+
+class nsIURI; /* forward decl */
+class nsICachedNetData; /* forward decl */
+class nsISimpleEnumerator; /* forward decl */
+class nsIFileSpec; /* forward decl */
+
+/* starting interface:    nsNetDiskCache */
+
+class nsNetDiskCache : public nsINetDataDiskCache {
+  public: 
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSINETDATACACHE
+  NS_DECL_NSINETDATADISKCACHE
+
+  NS_IMETHOD Init(void) ;
+
+  nsNetDiskCache() ;
+  virtual ~nsNetDiskCache() ;
+
+  protected:
+
+  NS_IMETHOD InitDB(void) ;
+  NS_IMETHOD CreateDir(nsIFileSpec* dir_spec) ;
+  NS_IMETHOD GetSpecialEntry(void) ;
+  NS_IMETHOD SetSpecialEntry(void) ;
+
+  NS_IMETHOD RenameCacheSubDirs(void) ;
+  NS_IMETHOD DBRecovery(void) ;
+  NS_IMETHOD RemoveFolder(nsFileSpec aFolder) ;
+
+  private:
+
+  PRBool 			                m_Enabled ;
+  PRUint32 			                m_NumEntries ;
+  nsCOMPtr<nsINetDataCache> 	    m_pNextCache ;
+  nsCOMPtr<nsIFileSpec>   	        m_pDiskCacheFolder ;
+  nsCOMPtr<nsIFileSpec>             m_DBFile ;
+
+  PRUint32                          m_MaxEntries ;
+  PRUint32                          m_StorageInUse ;
+  nsIDBAccessor*                    m_DB ;
+
+  // this is used to indicate a db corruption 
+  PRBool                            m_DBCorrupted ;
+
+  friend class nsDiskCacheRecord ;
+  friend class nsDiskCacheRecordChannel ;
+  friend class nsDBEnumerator ;
+} ;
+
+#endif /* __gen_nsNetDiskCache_h__ */

mozilla/netwerk/cache/filecache/nsNetDiskCacheCID.h

@@ -0,0 +1,32 @@
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Intel Corp.
+ * Portions created by Intel Corp. are
+ * Copyright (C) 1999, 1999 Intel Corp.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): Yixiong Zou <yixiong.zou@intel.com>
+ *                 Carl Wong <carl.wong@intel.com>
+ */
+
+#ifndef _nsNetDiskCacheCID_h_
+#define _nsNetDiskCacheCID_h_
+
+#define NS_NETDISKCACHE_CID_STR "ECFEEA00-7201-11d3-87FE-000629D01344"
+
+#define NS_NETDISKCACHE_CID \
+{ 0xecfeea00, 0x7201, 0x11d3, \
+ { 0x87, 0xfe, 0x0, 0x6, 0x29, 0xd0, 0x13, 0x44 }}
+
+#endif /* _nsNetDiskCacheCID_h_ */

mozilla/netwerk/cache/filecache/test/Makefile.in

@@ -0,0 +1,50 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+REQUIRES	= libreg xpcom
+
+CPPSRCS		= \
+         diskcache.cpp \
+		$(NULL)
+
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
+
+ifdef NO_LD_ARCHIVE_FLAGS
+LOST_SYM_LIBS	= -lxpcomds_s -lxptinfo -lmozreg_s
+endif
+
+LIBS		= \
+		-lmozjs \
+		-lxpcom \
+        -lmozdbm_s \
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(LOST_SYM_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+LOCAL_INCLUDES = -I$(srcdir)/..
+
+DEFINES		+= -DUSE_NSREG -DCACHE

mozilla/netwerk/cache/filecache/test/diskcache.cpp

@@ -0,0 +1,836 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsIStreamListener.h"
+#include "nsIStreamObserver.h"
+#include "nsIServiceManager.h"
+#include "nsIInputStream.h"
+#include "nsIOutputStream.h"
+#include "nsIEventQueue.h"
+#include "nsIEventQueueService.h"
+#include "nsIChannel.h"
+#include "nsCOMPtr.h"
+#include "nsString.h"
+#include <stdio.h>
+#include <unistd.h>
+
+#include "nsINetDataCache.h"
+#include "nsINetDataCacheRecord.h"
+//#include "nsMemCacheCID.h"
+#include "nsNetDiskCache.h"
+#include "nsIPref.h"
+#include "prenv.h"
+#include "nsIFileStream.h"
+
+// Number of test entries to be placed in the cache
+#define NUM_CACHE_ENTRIES  250
+
+// Cache content stream length will have random length between zero and
+// MAX_CONTENT_LENGTH bytes
+#define MAX_CONTENT_LENGTH 20000
+
+// Length of random-data cache entry key
+#define CACHE_KEY_LENGTH 15
+
+// Length of random-data cache entry meta-data
+#define CACHE_METADATA_LENGTH 100
+
+//static NS_DEFINE_CID(kMemCacheCID, NS_MEM_CACHE_FACTORY_CID);
+static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+static NS_DEFINE_CID(kDiskCacheCID, NS_NETDISKCACHE_CID) ;
+static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
+static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID);
+
+// Mapping from test case number to RecordID
+static PRInt32 recordID[NUM_CACHE_ENTRIES];
+
+static PRInt32
+mapRecordIdToTestNum(PRInt32 aRecordID)
+{
+    int i;
+    for (i = 0; i < NUM_CACHE_ENTRIES; i++) {
+        if (recordID[i] == aRecordID)
+            return i;
+    }
+    return -1;
+}
+
+// A supply of stream data to either store or compare with
+class nsITestDataStream {
+public:
+    virtual ~nsITestDataStream() {};
+    virtual PRUint32 Next() = 0;
+    virtual void Read(char* aBuf, PRUint32 aCount) = 0;
+
+    virtual PRBool Match(char* aBuf, PRUint32 aCount) = 0;
+    virtual void Skip(PRUint32 aCount) = 0;
+};
+
+// A reproducible stream of random data.
+class RandomStream : public nsITestDataStream {
+public:
+    RandomStream(PRUint32 aSeed) {
+        mStartSeed = mState = aSeed;
+    }
+    
+    PRUint32 GetStartSeed() {
+        return mStartSeed;
+    }
+    
+    PRUint32 Next() {
+        mState = 1103515245 * mState + 12345;
+        return mState;
+    }
+
+    void Read(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            *aBuf++ = Next();
+        }
+    }
+
+    PRBool
+    Match(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            if (*aBuf++ != (char)(Next() & 0xff))
+                return PR_FALSE;
+        }
+        return PR_TRUE;
+    }
+
+    void
+    Skip(PRUint32 aCount) {
+        while (aCount--)
+            Next();
+    }
+
+protected:
+    
+    PRUint32 mState;
+    PRUint32 mStartSeed;
+};
+
+// A stream of data that increments on each byte that is read, modulo 256
+class CounterStream : public nsITestDataStream {
+public:
+    CounterStream(PRUint32 aSeed) {
+        mStartSeed = mState = aSeed;
+    }
+    
+    PRUint32 GetStartSeed() {
+        return mStartSeed;
+    }
+    
+    PRUint32 Next() {
+        mState += 1;
+        mState &= 0xff;
+        return mState;
+    }
+
+    void Read(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            *aBuf++ = Next();
+        }
+    }
+
+    PRBool
+    Match(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            if (*aBuf++ != (char)Next())
+                return PR_FALSE;
+        }
+        return PR_TRUE;
+    }
+
+    void
+    Skip(PRUint32 aCount) {
+        mState += aCount;
+        mState &= 0xff;
+    }
+
+protected:
+    
+    PRUint32 mState;
+    PRUint32 mStartSeed;
+};
+
+static int gNumReaders = 0;
+static PRUint32 gTotalBytesRead = 0;
+static PRUint32 gTotalDuration = 0;
+
+class nsReader : public nsIStreamListener {
+public:
+    NS_DECL_ISUPPORTS
+
+    nsReader()
+        : mStartTime(0), mBytesRead(0)
+    {
+        NS_INIT_REFCNT();
+        gNumReaders++;
+    }
+
+    virtual ~nsReader() {
+        delete mTestDataStream;
+        gNumReaders--;
+    }
+
+    nsresult 
+    Init(nsIChannel *aChannel, nsITestDataStream* aRandomStream, PRUint32 aExpectedStreamLength) {
+        mChannel = aChannel;
+        mTestDataStream = aRandomStream;
+        mExpectedStreamLength = aExpectedStreamLength;
+        mRefCnt = 1;
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnStartRequest(nsIChannel* channel,
+                              nsISupports* context) {
+        mStartTime = PR_IntervalNow();
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnDataAvailable(nsIChannel* channel, 
+                               nsISupports* context,
+                               nsIInputStream *aIStream, 
+                               PRUint32 aSourceOffset,
+                               PRUint32 aLength) {
+        char buf[1025];
+        while (aLength > 0) {
+            PRUint32 amt;
+            PRBool match;
+            aIStream->Read(buf, sizeof buf, &amt);
+            if (amt == 0) break;
+            aLength -= amt;
+            mBytesRead += amt;
+            match = mTestDataStream->Match(buf, amt);
+            NS_ASSERTION(match, "Stored data was corrupted on read");
+        }
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnStopRequest(nsIChannel* channel, 
+                             nsISupports* context,
+                             nsresult aStatus,
+                             const PRUnichar* aMsg) {
+        PRIntervalTime endTime;
+        PRIntervalTime duration;
+        
+        endTime = PR_IntervalNow();
+        duration = (endTime - mStartTime);
+
+        if (NS_FAILED(aStatus)) printf("channel failed.\n");
+        //        printf("read %d bytes\n", mBytesRead);
+
+        NS_ASSERTION(mBytesRead == mExpectedStreamLength,
+                     "Stream in cache is wrong length");
+
+        gTotalBytesRead += mBytesRead;
+        gTotalDuration += duration;
+
+        // Release channel
+        mChannel = 0;
+        return NS_OK;
+    }
+
+protected:
+    PRIntervalTime       mStartTime;
+    PRUint32             mBytesRead;
+    nsITestDataStream*   mTestDataStream;
+    PRUint32             mExpectedStreamLength;
+    nsCOMPtr<nsIChannel> mChannel;
+};
+
+NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIStreamObserver)
+
+static nsIEventQueue* eventQueue;
+
+nsresult
+InitQueue() {
+    nsresult rv;
+
+    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service");
+
+    rv = eventQService->CreateThreadEventQueue();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create event queue");
+  
+    rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQueue);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread");
+
+    return NS_OK;
+}
+
+// Process events until all streams are OnStopRequest'ed
+nsresult
+WaitForEvents() {
+    while (gNumReaders) {
+        eventQueue->ProcessPendingEvents();
+    }
+    return NS_OK;
+}
+
+// Read data for a single cache record and compare against testDataStream
+nsresult
+TestReadStream(nsINetDataCacheRecord *record, nsITestDataStream *testDataStream,
+               PRUint32 expectedStreamLength)
+{
+    nsCOMPtr<nsIChannel> channel;
+    nsresult rv;
+    PRUint32 actualContentLength;
+
+    rv = record->NewChannel(0, getter_AddRefs(channel));
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+    rv = record->GetStoredContentLength(&actualContentLength);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    NS_ASSERTION(actualContentLength == expectedStreamLength,
+                 "nsINetDataCacheRecord::GetContentLength() busted ?");
+    
+    nsReader *reader = new nsReader;
+    reader->AddRef();
+    rv = reader->Init(channel, testDataStream, expectedStreamLength);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    
+    rv = channel->AsyncRead(0, -1, 0, reader);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    reader->Release();
+
+    return NS_OK;
+}
+
+// Check that records can be retrieved using their record-ID, in addition
+// to using the opaque key.
+nsresult
+TestRecordID(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    RandomStream *randomStream;
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char *metaData;
+    PRUint32 testNum;
+    PRBool match;
+
+    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        rv = cache->GetCachedNetDataByID(recordID[testNum], getter_AddRefs(record));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't obtain record using record ID");
+
+        // Match against previously stored meta-data
+        rv = record->GetMetaData(&metaDataLength, &metaData);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get record meta-data");
+        match = randomStream->Match(metaData, metaDataLength);
+        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
+
+        nsAllocator::Free(metaData);
+        delete randomStream;
+    }
+    return NS_OK;
+}
+
+// Check that all cache entries in the database are enumerated and that
+// no duplicates appear.
+nsresult
+TestEnumeration(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsCOMPtr<nsISupports> tempISupports;
+    nsCOMPtr<nsISimpleEnumerator> iterator;
+    RandomStream *randomStream;
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char *metaData;
+    PRUint32 testNum;
+    PRBool match;
+    PRInt32 recID;
+
+    int numRecords = 0;
+
+    // Iterate over all records in the cache
+    rv = cache->NewCacheEntryIterator(getter_AddRefs(iterator));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create new cache entry iterator");
+
+    PRBool notDone;
+    while (1) {
+
+        // Done iterating ?
+        rv = iterator->HasMoreElements(&notDone);
+        if (NS_FAILED(rv)) return rv;
+        if (!notDone)
+            break;
+
+        // Get next record in iteration
+        rv = iterator->GetNext(getter_AddRefs(tempISupports));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "iterator bustage");
+        record = do_QueryInterface(tempISupports);
+
+        numRecords++;
+
+        // Get record ID
+        rv = record->GetRecordID(&recID);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get Record ID");
+        testNum = mapRecordIdToTestNum(recID);
+        NS_ASSERTION(testNum != -1, "Corrupted Record ID ?");
+
+        // Erase mapping from table, so that duplicate enumerations are detected
+        recordID[testNum] = -1;
+
+        // Make sure stream matches test data
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        // Match against previously stored meta-data
+        rv = record->GetMetaData(&metaDataLength, &metaData);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get record meta-data");
+        match = randomStream->Match(metaData, metaDataLength);
+        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
+        nsAllocator::Free(metaData);
+
+        delete randomStream;
+    }
+
+    NS_ASSERTION(numRecords == NUM_CACHE_ENTRIES, "Iteration bug");
+
+    return NS_OK;
+}
+
+// Read the test data that was written in FillCache(), checking for
+// corruption, truncation.
+nsresult
+TestRead(nsINetDataCache *cache)
+{
+    nsresult rv;
+    PRBool inCache;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    RandomStream *randomStream;
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char *metaData, *storedCacheKey;
+    PRUint32 testNum, storedCacheKeyLength;
+    PRBool match;
+
+    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        // Ensure that entry is in the cache
+        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(inCache, "nsINetDataCache::Contains error");
+        
+        rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        // Match against previously stored meta-data
+        match = record->GetMetaData(&metaDataLength, &metaData);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        match = randomStream->Match(metaData, metaDataLength);
+        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
+        nsAllocator::Free(metaData);
+
+        // Test GetKey() method
+        rv = record->GetKey(&storedCacheKeyLength, &storedCacheKey);
+        NS_ASSERTION(NS_SUCCEEDED(rv) &&
+                     (storedCacheKeyLength == sizeof cacheKey) &&
+                     !memcmp(storedCacheKey, &cacheKey[0], sizeof cacheKey),
+                     "nsINetDataCacheRecord::GetKey failed");
+        nsAllocator::Free(storedCacheKey);
+
+        PRUint32 expectedStreamLength = randomStream->Next() & 0xffff;
+
+        TestReadStream(record, randomStream, expectedStreamLength);
+    }
+
+    WaitForEvents();
+
+    // Compute rate in MB/s
+    double rate = gTotalBytesRead / PR_IntervalToMilliseconds(gTotalDuration);
+    rate *= NUM_CACHE_ENTRIES;
+    rate *= 1000;
+    rate /= (1024 * 1024);
+    printf("Read %d bytes at a rate of %5.1f MB per second \n",
+           gTotalBytesRead, rate);
+
+    return NS_OK;
+}
+
+// Repeatedly call SetStoredContentLength() on a cache entry and make
+// read the stream's data to ensure that it's not corrupted by the effect
+nsresult
+TestTruncation(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    RandomStream *randomStream;
+    char cacheKey[CACHE_KEY_LENGTH];
+
+    randomStream = new RandomStream(0);
+    randomStream->Read(cacheKey, sizeof cacheKey);
+
+    rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+    randomStream->Skip(CACHE_METADATA_LENGTH);
+    PRUint32 initialStreamLength = randomStream->Next() & 0xffff;
+    delete randomStream;
+
+    PRUint32 i;
+    PRUint32 delta = initialStreamLength / 64;
+    for (i = initialStreamLength; i >= delta; i -= delta) {
+        PRUint32 expectedStreamLength = i;
+
+        // Do the truncation
+        record->SetStoredContentLength(expectedStreamLength);
+        randomStream = new RandomStream(0);
+        randomStream->Skip(CACHE_KEY_LENGTH + CACHE_METADATA_LENGTH + 1);
+
+        TestReadStream(record, randomStream, expectedStreamLength);
+        WaitForEvents();
+    }
+
+    return NS_OK;
+}
+
+// Write known data to random offsets in a single cache entry and test
+// resulting stream for correctness.
+nsresult
+TestOffsetWrites(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsCOMPtr<nsIChannel> channel;
+    nsCOMPtr<nsIOutputStream> outStream;
+    char buf[512];
+    char cacheKey[CACHE_KEY_LENGTH];
+    RandomStream *randomStream;
+
+    randomStream = new RandomStream(0);
+    randomStream->Read(cacheKey, sizeof cacheKey);
+
+    rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access record via opaque cache key");
+
+
+    nsCOMPtr<nsIFileSpec> file ;
+    record->GetFilename(getter_AddRefs(file)) ;
+    char* name ;
+    file->GetUnixStyleFilePath(&name) ;
+    printf(" file name is %s \n", name) ;
+
+    // Write buffer-fulls of data at random offsets into the cache entry.
+    // Data written is (offset % 0xff)
+    PRUint32 startingOffset;
+    PRUint32 streamLength = 0;
+    PRUint32 len = 0 ;
+    CounterStream *counterStream;
+
+    int i = 0;
+    for (i = 0; i < 257; i++) {
+        rv = record->NewChannel(0, getter_AddRefs(channel));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        startingOffset = streamLength ? streamLength - (randomStream->Next() % sizeof buf): 0;
+        rv = channel->OpenOutputStream(startingOffset, getter_AddRefs(outStream));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        
+        truncate(name, startingOffset) ;
+
+        counterStream = new CounterStream(startingOffset);
+        counterStream->Read(buf, sizeof buf);
+
+      nsresult status ;
+      nsCOMPtr<nsIRandomAccessStore> ras = do_QueryInterface(outStream, &status);
+      if (NS_FAILED(status)) {
+      //        mState = END_WRITE;
+        return NS_ERROR_FAILURE;
+      }
+      PRIntn offset ;
+      ras->Tell(&offset) ;
+//      printf(" offset is %d \n", offset) ;
+
+        PRUint32 numWritten;
+        rv = outStream->Write(buf, sizeof buf, &numWritten);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(numWritten == sizeof buf, "Write() bug?");
+        streamLength = startingOffset + sizeof buf;
+
+        rv = outStream->Close();
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't close channel");
+        delete counterStream;
+
+        record->GetStoredContentLength(&len) ;
+        if(len != streamLength) 
+          printf(" offset = %d is wrong, filesize = %d\n", startingOffset, len) ;
+
+    }
+
+        /*
+        rv = record->NewChannel(0, getter_AddRefs(channel));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        startingOffset = 208;
+        rv = channel->OpenOutputStream(startingOffset, getter_AddRefs(outStream));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        
+        counterStream = new CounterStream(startingOffset);
+        counterStream->Read(buf, sizeof buf);
+
+      nsresult status ;
+      nsCOMPtr<nsIRandomAccessStore> ras = do_QueryInterface(outStream, &status);
+      if (NS_FAILED(status)) {
+      //        mState = END_WRITE;
+        return NS_ERROR_FAILURE;
+      }
+      PRIntn offset = 0 ;
+      ras->Tell(&offset) ;
+      printf(" offset is %d \n", offset) ;
+
+        PRUint32 numWritten;
+        rv = outStream->Write(buf, sizeof buf, &numWritten);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(numWritten == sizeof buf, "Write() bug?");
+        streamLength = startingOffset + sizeof buf;
+
+        rv = outStream->Close();
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't close channel");
+        delete counterStream;
+
+        record->GetStoredContentLength(&len) ;
+        if(len != streamLength) 
+          printf(" offset = %d is wrong, filesize = %d\n", startingOffset, len) ;
+          */
+    
+    delete randomStream;
+
+    counterStream = new CounterStream(0);
+    TestReadStream(record, counterStream, streamLength);
+    WaitForEvents();
+
+    return NS_OK;
+}
+
+// Create entries in the network data cache, using random data for the
+// key, the meta-data and the stored content data.
+nsresult
+FillCache(nsINetDataCache *cache)
+{
+    nsresult rv;
+    PRBool inCache;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsCOMPtr<nsIChannel> channel;
+    nsCOMPtr<nsIOutputStream> outStream;
+    char buf[1000];
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char metaData[CACHE_METADATA_LENGTH];
+    PRUint32 testNum;
+    char *data;
+    RandomStream *randomStream;
+
+    PRIntervalTime startTime = PR_IntervalNow();
+    
+    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        // No entry should be in cache until we add it
+        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(!inCache, "nsINetDataCache::Contains error");
+        
+        rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access record via opaque cache key");
+
+        // Test nsINetDataCacheRecord::GetRecordID()
+        rv = record->GetRecordID(&recordID[testNum]);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get Record ID");
+
+        // Test nsINetDataCache::GetNumEntries()
+        PRUint32 numEntries = (PRUint32)-1;
+        rv = cache->GetNumEntries(&numEntries);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+        NS_ASSERTION(numEntries == testNum + 1, "GetNumEntries failure");
+
+        // Record meta-data should be initially empty
+        rv = record->GetMetaData(&metaDataLength, &data);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        if ((metaDataLength != 0) || (data != 0))
+            return NS_ERROR_FAILURE;
+
+        // Store random data as meta-data
+        randomStream->Read(metaData, sizeof metaData);
+        record->SetMetaData(sizeof metaData, metaData);
+
+        rv = record->NewChannel(0, getter_AddRefs(channel));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        rv = channel->OpenOutputStream(0, getter_AddRefs(outStream));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        
+        PRUint32 beforeOccupancy;
+        rv = cache->GetStorageInUse(&beforeOccupancy);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+
+        int streamLength = randomStream->Next() & 0xffff;
+        int remaining = streamLength;
+        while (remaining) {
+            PRUint32 numWritten;
+            int amount = PR_MIN(sizeof buf, remaining);
+            randomStream->Read(buf, amount);
+
+            rv = outStream->Write(buf, amount, &numWritten);
+            NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+            NS_ASSERTION(numWritten == (PRUint32)amount, "Write() bug?");
+            
+            remaining -= amount;
+        }
+        outStream->Close();
+
+        PRUint32 afterOccupancy;
+        rv = cache->GetStorageInUse(&afterOccupancy);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+        PRUint32 streamLengthInKB = streamLength >> 10;
+        NS_ASSERTION((afterOccupancy - beforeOccupancy) >= streamLengthInKB,
+                     "nsINetDataCache::GetStorageInUse() is busted");
+        
+
+        // *Now* there should be an entry in the cache
+        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(inCache, "nsINetDataCache::Contains error");
+
+        delete randomStream;
+    }
+
+    PRIntervalTime endTime = PR_IntervalNow();
+
+    return NS_OK;
+}
+
+nsresult NS_AutoregisterComponents()
+{
+  nsresult rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,
+                                                 NULL /* default */);
+  return rv;
+}
+
+PRBool initPref ()
+{
+  nsresult rv;
+  NS_WITH_SERVICE(nsIPref, prefPtr, kPrefCID, &rv);
+  if (NS_FAILED(rv))
+    return false;
+
+  nsCOMPtr<nsIFileSpec> fileSpec;
+  rv = NS_NewFileSpec (getter_AddRefs(fileSpec));
+  if (NS_FAILED(rv))
+    return false;
+
+  nsCString defaultPrefFile = PR_GetEnv ("MOZILLA_FIVE_HOME");
+  if (defaultPrefFile.Length())
+    defaultPrefFile += "/";
+  else
+    defaultPrefFile = "./";
+  defaultPrefFile += "default_prefs.js";
+
+  fileSpec->SetUnixStyleFilePath (defaultPrefFile.GetBuffer());
+
+  PRBool exists = false;
+  fileSpec->Exists(&exists);
+  if (exists)
+    prefPtr->ReadUserPrefsFrom(fileSpec);
+  else
+    return false;
+  return true;
+}
+
+int
+main(int argc, char* argv[])
+{
+    initPref() ;
+    nsresult rv;
+    nsCOMPtr<nsINetDataCache> cache;
+
+    rv = NS_AutoregisterComponents();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't register XPCOM components");
+
+    rv = nsComponentManager::CreateInstance(kDiskCacheCID, nsnull,
+                                            NS_GET_IID(nsINetDataCache),
+                                            getter_AddRefs(cache));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create memory cache factory");
+
+    InitQueue();
+
+    PRUnichar* description;
+    rv = cache->GetDescription(&description);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache description");
+    nsCAutoString descStr(description);
+    printf("Testing: %s\n", descStr.GetBuffer());
+
+    rv = cache->RemoveAll();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
+
+    PRUint32 startOccupancy;
+    rv = cache->GetStorageInUse(&startOccupancy);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+
+    PRUint32 numEntries = (PRUint32)-1;
+    rv = cache->GetNumEntries(&numEntries);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
+
+    rv = FillCache(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't fill cache with random test data");
+
+    rv = TestRead(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't read random test data from cache");
+
+    rv = TestRecordID(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't index records using record ID");
+
+    rv = TestEnumeration(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully enumerate records");
+
+    rv = TestTruncation(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully truncate records");
+
+    rv = TestOffsetWrites(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully write to records using non-zero offsets");
+
+    rv = cache->RemoveAll();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
+    rv = cache->GetNumEntries(&numEntries);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
+
+    PRUint32 endOccupancy;
+    rv = cache->GetStorageInUse(&endOccupancy);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+
+    NS_ASSERTION(startOccupancy == endOccupancy, "Cache occupancy not correctly computed ?");
+
+    return 0;
+}
+

mozilla/netwerk/cache/memcache/Makefile.in

@@ -0,0 +1,48 @@
+# Generated automatically from Makefile.in by configure.
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+VPATH       = @srcdir@
+srcdir		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = nkcache
+
+LIBRARY_NAME = nkmemcache_s
+
+REQUIRES	= nspr dbm 
+
+EXPORTS=nsMemCacheCID.h \
+	nsMemCache.h \
+	$(NULL)
+
+CPPSRCS		= \
+        nsMemCache.cpp \
+        nsMemCacheRecord.cpp \
+        nsMemCacheChannel.cpp \
+		$(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/netwerk/cache/memcache/makefile.win

@@ -0,0 +1,42 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..
+
+include <$(DEPTH)/config/config.mak>
+
+MODULE = nkcache
+
+LIBRARY_NAME = nkmemcache_s
+
+CPP_OBJS =                                \
+ 	.\$(OBJDIR)\nsMemCache.obj        \
+	.\$(OBJDIR)\nsMemCacheRecord.obj  \
+	.\$(OBJDIR)\nsMemCacheChannel.obj \
+	$(NULL)
+
+EXPORTS=nsMemCacheCID.h
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -rf $(OBJDIR)
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+

mozilla/netwerk/cache/memcache/nsMemCache.cpp

@@ -0,0 +1,334 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+/**
+ * nsMemCache is the implementation of an in-memory network-data
+ * cache, used to cache the responses to network retrieval commands.
+ * Each cache entry may contain both content, e.g. GIF image data, and
+ * associated metadata, e.g. HTTP headers.  Each entry is indexed by
+ * two different keys: a record id number and an opaque key, which is
+ * created by the cache manager by combining the URI with a "secondary
+ * key", e.g. HTTP post data.
+ */
+
+#include "nsMemCache.h"
+#include "nsMemCacheRecord.h"
+#include "nsIGenericFactory.h"
+#include "nsString.h"
+#include "nsHashtable.h"
+#include "nsHashtableEnumerator.h"
+#include "nsEnumeratorUtils.h"
+
+PRInt32 nsMemCache::gRecordSerialNumber = 0;
+
+nsMemCache::nsMemCache()
+    : mNumEntries(0), mOccupancy(0), mEnabled(PR_TRUE),
+      mHashTable(0)
+{
+    NS_INIT_REFCNT();
+}
+
+nsMemCache::~nsMemCache()
+{
+    nsresult rv;
+
+    rv = RemoveAll();
+    NS_ASSERTION(NS_SUCCEEDED(rv) && (mNumEntries == 0),
+                 "Failure to shut down memory cache. "
+                 "Somewhere, someone is holding references to at least one cache record");
+    delete mHashTable;
+}
+
+nsresult
+nsMemCache::Init()
+{
+    mHashTable = new nsHashtable(256);
+    if (!mHashTable)
+        return NS_ERROR_OUT_OF_MEMORY;
+    return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(nsMemCache, NS_GET_IID(nsINetDataCache))
+
+NS_IMETHODIMP
+nsMemCache::GetDescription(PRUnichar * *aDescription)
+{
+    nsAutoString description("Memory Cache");
+    *aDescription = description.ToNewUnicode();
+    if (!*aDescription)
+        return NS_ERROR_OUT_OF_MEMORY;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::Contains(const char *aKey, PRUint32 aKeyLength, PRBool *aFound)
+{
+    nsOpaqueKey *opaqueKey = new nsOpaqueKey(aKey, aKeyLength);
+    if (!opaqueKey)
+        return NS_ERROR_OUT_OF_MEMORY;
+    *aFound = mHashTable->Exists(opaqueKey);
+    delete opaqueKey;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetCachedNetData(const char *aKey, PRUint32 aKeyLength,
+                             nsINetDataCacheRecord* *aRecord)
+{
+    nsresult rv;
+    nsMemCacheRecord* record = 0;
+    nsOpaqueKey *opaqueKey2 = 0;
+    nsOpaqueKey *opaqueKey3 = 0;
+    nsOpaqueKey *opaqueKey;
+
+    opaqueKey = new nsOpaqueKey(aKey, aKeyLength);
+    if (!opaqueKey)
+        goto out_of_memory;
+    record = (nsMemCacheRecord*)mHashTable->Get(opaqueKey);
+    delete opaqueKey;
+
+    // No existing cache database entry was found.  Create a new one.
+    // This requires two mappings in the hash table:
+    //    Record ID  ==> record
+    //    Opaque key ==> record
+    if (!record) {
+        record = new nsMemCacheRecord;
+        if (!record)
+            goto out_of_memory;
+        rv = record->Init(aKey, aKeyLength, ++gRecordSerialNumber, this);
+        if (NS_FAILED(rv)) goto out_of_memory;
+
+        // Index the record by opaque key
+        opaqueKey2 = new nsOpaqueKey(record->mKey, record->mKeyLength);
+        if (!opaqueKey2) goto out_of_memory;
+        mHashTable->Put(opaqueKey2, record);
+        
+        // Index the record by it's record ID
+        char *recordIDbytes = NS_REINTERPRET_CAST(char *, &record->mRecordID);
+        opaqueKey3 = new nsOpaqueKey(recordIDbytes,
+                                     sizeof record->mRecordID);
+        if (!opaqueKey3) {
+            // Clean up the first record from the hash table
+            mHashTable->Remove(opaqueKey);
+            goto out_of_memory;
+        }
+        mHashTable->Put(opaqueKey3, record);
+        
+        // The hash table holds on to the record
+        record->AddRef();
+        
+        delete opaqueKey2;
+        delete opaqueKey3;
+        mNumEntries++;
+    }
+
+    record->AddRef();
+    *aRecord = record;
+    return NS_OK;
+
+ out_of_memory:
+    delete opaqueKey2;
+    delete opaqueKey3;
+    delete record;
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetCachedNetDataByID(PRInt32 RecordID,
+                                 nsINetDataCacheRecord* *aRecord)
+{
+    nsOpaqueKey opaqueKey(NS_REINTERPRET_CAST(const char *, &RecordID),
+                          sizeof RecordID);
+    *aRecord = (nsINetDataCacheRecord*)mHashTable->Get(&opaqueKey);
+    if (*aRecord) {
+        NS_ADDREF(*aRecord);
+        return NS_OK;
+    }
+    return NS_ERROR_FAILURE;
+}
+
+NS_METHOD
+nsMemCache::Delete(nsMemCacheRecord* aRecord)
+{
+    nsMemCacheRecord *removedRecord;
+
+    char *recordIDbytes = NS_REINTERPRET_CAST(char *, &aRecord->mRecordID);
+    nsOpaqueKey opaqueRecordIDKey(recordIDbytes,
+                                  sizeof aRecord->mRecordID);
+    removedRecord = (nsMemCacheRecord*)mHashTable->Remove(&opaqueRecordIDKey);
+    NS_ASSERTION(removedRecord == aRecord, "memory cache database inconsistent");
+
+    nsOpaqueKey opaqueKey(aRecord->mKey, aRecord->mKeyLength);
+    removedRecord = (nsMemCacheRecord*)mHashTable->Remove(&opaqueKey);
+    NS_ASSERTION(removedRecord == aRecord, "memory cache database inconsistent");
+
+    aRecord->Release();
+
+    mNumEntries--;
+    
+    return NS_OK;
+}
+    
+
+NS_IMETHODIMP
+nsMemCache::GetEnabled(PRBool *aEnabled)
+{
+    NS_ENSURE_ARG(aEnabled);
+    *aEnabled = mEnabled;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::SetEnabled(PRBool aEnabled)
+{
+    mEnabled = aEnabled;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetFlags(PRUint32 *aFlags)
+{
+    NS_ENSURE_ARG(aFlags);
+    *aFlags = MEMORY_CACHE;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetNumEntries(PRUint32 *aNumEntries)
+{
+    NS_ENSURE_ARG(aNumEntries);
+    *aNumEntries = mNumEntries;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetMaxEntries(PRUint32 *aMaxEntries)
+{
+    NS_ENSURE_ARG(aMaxEntries);
+    *aMaxEntries = MEM_CACHE_MAX_ENTRIES;
+    return NS_OK;
+}
+
+static NS_METHOD
+HashEntryConverter(nsHashKey *aKey, void *aValue,
+                   void *unused, nsISupports **retval)
+{
+    nsMemCacheRecord *record;
+    nsOpaqueKey *opaqueKey;
+
+    record = (nsMemCacheRecord*)aValue;
+    opaqueKey = (nsOpaqueKey*)aKey;
+
+    // Hash table keys that index cache entries by their record ID
+    // shouldn't be enumerated.
+    if ((opaqueKey->GetKeyLength() == sizeof(PRInt32))) {
+
+#ifdef DEBUG
+        PRInt32 recordID;
+        record->GetRecordID(&recordID);
+        NS_ASSERTION(*((PRInt32*)opaqueKey->GetKey()) == recordID,
+                     "Key has incorrect key length");
+#endif
+        return NS_ERROR_FAILURE;
+    }
+
+    NS_IF_ADDREF(record);
+    *retval = NS_STATIC_CAST(nsISupports*, record);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::NewCacheEntryIterator(nsISimpleEnumerator* *aIterator)
+{
+    nsCOMPtr<nsIEnumerator> iterator;
+
+    NS_ENSURE_ARG(aIterator);
+    NS_NewHashtableEnumerator(mHashTable, HashEntryConverter,
+                              mHashTable, getter_AddRefs(iterator));
+    return NS_NewAdapterEnumerator(aIterator, iterator);
+}
+
+NS_IMETHODIMP
+nsMemCache::GetNextCache(nsINetDataCache* *aNextCache)
+{
+    NS_ENSURE_ARG(aNextCache);
+    *aNextCache = mNextCache;
+    NS_ADDREF(*aNextCache);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::SetNextCache(nsINetDataCache* aNextCache)
+{
+    mNextCache = aNextCache;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::GetStorageInUse(PRUint32 *aStorageInUse)
+{
+    NS_ENSURE_ARG(aStorageInUse);
+
+    // Convert from bytes to KB
+    *aStorageInUse = (mOccupancy >> 10);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCache::RemoveAll(void)
+{
+    PRBool failed;
+
+    nsCOMPtr<nsISimpleEnumerator> iterator;
+    nsCOMPtr<nsISupports> recordSupports;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsresult rv;
+
+    failed = PR_FALSE;
+    rv = NewCacheEntryIterator(getter_AddRefs(iterator));
+    if (NS_FAILED(rv))
+        return rv;
+
+    PRBool notDone;
+    while (1) {
+        rv = iterator->HasMoreElements(&notDone);
+        if (NS_FAILED(rv)) return rv;
+        if (!notDone)
+            break;
+        
+        iterator->GetNext(getter_AddRefs(recordSupports));
+        record = do_QueryInterface(recordSupports);
+        recordSupports = 0;
+
+        PRUint32 bytesUsed;
+        record->GetStoredContentLength(&bytesUsed);
+        rv = record->Delete();
+        if (NS_FAILED(rv)) {
+            failed = PR_TRUE;
+            continue;
+        }
+        mOccupancy -= bytesUsed;
+    }
+
+    if (failed)
+        return NS_ERROR_FAILURE;
+    return NS_OK;
+}

mozilla/netwerk/cache/memcache/nsMemCache.h

@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+/**
+ * nsMemCache is the implementation of an in-memory network-data
+ * cache, used to cache the responses to network retrieval commands.
+ * Each cache entry may contain both content, e.g. GIF image data, and
+ * associated metadata, e.g. HTTP headers.  Each entry is indexed by
+ * two different keys: a record id number and an opaque key, which is
+ * created by the cache manager by combining the URI with a "secondary
+ * key", e.g. HTTP post data.
+ */
+
+#ifndef _nsMemCache_h_
+#define _nsMemCache_h_
+
+#include "nsINetDataCache.h"
+
+// Maximum number of URIs that may be resident in the cache
+#define MEM_CACHE_MAX_ENTRIES 1000
+
+#define MEM_CACHE_SEGMENT_SIZE       (1 << 12)
+#define MEM_CACHE_MAX_ENTRY_SIZE     (1 << 20)
+
+class nsHashtable;
+class nsMemCacheRecord;
+
+class nsMemCache : public nsINetDataCache
+{
+public:
+    nsMemCache();
+    virtual ~nsMemCache();
+    nsresult Init();
+
+    // nsISupports methods
+    NS_DECL_ISUPPORTS
+
+    // nsINetDataCache methods
+    NS_DECL_NSINETDATACACHE
+
+    // Factory
+    static NS_METHOD nsMemCacheConstructor(nsISupports *aOuter, REFNSIID aIID,
+                                           void **aResult);
+
+protected:
+
+    PRUint32         mNumEntries;
+    PRUint32         mOccupancy;   // Memory used, in bytes
+    PRBool           mEnabled;     // If false, bypass mem cache
+
+    nsINetDataCache* mNextCache;
+
+    // Mapping from either opaque key or record ID to nsMemCacheRecord
+    nsHashtable*     mHashTable;
+
+    // Used to assign record ID's
+    static PRInt32   gRecordSerialNumber;
+
+    NS_METHOD Delete(nsMemCacheRecord* aRecord);
+
+    friend class nsMemCacheRecord;
+    friend class nsMemCacheChannel;
+};
+
+#endif // _nsMemCache_h_

mozilla/netwerk/cache/memcache/nsMemCacheCID.h

@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+//  XPCOM Class ID for the network data in-memory cache
+
+#ifndef nsMEMCACHECID_h__
+#define nsMEMCACHECID_h__
+
+// {e4710560-7de2-11d3-90cb-0040056a906e}
+#define NS_MEM_CACHE_FACTORY_CID                          \
+    {                                                     \
+        0xe4710560,                                       \
+	    0x7de2,                                           \
+        0x11d3,                                           \
+	    {0x90, 0xcb, 0x00, 0x40, 0x05, 0x6a, 0x90, 0x6e}  \
+    }
+
+#endif // nsMEMCACHECID_h__

mozilla/netwerk/cache/memcache/nsMemCacheChannel.cpp

@@ -0,0 +1,462 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+#include "nsMemCache.h"
+#include "nsMemCacheChannel.h"
+#include "nsIStreamListener.h"
+#include "nsIChannel.h"
+#include "nsIStorageStream.h"
+#include "nsIOutputStream.h"
+#include "nsIServiceManager.h"
+#include "nsIEventQueueService.h"
+#include "nsNetUtil.h"
+#include "nsILoadGroup.h"
+
+static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
+static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID);
+
+NS_IMPL_ISUPPORTS(nsMemCacheChannel, NS_GET_IID(nsIChannel))
+
+void
+nsMemCacheChannel::NotifyStorageInUse(PRInt32 aBytesUsed)
+{
+    mRecord->mCache->mOccupancy += aBytesUsed;
+}
+
+/**
+ * This class acts as an adaptor around a synchronous input stream to add async
+ * read capabilities.  It adds methods for initiating, suspending, resuming and
+ * cancelling async reads. 
+ */
+class AsyncReadStreamAdaptor : public nsIInputStream {
+public:
+    AsyncReadStreamAdaptor(nsMemCacheChannel* aChannel, nsIInputStream *aSyncStream):
+        mSyncStream(aSyncStream), mDataAvailCursor(0),
+        mRemaining(0), mAvailable(0), mChannel(aChannel), mAborted(PR_FALSE), mSuspended(PR_FALSE)
+        {
+            NS_INIT_REFCNT();
+            NS_ADDREF(mChannel);
+        }
+
+    virtual ~AsyncReadStreamAdaptor() { 
+        mChannel->mAsyncReadStream = 0;
+        NS_RELEASE(mChannel);
+    }
+    
+    NS_DECL_ISUPPORTS
+
+    nsresult
+    IsPending(PRBool* aIsPending) {
+        *aIsPending = (mRemaining != 0) && !mAborted;
+        return NS_OK;
+    }
+
+    nsresult
+    Cancel(void) {
+        mAborted = PR_TRUE;
+        return mStreamListener->OnStopRequest(mChannel, mContext, NS_BINDING_ABORTED, nsnull);
+    }
+
+    nsresult
+    Suspend(void) { mSuspended = PR_TRUE; return NS_OK; }
+
+    nsresult
+    Resume(void) {
+        if (!mSuspended)
+            return NS_ERROR_FAILURE;
+        mSuspended = PR_FALSE;
+        return NextListenerEvent();
+    }
+
+    NS_IMETHOD
+    Available(PRUint32 *aNumBytes) { return mAvailable; }
+
+    NS_IMETHOD
+    Read(char* aBuf, PRUint32 aCount, PRUint32 *aBytesRead) {
+        if (mAborted)
+            return NS_ERROR_ABORT;
+
+        *aBytesRead = 0;
+        aCount = PR_MIN(aCount, mAvailable);
+        nsresult rv = mSyncStream->Read(aBuf, aCount, aBytesRead);
+        mAvailable -= *aBytesRead;
+
+        if (NS_FAILED(rv) && (rv != NS_BASE_STREAM_WOULD_BLOCK)) {
+            Fail();
+            return rv;
+        }
+
+        if (!mSuspended && !mAvailable) {
+            rv = NextListenerEvent();
+            if (NS_FAILED(rv)) {
+                Fail();
+                return rv;
+            }
+        }
+
+        return NS_OK;
+    }
+
+    NS_IMETHOD
+    Close() {
+        nsresult rv = mSyncStream->Close();
+        mSyncStream = 0;
+        mContext = 0;
+        mStreamListener = 0;
+        return rv;
+    }
+
+    nsresult
+    AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
+              nsISupports* aContext, nsIStreamListener* aListener) {
+
+        nsresult rv;
+        nsIEventQueue *eventQ;
+
+        mContext = aContext;
+        mStreamListener = aListener;
+        mRemaining = aReadCount;
+
+        NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
+        if (NS_FAILED(rv)) return rv;
+
+        NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv);
+        if (NS_FAILED(rv)) return rv;
+
+        rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQ);
+        if (NS_FAILED(rv)) return rv;
+
+        rv = NS_NewAsyncStreamListener(aListener, eventQ, 
+                                       getter_AddRefs(mStreamListener));
+        NS_RELEASE(eventQ);
+        if (NS_FAILED(rv)) return rv;
+
+        rv = mStreamListener->OnStartRequest(mChannel, aContext);
+        if (NS_FAILED(rv)) return rv;
+
+        return NextListenerEvent();
+    }
+
+protected:
+
+    nsresult
+    Fail(void) {
+        mAborted = PR_TRUE;
+        return mStreamListener->OnStopRequest(mChannel, mContext, NS_BINDING_FAILED, nsnull);
+    }
+
+    nsresult
+    NextListenerEvent() {
+        PRUint32 available;
+        nsresult rv = mSyncStream->Available(&available);
+        if (NS_FAILED(rv)) return rv;
+        available -= mAvailable;
+        available = PR_MIN(available, mRemaining);
+
+        if (available) {
+            PRUint32 size = PR_MIN(available, MEM_CACHE_SEGMENT_SIZE);
+            rv = mStreamListener->OnDataAvailable(mChannel, mContext, this,
+                                                  mDataAvailCursor, size);
+            mDataAvailCursor += size;
+            mRemaining -= size;
+            mAvailable += size;
+            return rv;
+        } else {
+            rv = mStreamListener->OnStopRequest(mChannel, mContext, NS_OK, nsnull);
+            AsyncReadStreamAdaptor* thisAlias = this;
+            NS_RELEASE(thisAlias);
+            return rv;
+        }
+    }
+    
+private:
+    nsCOMPtr<nsISupports>       mContext;        // Opaque context passed to AsyncRead()
+    nsCOMPtr<nsIStreamListener> mStreamListener; // Stream listener that has been proxied
+    nsCOMPtr<nsIInputStream>    mSyncStream;     // Underlying synchronous stream that is
+                                                 //   being converted to an async stream
+    PRUint32                    mDataAvailCursor;
+    PRUint32                    mRemaining;      // Size of AsyncRead request less bytes for
+                                                 //   consumer OnDataAvailable's that were fired
+    PRUint32                    mAvailable;      // Number of bytes for which OnDataAvailable fired
+    nsMemCacheChannel*          mChannel;        // Associated memory cache channel, strong link
+                                                 //   but can not use nsCOMPtr
+    PRBool                      mAborted;        // Abort() has been called
+    PRBool                      mSuspended;      // Suspend() has been called
+};
+
+NS_IMPL_ISUPPORTS(AsyncReadStreamAdaptor,  NS_GET_IID(nsIInputStream))
+
+// The only purpose of this output stream wrapper is to adjust the cache's
+// overall occupancy as new data flows into the cache entry.
+class MemCacheWriteStreamWrapper : public nsIOutputStream {
+public:
+    MemCacheWriteStreamWrapper(nsMemCacheChannel* aChannel, nsIOutputStream *aBaseStream):
+        mBaseStream(aBaseStream), mChannel(aChannel)
+        {
+            NS_INIT_REFCNT();
+            NS_ADDREF(mChannel);
+        }
+
+    virtual ~MemCacheWriteStreamWrapper() { NS_RELEASE(mChannel); };
+    
+    static nsresult
+    Create(nsMemCacheChannel* aChannel, nsIOutputStream *aBaseStream, nsIOutputStream* *aWrapper) {
+        MemCacheWriteStreamWrapper *wrapper =
+            new MemCacheWriteStreamWrapper(aChannel, aBaseStream);
+        if (!wrapper) return NS_ERROR_OUT_OF_MEMORY;
+        NS_ADDREF(wrapper);
+        *aWrapper = wrapper;
+        return NS_OK;
+    }
+    
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD
+    Write(const char *aBuffer, PRUint32 aCount, PRUint32 *aNumWritten) {
+        *aNumWritten = 0;
+        nsresult rv = mBaseStream->Write(aBuffer, aCount, aNumWritten);
+        mChannel->NotifyStorageInUse(*aNumWritten);
+        return rv;
+    }
+
+    NS_IMETHOD
+    Flush() { return mBaseStream->Flush(); }
+
+    NS_IMETHOD
+    Close() { return mBaseStream->Close(); }
+
+private:
+    nsCOMPtr<nsIOutputStream>   mBaseStream;
+    nsMemCacheChannel*          mChannel;
+};
+
+NS_IMPL_ISUPPORTS(MemCacheWriteStreamWrapper,  NS_GET_IID(nsIOutputStream))
+
+nsMemCacheChannel::nsMemCacheChannel(nsMemCacheRecord *aRecord, nsILoadGroup *aLoadGroup)
+    : mRecord(aRecord)
+{
+    NS_INIT_REFCNT();
+    mRecord->mNumChannels++;
+}
+
+nsMemCacheChannel::~nsMemCacheChannel()
+{
+    mRecord->mNumChannels--;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::IsPending(PRBool* aIsPending)
+{
+    *aIsPending = PR_FALSE;
+    if (!mAsyncReadStream)
+        return NS_OK;
+    return mAsyncReadStream->IsPending(aIsPending);
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::Cancel(void)
+{
+    if (!mAsyncReadStream)
+        return NS_ERROR_FAILURE;
+    return mAsyncReadStream->Cancel();
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::Suspend(void)
+{
+    if (!mAsyncReadStream)
+        return NS_ERROR_FAILURE;
+    return mAsyncReadStream->Suspend();
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::Resume(void)
+{
+    if (!mAsyncReadStream)
+        return NS_ERROR_FAILURE;
+    return mAsyncReadStream->Resume();
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetOriginalURI(nsIURI * *aURI)
+{
+    // Not required
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetURI(nsIURI * *aURI)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::OpenInputStream(PRUint32 aStartPosition, PRInt32 aReadCount,
+                                   nsIInputStream* *aResult)
+{
+    nsresult rv;
+    NS_ENSURE_ARG(aResult);
+    if (mInputStream)
+        return NS_ERROR_NOT_AVAILABLE;
+
+    rv = mRecord->mStorageStream->NewInputStream(aStartPosition, getter_AddRefs(mInputStream));
+    *aResult = mInputStream;
+    NS_ADDREF(*aResult);
+    return rv;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::OpenOutputStream(PRUint32 startPosition, nsIOutputStream* *aResult)
+{
+    nsresult rv;
+    NS_ENSURE_ARG(aResult);
+
+    nsCOMPtr<nsIOutputStream> outputStream;
+
+    PRUint32 oldLength;
+    mRecord->mStorageStream->GetLength(&oldLength);
+    rv = mRecord->mStorageStream->GetOutputStream(startPosition, getter_AddRefs(outputStream));
+    if (NS_FAILED(rv)) return rv;
+    if (startPosition < oldLength)
+        NotifyStorageInUse(startPosition - oldLength);
+
+    return MemCacheWriteStreamWrapper::Create(this, outputStream, aResult);
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::AsyncOpen(nsIStreamObserver *observer, nsISupports *ctxt)
+{
+    // Not required
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
+                             nsISupports *aContext, nsIStreamListener *aListener)
+{
+    nsCOMPtr<nsIInputStream> inputStream;
+    nsresult rv = OpenInputStream(aStartPosition, aReadCount, getter_AddRefs(inputStream));
+    if (NS_FAILED(rv)) return rv;
+    
+    AsyncReadStreamAdaptor *asyncReadStreamAdaptor;
+    asyncReadStreamAdaptor = new AsyncReadStreamAdaptor(this, inputStream);
+    if (!asyncReadStreamAdaptor)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(asyncReadStreamAdaptor);
+    mAsyncReadStream = asyncReadStreamAdaptor;
+
+    rv = asyncReadStreamAdaptor->AsyncRead(aStartPosition, aReadCount, aContext, aListener);
+    if (NS_FAILED(rv))
+        delete asyncReadStreamAdaptor;
+    return rv;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::AsyncWrite(nsIInputStream *fromStream, PRUint32 startPosition,
+                              PRInt32 writeCount, nsISupports *ctxt,
+                              nsIStreamObserver *observer)
+{
+    // Not required to be implemented
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetContentType(char* *aContentType)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetContentLength(PRInt32 *aContentLength)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetOwner(nsISupports* *aOwner)
+{
+    *aOwner = mOwner.get();
+    NS_IF_ADDREF(*aOwner);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::SetOwner(nsISupports* aOwner)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    mOwner = aOwner;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
+{
+    // Not required to be implemented, since it is implemented by cache manager
+    NS_ASSERTION(0, "nsMemCacheChannel method unexpectedly called");
+    return NS_ERROR_NOT_IMPLEMENTED;
+}

mozilla/netwerk/cache/memcache/nsMemCacheChannel.h

@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+#ifndef _nsMemCacheChannel_h_
+#define _nsMemCacheChannel_h_
+
+#include "nsMemCacheRecord.h"
+#include "nsIChannel.h"
+#include "nsIInputStream.h"
+#include "nsCOMPtr.h"
+
+
+class AsyncReadStreamAdaptor;
+
+class nsMemCacheChannel : public nsIChannel
+{
+public:
+    // Constructors and Destructor
+    nsMemCacheChannel(nsMemCacheRecord *aRecord, nsILoadGroup *aLoadGroup);
+    virtual ~nsMemCacheChannel();
+
+    // Declare nsISupports methods
+    NS_DECL_ISUPPORTS
+
+    // Declare nsIRequest methods
+    NS_DECL_NSIREQUEST
+
+    // Declare nsIChannel methods
+    NS_DECL_NSICHANNEL
+
+protected:
+    void NotifyStorageInUse(PRInt32 aBytesUsed);
+
+    nsCOMPtr<nsMemCacheRecord>   mRecord;
+    nsCOMPtr<nsIInputStream>     mInputStream;
+    nsCOMPtr<nsISupports>        mOwner;
+    AsyncReadStreamAdaptor*      mAsyncReadStream; // non-owning pointer
+
+    friend class MemCacheWriteStreamWrapper;
+    friend class AsyncReadStreamAdaptor;
+};
+
+#endif // _nsMemCacheChannel_h_

mozilla/netwerk/cache/memcache/nsMemCacheRecord.cpp

@@ -0,0 +1,164 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+#include "nsMemCache.h"
+#include "nsMemCacheRecord.h"
+#include "nsMemCacheChannel.h"
+#include "nsIAllocator.h"
+#include "nsStorageStream.h"
+
+static NS_DEFINE_IID(kINetDataCacheRecord, NS_INETDATACACHERECORD_IID);
+
+nsMemCacheRecord::nsMemCacheRecord()
+    : mKey(0), mKeyLength(0), mMetaData(0), mMetaDataLength(0), mNumChannels(0)
+{
+    NS_INIT_REFCNT();
+}
+
+nsMemCacheRecord::~nsMemCacheRecord()
+{
+    if (mMetaData)
+        delete[] mMetaData;
+    if (mKey)
+        delete[] mKey;
+}	
+     
+NS_IMPL_ISUPPORTS(nsMemCacheRecord, NS_GET_IID(nsINetDataCacheRecord))
+
+NS_IMETHODIMP
+nsMemCacheRecord::GetKey(PRUint32 *aLength, char **aResult)
+{
+    NS_ENSURE_ARG(aResult);
+    *aResult = (char *)nsAllocator::Alloc(mKeyLength);
+    if (!*aResult)
+        return NS_ERROR_OUT_OF_MEMORY;
+    memcpy(*aResult, mKey, mKeyLength);
+    *aLength = mKeyLength;
+    return NS_OK;
+}
+
+nsresult
+nsMemCacheRecord::Init(const char *aKey, PRUint32 aKeyLength,
+                       PRUint32 aRecordID, nsMemCache *aCache)
+{
+    nsresult rv;
+
+    NS_ASSERTION(!mKey, "Memory cache record key set multiple times");
+
+    rv = NS_NewStorageStream(MEM_CACHE_SEGMENT_SIZE, MEM_CACHE_MAX_ENTRY_SIZE,
+                             getter_AddRefs(mStorageStream));
+    if (NS_FAILED(rv)) return rv;
+
+    mKey = new char[aKeyLength];
+    if (!mKey)
+        return NS_ERROR_OUT_OF_MEMORY;
+    memcpy(mKey, aKey, aKeyLength);
+    mKeyLength = aKeyLength;
+    mRecordID = aRecordID;
+    mCache = aCache;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::GetRecordID(PRInt32 *aRecordID)
+{
+    NS_ENSURE_ARG(aRecordID);
+    *aRecordID = mRecordID;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::GetMetaData(PRUint32 *aLength, char **aResult)
+{
+    NS_ENSURE_ARG(aResult);
+
+    *aResult = 0;
+    if (mMetaDataLength) {
+        *aResult = (char*)nsAllocator::Alloc(mMetaDataLength);
+        if (!*aResult)
+            return NS_ERROR_OUT_OF_MEMORY;
+        memcpy(*aResult, mMetaData, mMetaDataLength);
+    }
+    *aLength = mMetaDataLength;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::SetMetaData(PRUint32 aLength, const char *aData)
+{
+    if (mMetaData)
+        delete[] mMetaData;
+    mMetaData = new char[aLength];
+    if (!mMetaData)
+        return NS_ERROR_OUT_OF_MEMORY;
+    memcpy(mMetaData, aData, aLength);
+    mMetaDataLength = aLength;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::GetStoredContentLength(PRUint32 *aStoredContentLength)
+{
+    NS_ENSURE_ARG(aStoredContentLength);
+    return mStorageStream->GetLength(aStoredContentLength);
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::SetStoredContentLength(PRUint32 aStoredContentLength)
+{
+    PRUint32 before, after;
+    mStorageStream->GetLength(&before);
+    nsresult rv = mStorageStream->SetLength(aStoredContentLength);
+    if (NS_FAILED(rv)) return rv;
+    mStorageStream->GetLength(&after);
+    mCache->mOccupancy -= (before - after);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::Delete(void)
+{
+    if (mNumChannels)
+        return NS_ERROR_NOT_AVAILABLE;
+  
+    return mCache->Delete(this);
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::GetFilename(nsIFileSpec* *aFilename)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsMemCacheRecord::NewChannel(nsILoadGroup *aLoadGroup, nsIChannel* *aResult)
+{
+    NS_ENSURE_ARG(aResult);
+
+    nsMemCacheChannel* channel = new nsMemCacheChannel(this, aLoadGroup);
+    if (!channel)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(channel);
+    *aResult = NS_STATIC_CAST(nsIChannel*, channel);
+    return NS_OK;
+
+}

mozilla/netwerk/cache/memcache/nsMemCacheRecord.h

@@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ */
+
+#ifndef _nsMemCacheRecord_h_
+#define _nsMemCacheRecord_h_
+
+#include "nsINetDataCacheRecord.h"
+#include "nsIStorageStream.h"
+#include "nsCOMPtr.h"
+
+class nsMemCache;
+
+class nsMemCacheRecord : public nsINetDataCacheRecord
+{
+
+public:
+    // Declare interface methods
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSINETDATACACHERECORD
+
+protected:
+    // Constructors and Destructor
+    nsMemCacheRecord();
+    virtual ~nsMemCacheRecord();
+
+    nsresult Init(const char *aKey, PRUint32 aKeyLength,
+                  PRUint32 aRecordID, nsMemCache *aCache);
+
+    char*       mKey;              // opaque database key for this record
+    PRUint32    mKeyLength;        // length, in bytes, of mKey
+
+    PRInt32     mRecordID;         // An alternate key for this record
+
+    char*       mMetaData;         // opaque URI metadata
+    PRUint32    mMetaDataLength;   // length, in bytes, of mMetaData
+
+    nsMemCache* mCache;            // weak pointer to the cache database
+                                   //  that this record inhabits
+
+    nsCOMPtr<nsIStorageStream> mStorageStream;
+    PRUint32    mNumChannels;      // Count un-Release'ed nsIChannels
+
+    friend class nsMemCache;
+    friend class nsMemCacheChannel;
+};
+
+#endif // _nsMemCacheRecord_h_

mozilla/netwerk/cache/mgr/Makefile.in

@@ -0,0 +1,55 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= nkcache 
+LIBRARY_NAME	= nkcachemgr_s
+
+REQUIRES	= nspr
+
+EXPORTS		= \
+		nsCacheManager.h \
+		$(NULL)
+
+CPPSRCS		= \
+        nsCacheManager.cpp \
+        nsCachedNetData.cpp \
+        nsReplacementPolicy.cpp \
+        nsCacheEntryChannel.cpp \
+		$(NULL)
+
+LOCAL_INCLUDES	= -I$(srcdir)/../public -I$(srcdir)/../include
+
+EXTRA_LIBS	= $(NSPR_LIBS)
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/netwerk/cache/mgr/Makefile.win

@@ -0,0 +1,45 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..
+
+include <$(DEPTH)/config/config.mak>
+
+MODULE = nkcache
+
+LIBRARY_NAME = nkcachemgr_s
+
+CPP_OBJS =                                   \
+	.\$(OBJDIR)\nsCacheManager.obj       \
+	.\$(OBJDIR)\nsCachedNetData.obj      \
+	.\$(OBJDIR)\nsReplacementPolicy.obj  \
+	.\$(OBJDIR)\nsCacheEntryChannel.obj  \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak> 
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -rf $(OBJDIR)
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+

mozilla/netwerk/cache/mgr/nsCacheEntryChannel.cpp

@@ -0,0 +1,261 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#include "nsCacheManager.h"
+#include "nsCacheEntryChannel.h"
+#include "nsIOutputStream.h"
+#include "nsIIOService.h"
+#include "nsIServiceManager.h"
+#include "nsIStreamListener.h"
+
+nsCacheEntryChannel::nsCacheEntryChannel(nsCachedNetData* aCacheEntry, nsIChannel* aChannel,
+                                         nsILoadGroup* aLoadGroup):
+    nsChannelProxy(aChannel), mCacheEntry(aCacheEntry), mLoadGroup(aLoadGroup), mLoadAttributes(0)
+{
+    NS_ASSERTION(aCacheEntry->mChannelCount < 0xFF, "Overflowed channel counter");
+    mCacheEntry->mChannelCount++;
+    NS_INIT_REFCNT();
+}
+
+nsCacheEntryChannel::~nsCacheEntryChannel()
+{
+    mCacheEntry->mChannelCount--;
+}
+
+NS_IMPL_ISUPPORTS3(nsCacheEntryChannel, nsISupports, nsIChannel, nsIRequest)
+
+// A proxy for nsIOutputStream
+class CacheOutputStream : public nsIOutputStream {
+
+public:
+    CacheOutputStream(nsIOutputStream *aOutputStream, nsCachedNetData *aCacheEntry):
+        mOutputStream(aOutputStream), mCacheEntry(aCacheEntry), mStartTime(PR_Now())
+        { NS_INIT_REFCNT(); }
+
+    virtual ~CacheOutputStream() {
+        mCacheEntry->NoteDownloadTime(mStartTime, PR_Now());
+        mCacheEntry->ClearFlag(nsCachedNetData::UPDATE_IN_PROGRESS);
+    }
+    
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD Close() {
+        return mOutputStream->Close();
+    }
+
+    NS_IMETHOD Flush() { return mOutputStream->Flush(); }
+
+    NS_IMETHOD
+    Write(const char *aBuf, PRUint32 aCount, PRUint32 *aActualBytes) {
+        nsresult rv;
+    
+        *aActualBytes = 0;
+        rv = mOutputStream->Write(aBuf, aCount, aActualBytes);
+        mCacheEntry->mLogicalLength += *aActualBytes;
+        if (NS_FAILED(rv)) return rv;
+        nsCacheManager::LimitCacheSize();
+        return rv;
+    }
+    
+protected:
+    nsCOMPtr<nsIOutputStream> mOutputStream;
+    nsCOMPtr<nsCachedNetData> mCacheEntry;
+
+    // Time at which stream was opened
+    PRTime mStartTime;
+};
+
+NS_IMPL_ISUPPORTS(CacheOutputStream, NS_GET_IID(nsIOutputStream))
+
+NS_IMETHODIMP
+nsCacheEntryChannel::OpenOutputStream(PRUint32 aStartPosition, nsIOutputStream* *aOutputStream)
+{
+    nsresult rv;
+    nsCOMPtr<nsIOutputStream> baseOutputStream;
+    
+    rv = mChannel->OpenOutputStream(aStartPosition, getter_AddRefs(baseOutputStream));
+    if (NS_FAILED(rv)) return rv;
+
+    mCacheEntry->NoteUpdate();
+    mCacheEntry->NoteAccess();
+    mCacheEntry->mLogicalLength = aStartPosition;
+
+    *aOutputStream = new CacheOutputStream(baseOutputStream, mCacheEntry);
+    if (!*aOutputStream)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(*aOutputStream);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheEntryChannel::OpenInputStream(PRUint32 aStartPosition, PRInt32 aReadCount,
+				     nsIInputStream* *aInputStream)
+{
+    mCacheEntry->NoteAccess();
+    return mChannel->OpenInputStream(aStartPosition, aReadCount, aInputStream);
+}
+
+class CacheManagerStreamListener: public nsIStreamListener  {
+
+    public:
+    
+    CacheManagerStreamListener(nsIStreamListener *aListener,
+                               nsILoadGroup *aLoadGroup, nsIChannel *aChannel):
+        mListener(aListener), mLoadGroup(aLoadGroup), mChannel(aChannel)
+        { NS_INIT_REFCNT(); }
+
+    virtual ~CacheManagerStreamListener() {}
+
+    private:
+
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD
+    OnDataAvailable(nsIChannel *channel, nsISupports *aContext,
+                    nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count) {
+        return mListener->OnDataAvailable(mChannel, aContext, inStr, sourceOffset, count);
+    }
+
+    NS_IMETHOD
+    OnStartRequest(nsIChannel *channel, nsISupports *aContext) {
+        if (mLoadGroup)
+            mLoadGroup->AddChannel(mChannel, aContext);
+        return mListener->OnStartRequest(mChannel, aContext);
+    }
+
+    NS_IMETHOD
+    OnStopRequest(nsIChannel *channel, nsISupports *aContext,
+                  nsresult status, const PRUnichar *errorMsg) {
+        nsresult rv;
+        rv = mListener->OnStopRequest(mChannel, aContext, status, errorMsg);
+        if (mLoadGroup)
+            mLoadGroup->RemoveChannel(mChannel, aContext, status, errorMsg);
+        return rv;
+    }
+
+    private:
+    
+    nsCOMPtr<nsIStreamListener>  mListener;
+    nsCOMPtr<nsILoadGroup>       mLoadGroup;
+    nsCOMPtr<nsIChannel>         mChannel;
+};
+
+NS_IMPL_ISUPPORTS2(CacheManagerStreamListener, nsIStreamListener, nsIStreamObserver)
+
+NS_IMETHODIMP
+nsCacheEntryChannel::AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
+                               nsISupports *aContext, nsIStreamListener *aListener)
+{
+    nsresult rv;
+
+    mCacheEntry->NoteAccess();
+
+    nsCOMPtr<nsIStreamListener> headListener;
+    if (mLoadGroup) {
+        mLoadGroup->GetDefaultLoadAttributes(&mLoadAttributes);
+
+        // Create a load group "proxy" listener...
+        nsCOMPtr<nsILoadGroupListenerFactory> factory;
+        rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
+        if (NS_SUCCEEDED(rv) && factory) {
+            rv = factory->CreateLoadGroupListener(aListener, 
+                                                  getter_AddRefs(headListener));
+            if (NS_FAILED(rv)) return rv;
+        }
+
+    } else {
+        headListener = aListener;
+    }
+
+    CacheManagerStreamListener* cacheManagerStreamListener;
+    nsIChannel *channelForListener;
+
+    channelForListener = mProxyChannel ? mProxyChannel.get() : NS_STATIC_CAST(nsIChannel*, this);
+    cacheManagerStreamListener =
+        new CacheManagerStreamListener(headListener, mLoadGroup, channelForListener);
+    if (!cacheManagerStreamListener) return NS_ERROR_OUT_OF_MEMORY;
+    
+    NS_ADDREF(cacheManagerStreamListener);
+    rv = mChannel->AsyncRead(aStartPosition, aReadCount, aContext,
+                             cacheManagerStreamListener);
+    NS_RELEASE(cacheManagerStreamListener);
+
+    return rv;
+}
+
+// No async writes allowed to the cache yet
+NS_IMETHODIMP
+nsCacheEntryChannel::AsyncWrite(nsIInputStream *aFromStream, PRUint32 aStartPosition,
+				PRInt32 aWriteCount, nsISupports *aContext,
+				nsIStreamObserver *aObserver)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsCacheEntryChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
+{
+    *aLoadGroup = mLoadGroup;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheEntryChannel::GetLoadAttributes(nsLoadFlags *aLoadAttributes)
+{
+    *aLoadAttributes = mLoadAttributes;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheEntryChannel::SetLoadAttributes(nsLoadFlags aLoadAttributes)
+{
+    mLoadAttributes = aLoadAttributes;
+    return NS_OK;
+}
+
+static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
+
+NS_IMETHODIMP
+nsCacheEntryChannel::GetURI(nsIURI * *aURI)
+{
+    char* spec;
+    nsresult rv;
+
+    rv = mCacheEntry->GetUriSpec(&spec);
+    if (NS_FAILED(rv)) return rv;
+
+    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+    
+    rv = serv->NewURI(spec, 0, aURI);
+    nsAllocator::Free(spec);
+    return rv;
+}
+
+NS_IMETHODIMP
+nsCacheEntryChannel::GetOriginalURI(nsIURI * *aURI)
+{
+    // FIXME - should return original URI passed into NewChannel() ?
+    return NS_ERROR_NOT_IMPLEMENTED;
+}

mozilla/netwerk/cache/mgr/nsCacheEntryChannel.h

@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#ifndef _nsCacheEntryChannel_h_
+#define _nsCacheEntryChannel_h_
+
+#include "nsCOMPtr.h"
+#include "nsIChannel.h"
+#include "nsCachedNetData.h"
+#include "nsILoadGroup.h"
+
+class nsIStreamListener;
+
+// A proxy for an nsIChannel, useful when only a few nsIChannel
+// methods must be overridden
+class nsChannelProxy : public nsIChannel {
+
+public:
+    NS_FORWARD_NSICHANNEL(mChannel->)
+    NS_FORWARD_NSIREQUEST(mChannel->)
+
+protected:
+    nsChannelProxy(nsIChannel* aChannel):mChannel(aChannel) {};
+    virtual ~nsChannelProxy() {};
+    nsCOMPtr<nsIChannel>      mChannel;
+};
+
+// Override several nsIChannel methods so that they interact with the cache manager
+class nsCacheEntryChannel : public nsChannelProxy {
+
+public:
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHOD OpenOutputStream(PRUint32 aStartPosition, nsIOutputStream* *aOutputStream);
+    NS_IMETHOD OpenInputStream(PRUint32 aStartPosition, PRInt32 aReadCount,
+			       nsIInputStream* *aInputStream);
+    NS_IMETHOD AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
+			 nsISupports *aContext, nsIStreamListener *aListener);
+    NS_IMETHOD AsyncWrite(nsIInputStream *aFromStream, PRUint32 aStartPosition,
+			  PRInt32 aWriteCount, nsISupports *aContext,
+			  nsIStreamObserver *aObserver);
+    NS_IMETHOD GetLoadAttributes(nsLoadFlags *aLoadAttributes);
+    NS_IMETHOD SetLoadAttributes(nsLoadFlags aLoadAttributes);
+    NS_IMETHOD GetLoadGroup(nsILoadGroup* *aLoadGroup);
+    NS_IMETHOD GetURI(nsIURI * *aURI);
+    NS_IMETHOD GetOriginalURI(nsIURI * *aURI);
+
+protected:
+    nsCacheEntryChannel(nsCachedNetData* aCacheEntry, nsIChannel* aChannel, nsILoadGroup* aLoadGroup);
+    virtual ~nsCacheEntryChannel();
+
+    friend class nsCachedNetData;
+
+private:
+    nsCOMPtr<nsCachedNetData>    mCacheEntry;
+    nsCOMPtr<nsILoadGroup>       mLoadGroup;
+    nsCOMPtr<nsIChannel>         mProxyChannel;
+    nsLoadFlags                  mLoadAttributes;
+};
+
+#endif // _nsCacheEntryChannel_h_

mozilla/netwerk/cache/mgr/nsCacheManager.cpp

@@ -0,0 +1,497 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * 
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#include "nsINetDataCache.h"
+#include "nsCacheManager.h"
+#include "nsCachedNetData.h"
+#include "nsReplacementPolicy.h"
+#include "nsString.h"
+#include "nsIURI.h"
+#include "nsHashtable.h"
+#include "nsIComponentManager.h"
+#include "nsINetDataDiskCache.h"
+
+// Limit the number of entries in the cache to conserve memory space
+// in the nsReplacementPolicy code
+#define MAX_MEM_CACHE_ENTRIES    800
+#define MAX_DISK_CACHE_ENTRIES  3200
+
+// Cache capacities in MB, overridable via APIs
+#define DEFAULT_MEMORY_CACHE_CAPACITY  1024
+#define DEFAULT_DISK_CACHE_CAPACITY   10000
+
+#define CACHE_HIGH_WATER_MARK(capacity) ((PRUint32)(0.98 * (capacity)))
+#define CACHE_LOW_WATER_MARK(capacity)  ((PRUint32)(0.97 * (capacity)))
+
+nsCacheManager* gCacheManager = 0;
+
+NS_IMPL_ISUPPORTS(nsCacheManager, NS_GET_IID(nsINetDataCacheManager))
+
+nsCacheManager::nsCacheManager()
+    : mActiveCacheRecords(0),
+    mDiskCacheCapacity(DEFAULT_DISK_CACHE_CAPACITY),
+    mMemCacheCapacity(DEFAULT_MEMORY_CACHE_CAPACITY)
+{
+    NS_ASSERTION(!gCacheManager, "Multiple cache managers created");
+    gCacheManager = this;
+    NS_INIT_REFCNT();
+}
+
+nsCacheManager::~nsCacheManager()
+{
+    gCacheManager = 0;
+    delete mActiveCacheRecords;
+    delete mMemSpaceManager;
+    delete mDiskSpaceManager;
+}
+
+nsresult
+nsCacheManager::Init()
+{
+    nsresult rv;
+
+    mActiveCacheRecords = new nsHashtable(64);
+    if (!mActiveCacheRecords)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    // Instantiate the memory cache component
+    rv = nsComponentManager::CreateInstance(NS_NETWORK_MEMORY_CACHE_PROGID,
+                                            nsnull,
+                                            NS_GET_IID(nsINetDataCache),
+                                            getter_AddRefs(mMemCache));
+    if (NS_FAILED(rv))
+        return rv;
+
+    rv = nsComponentManager::CreateInstance(NS_NETWORK_FLAT_CACHE_PROGID,
+                                            nsnull,
+                                            NS_GET_IID(nsINetDataCache),
+
+                                            getter_AddRefs(mFlatCache));
+
+    if (NS_FAILED(rv)) {
+        // For now, we don't require a flat cache module to be present
+        if (rv != NS_ERROR_FACTORY_NOT_REGISTERED)
+            return rv;
+    }
+
+#ifdef FILE_CACHE_IS_READY
+    // Instantiate the file cache component
+    rv = nsComponentManager::CreateInstance(NS_NETWORK_FILE_CACHE_PROGID,
+                                            nsnull,
+                                            NS_GET_IID(nsINetDataCache),
+                                            getter_AddRefs(mFileCache));
+    if (NS_FAILED(rv)) {
+        NS_WARNING("No disk cache present");
+    }
+#endif
+
+    // Set up linked list of caches in search order
+    mCacheSearchChain = mMemCache;
+    if (mFlatCache) {
+        mMemCache->SetNextCache(mFlatCache);
+        mFlatCache->SetNextCache(mFileCache);
+    } else {
+        mMemCache->SetNextCache(mFileCache);
+    }
+
+    // TODO - Load any extension caches here
+
+    // Initialize replacement policy for memory cache module
+    mMemSpaceManager = new nsReplacementPolicy;
+    if (!mMemSpaceManager)
+        return NS_ERROR_OUT_OF_MEMORY;
+    rv = mMemSpaceManager->Init(MAX_MEM_CACHE_ENTRIES);
+    if (NS_FAILED(rv)) return rv;
+    rv = mMemSpaceManager->AddCache(mMemCache);
+
+    // Initialize replacement policy for disk cache modules (file
+    // cache and flat cache)
+    mDiskSpaceManager = new nsReplacementPolicy;
+    if (!mDiskSpaceManager)
+        return NS_ERROR_OUT_OF_MEMORY;
+    rv = mDiskSpaceManager->Init(MAX_DISK_CACHE_ENTRIES);
+    if (NS_FAILED(rv)) return rv;
+    if (mFileCache) {
+        rv = mDiskSpaceManager->AddCache(mFileCache);
+        if (NS_FAILED(rv)) return rv;
+    }
+    if (mFlatCache) {
+        rv = mDiskSpaceManager->AddCache(mFlatCache);
+        if (NS_FAILED(rv)) return rv;
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::GetCachedNetData(const char *aUriSpec, const char *aSecondaryKey,
+                                 PRUint32 aSecondaryKeyLength,
+                                 PRUint32 aFlags, nsICachedNetData* *aResult)
+{
+    nsCachedNetData *cachedData;
+    nsresult rv;
+    nsINetDataCache *cache;
+    nsReplacementPolicy *spaceManager;
+
+    if (aFlags & CACHE_AS_FILE) {
+        cache = mFileCache;
+        spaceManager = mDiskSpaceManager;
+
+        // Ensure that cache is initialized
+        if (mDiskCacheCapacity == (PRUint32)-1)
+            return NS_ERROR_NOT_AVAILABLE;
+
+    } else if ((aFlags & BYPASS_PERSISTENT_CACHE) ||
+               (!mFileCache && !mFlatCache) || !mDiskCacheCapacity) {
+        cache = mMemCache;
+        spaceManager = mMemSpaceManager;
+    } else {
+        cache = mFlatCache ? mFlatCache : mFileCache;
+        spaceManager = mDiskSpaceManager;
+    }
+
+    // Construct the cache key by appending the secondary key to the URI spec
+    nsCAutoString cacheKey(aUriSpec);
+
+    // Insert NUL at end of URI spec
+    cacheKey += '\0';
+    if (aSecondaryKey)
+        cacheKey.Append(aSecondaryKey, aSecondaryKeyLength);
+
+    nsStringKey key(cacheKey);
+    cachedData = (nsCachedNetData*)mActiveCacheRecords->Get(&key);
+
+    // There is no existing instance of nsCachedNetData for this URL.
+    // Make one from the corresponding record in the cache module.
+    if (cachedData) {
+        NS_ASSERTION(cache == cachedData->mCache,
+                     "Cannot yet handle simultaneously active requests for the "
+                     "same URL using different caches");
+        NS_ADDREF(cachedData);
+    } else {
+        rv = spaceManager->GetCachedNetData(cacheKey.GetBuffer(), cacheKey.Length(),
+                                            cache, &cachedData);
+        if (NS_FAILED(rv)) return rv;
+
+        mActiveCacheRecords->Put(&key, cachedData);
+    }
+    
+    *aResult = cachedData;
+    return NS_OK;
+}
+
+// Remove this cache entry from the list of active ones
+nsresult
+nsCacheManager::NoteDormant(nsCachedNetData* aEntry)
+{
+    nsresult rv;
+    PRUint32 keyLength;
+    char* key;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsCachedNetData* deletedEntry;
+
+    rv = aEntry->GetRecord(getter_AddRefs(record));
+    if (NS_FAILED(rv)) return rv;
+    
+    rv = record->GetKey(&keyLength, &key);
+    if (NS_FAILED(rv)) return rv;
+    
+    nsStringKey hashTableKey(nsCString(key, keyLength));
+    deletedEntry = (nsCachedNetData*)gCacheManager->mActiveCacheRecords->Remove(&hashTableKey);
+//  NS_ASSERTION(deletedEntry == aEntry, "Hash table inconsistency");
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::Contains(const char *aUriSpec, const char *aSecondaryKey,
+                         PRUint32 aSecondaryKeyLength,
+                         PRUint32 aFlags, PRBool *aResult)
+{
+    nsINetDataCache *cache;
+    nsReplacementPolicy *spaceManager;
+    nsCachedNetData *cachedData;
+
+    if (aFlags & CACHE_AS_FILE) {
+        cache = mFileCache;
+        spaceManager = mDiskSpaceManager;
+    } else if ((aFlags & BYPASS_PERSISTENT_CACHE) ||
+               (!mFileCache && !mFlatCache) || !mDiskCacheCapacity) {
+        cache = mMemCache;
+        spaceManager = mMemSpaceManager;
+    } else {
+        cache = mFlatCache ? mFlatCache : mFileCache;
+        spaceManager = mDiskSpaceManager;
+    }
+
+    // Construct the cache key by appending the secondary key to the URI spec
+    nsCAutoString cacheKey(aUriSpec);
+
+    // Insert NUL between URI spec and secondary key
+    cacheKey += '\0';
+    cacheKey.Append(aSecondaryKey, aSecondaryKeyLength);
+
+    // Locate the record using (URI + secondary key)
+    nsStringKey key(cacheKey);
+    cachedData = (nsCachedNetData*)mActiveCacheRecords->Get(&key);
+
+    if (cachedData && (cache == cachedData->mCache)) {
+        *aResult = PR_TRUE;
+        return NS_OK;
+    } else {
+        // No active cache entry, see if there is a dormant one
+        return cache->Contains(cacheKey.GetBuffer(), cacheKey.Length(), aResult);
+    }
+}
+
+NS_IMETHODIMP
+nsCacheManager::GetNumEntries(PRUint32 *aNumEntries)
+{
+    nsresult rv;
+    nsCOMPtr<nsISimpleEnumerator> iterator;
+    nsCOMPtr<nsISupports> cacheSupports;
+    nsCOMPtr<nsINetDataCache> cache;
+
+    PRUint32 totalEntries = 0;
+    
+    rv = NewCacheModuleIterator(getter_AddRefs(iterator));
+    if (NS_FAILED(rv)) return rv;
+    while (1) {
+        PRBool notDone;
+        rv = iterator->HasMoreElements(&notDone);
+        if (NS_FAILED(rv)) return rv;
+        if (!notDone)
+            break;
+        
+        iterator->GetNext(getter_AddRefs(cacheSupports));
+        cache = do_QueryInterface(cacheSupports);
+        
+        PRUint32 numEntries;
+        rv = cache->GetNumEntries(&numEntries);
+        if (NS_FAILED(rv)) return rv;
+        totalEntries += numEntries;
+    }
+    
+    *aNumEntries = totalEntries;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::NewCacheEntryIterator(nsISimpleEnumerator* *aResult)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+class CacheEnumerator : public nsISimpleEnumerator
+{
+public:
+    CacheEnumerator(nsINetDataCache* aFirstCache):mCache(aFirstCache)
+        { NS_INIT_REFCNT(); }
+
+    virtual ~CacheEnumerator() {};
+    
+    NS_DECL_ISUPPORTS
+
+    NS_IMETHODIMP
+    HasMoreElements(PRBool* aMoreElements) {
+        *aMoreElements = (mCache != 0);
+        return NS_OK;
+    }
+
+    NS_IMETHODIMP
+    GetNext(nsISupports* *aSupports) {
+        *aSupports = mCache;
+        if (!mCache)
+            return NS_ERROR_FAILURE;
+        NS_ADDREF(*aSupports);
+
+        nsCOMPtr<nsINetDataCache> nextCache;
+        nsresult rv = mCache->GetNextCache(getter_AddRefs(nextCache));
+        mCache = nextCache;
+        return rv;
+    }
+
+private:
+    nsCOMPtr<nsINetDataCache> mCache;
+};
+
+NS_IMPL_ISUPPORTS(CacheEnumerator, NS_GET_IID(nsISimpleEnumerator))
+
+NS_IMETHODIMP
+nsCacheManager::NewCacheModuleIterator(nsISimpleEnumerator* *aResult)
+{
+    *aResult = new CacheEnumerator(mCacheSearchChain);
+    if (!*aResult)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(*aResult);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::RemoveAll(void)
+{
+    nsresult rv, result;
+    nsCOMPtr<nsISimpleEnumerator> iterator;
+    nsCOMPtr<nsINetDataCache> cache;
+    nsCOMPtr<nsISupports> iSupports;
+
+    result = NS_OK;
+    rv = NewCacheModuleIterator(getter_AddRefs(iterator));
+    if (NS_FAILED(rv)) return rv;
+    while (1) {
+        PRBool notDone;
+        rv = iterator->HasMoreElements(&notDone);
+        if (NS_FAILED(rv)) return rv;
+        if (!notDone)
+            break;
+        
+        iterator->GetNext(getter_AddRefs(iSupports));
+        cache = do_QueryInterface(iSupports);
+
+        PRUint32 cacheFlags;
+        rv = cache->GetFlags(&cacheFlags);
+        if (NS_FAILED(rv)) return rv;
+        
+        if ((cacheFlags & nsINetDataCache::READ_ONLY) == 0) {
+            rv = cache->RemoveAll();
+            if (NS_FAILED(rv))
+                result = rv;
+        }
+    }
+
+    return result;
+}
+
+nsresult
+nsCacheManager::LimitMemCacheSize()
+{
+    nsresult rv;
+    nsReplacementPolicy* spaceManager;
+
+    NS_ASSERTION(gCacheManager, "No cache manager");
+
+    spaceManager = gCacheManager->mMemSpaceManager;
+
+    PRUint32 occupancy;
+    rv = spaceManager->GetStorageInUse(&occupancy);
+    if (NS_FAILED(rv)) return rv;
+
+    PRUint32 memCacheCapacity = gCacheManager->mMemCacheCapacity;
+    if (occupancy > CACHE_HIGH_WATER_MARK(memCacheCapacity))
+        return spaceManager->Evict(CACHE_LOW_WATER_MARK(memCacheCapacity));
+
+    return NS_OK;
+}
+
+nsresult
+nsCacheManager::LimitDiskCacheSize()
+{
+    nsresult rv;
+    nsReplacementPolicy* spaceManager;
+
+    NS_ASSERTION(gCacheManager, "No cache manager");
+
+    spaceManager = gCacheManager->mDiskSpaceManager;
+
+    PRUint32 occupancy;
+    rv = spaceManager->GetStorageInUse(&occupancy);
+    if (NS_FAILED(rv)) return rv;
+
+    PRUint32 diskCacheCapacity = gCacheManager->mDiskCacheCapacity;
+    if (occupancy > CACHE_HIGH_WATER_MARK(diskCacheCapacity))
+        return spaceManager->Evict(CACHE_LOW_WATER_MARK(diskCacheCapacity));
+
+    return NS_OK;
+}
+
+nsresult
+nsCacheManager::LimitCacheSize()
+{
+    nsresult rv;
+
+    rv = LimitDiskCacheSize();
+    if (NS_FAILED(rv)) return rv;
+
+    rv = LimitMemCacheSize();
+    if (NS_FAILED(rv)) return rv;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::SetMemCacheCapacity(PRUint32 aCapacity)
+{
+    mMemCacheCapacity = aCapacity;
+    LimitCacheSize();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::GetMemCacheCapacity(PRUint32* aCapacity)
+{
+    NS_ENSURE_ARG_POINTER(aCapacity);
+    *aCapacity = mMemCacheCapacity;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::SetDiskCacheCapacity(PRUint32 aCapacity)
+{
+    mDiskCacheCapacity = aCapacity;
+    LimitCacheSize();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::GetDiskCacheCapacity(PRUint32* aCapacity)
+{
+    NS_ENSURE_ARG_POINTER(aCapacity);
+    *aCapacity = mDiskCacheCapacity;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsCacheManager::SetDiskCacheFolder(nsIFileSpec* aFolder)
+{
+    NS_ENSURE_ARG(aFolder);
+
+    if (!mFileCache)
+        return NS_ERROR_NOT_AVAILABLE;
+
+    nsCOMPtr<nsINetDataDiskCache> fileCache;
+    fileCache = do_QueryInterface(mFileCache);
+    return fileCache->SetDiskCacheFolder(aFolder);
+}
+
+NS_IMETHODIMP
+nsCacheManager::GetDiskCacheFolder(nsIFileSpec* *aFolder)
+{
+    NS_ENSURE_ARG(aFolder);
+
+    if (!mFileCache)
+        return NS_ERROR_NOT_AVAILABLE;
+
+    nsCOMPtr<nsINetDataDiskCache> fileCache;
+    fileCache = do_QueryInterface(mFileCache);
+    return fileCache->GetDiskCacheFolder(aFolder);
+}

mozilla/netwerk/cache/mgr/nsCacheManager.h

@@ -0,0 +1,100 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#ifndef _nsCacheManager_h_
+#define _nsCacheManager_h_
+
+// 2030f0b0-9567-11d3-90d3-0040056a906e
+#define NS_CACHE_MANAGER_CID                              \
+    {                                                     \
+        0x2030f0b0,                                       \
+        0x9567,                                           \
+        0x11d3,                                           \
+        {0x90, 0xd3, 0x00, 0x40, 0x05, 0x6a, 0x90, 0x6e}  \
+    }
+
+#include "nsINetDataCacheManager.h"
+#include "nsINetDataCache.h"
+#include "nsCOMPtr.h"
+
+class nsHashtable;
+class nsReplacementPolicy;
+class nsCachedNetData;
+
+class nsCacheManager : public nsINetDataCacheManager {
+
+public:
+    nsCacheManager();
+    virtual ~nsCacheManager();
+
+    NS_METHOD Init();
+
+    // nsISupports methods
+    NS_DECL_ISUPPORTS
+
+    // nsINetDataCacheManager methods
+    NS_DECL_NSINETDATACACHEMANAGER
+
+private:
+	
+    // Mapping from cache key to nsCachedNetData, but only for those cache
+    // entries with external references, i.e. those referred to outside the
+    // cache manager
+    nsHashtable*              mActiveCacheRecords;
+
+    // Memory cache
+    nsCOMPtr<nsINetDataCache> mMemCache;
+
+    // Flat-file database cache; All content aggregated into single disk file
+    nsCOMPtr<nsINetDataCache> mFlatCache;
+
+    // stream-as-file cache
+    nsCOMPtr<nsINetDataCache> mFileCache;
+
+    // Unified replacement policy for flat-cache and file-cache
+    nsReplacementPolicy*      mDiskSpaceManager;
+    
+    // Replacement policy for memory cache
+    nsReplacementPolicy*      mMemSpaceManager;
+
+    // List of caches in search order
+    nsINetDataCache*          mCacheSearchChain;
+
+    // Combined file/flat cache capacity, in KB
+    PRUint32                  mDiskCacheCapacity;
+
+    // Memory cache capacity, in KB
+    PRUint32                  mMemCacheCapacity;
+
+protected:
+    static nsresult NoteDormant(nsCachedNetData* aEntry);
+    static nsresult LimitCacheSize();
+    static nsresult LimitMemCacheSize();
+    static nsresult LimitDiskCacheSize();
+
+    friend class nsCachedNetData;
+    friend class CacheOutputStream;
+};
+
+#endif // _nsCacheManager_h_

mozilla/netwerk/cache/mgr/nsCachedNetData.h

@@ -0,0 +1,242 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#ifndef _nsCachedNetData_h_
+#define _nsCachedNetData_h_
+
+#include "nsICachedNetData.h"
+#include "nsCOMPtr.h"
+#include "nsINetDataCacheRecord.h"
+
+class nsINetDataCache;
+class nsIStreamAsFileObserver;
+class nsIStreamAsFile;
+class nsIArena;
+class StreamAsFileObserverClosure;
+class CacheMetaData;
+
+// Number of recent access times recorded
+#define MAX_K  3
+
+/**
+ * FIXME - add comment.  There are a lot of these data structures resident in
+ * memory, so be careful about adding members unnecessarily.
+ */
+class nsCachedNetData : public nsICachedNetData {
+
+public:
+    NS_DECL_ISUPPORTS
+
+    // nsICachedNetData methods
+    NS_DECL_NSICACHEDNETDATA
+
+    NS_METHOD Init(nsINetDataCacheRecord *aRecord, nsINetDataCache *aCache);
+
+protected:
+
+    // Bits for mFlags, below
+    typedef enum {
+        DIRTY               = 1 << 0, // Cache entry data needs to be flushed to database
+
+    // ==== Flags that can be set by the protocol handler ====
+        ALLOW_PARTIAL       = 1 << 1, // Protocol handler supports partial fetching
+        UPDATE_IN_PROGRESS  = 1 << 2, // Protocol handler now modifying cache data
+
+    // ==== Cache-entry state flags.  At most one of these flags can be set ====
+        TRUNCATED_CONTENT   = 1 << 4, // Entry contains valid content, but it has
+                                      //   been truncated by cache manager
+
+        // A previously-used cache entry, which has been purged of all cached
+        // content and protocol-private data.  This cache entry can be refilled
+        // with new content or it may be retained in this vestigial state
+        // because the usage statistics it contains will be used by the
+        // replacement policy if the same URI is ever cached again.
+        VESTIGIAL           = 1 << 5,
+
+    // ==== Memory usage status bits.  At most one of these flags can be set ====
+        RECYCLED            = 1 << 8, // Previously associated database record has
+                                      //   been deleted; This cache entry is available
+                                      //   for recycling.
+
+        DORMANT             = 1 << 9, // No references to this cache entry, except by
+                                      //   the cache manager itself
+        
+    // ==== Setter bits ====
+        LAST_MODIFIED_KNOWN = 1 <<12, // Protocol handler called SetLastModifiedTime()
+        EXPIRATION_KNOWN    = 1 <<13, // Protocol handler called SetExpirationTime()
+        STALE_TIME_KNOWN    = 1 <<14, // Protocol handler called SetStaleTime()
+
+    // ==== Useful flag combinations ====
+        // Cache entry not eligible for eviction
+        UNEVICTABLE         = VESTIGIAL | RECYCLED | UPDATE_IN_PROGRESS,
+        
+        // State flags that are in-memory only, i.e. not persistent 
+        TRANSIENT_FLAGS     = DIRTY | RECYCLED | DORMANT
+    } Flag;
+
+    PRBool GetFlag(Flag aFlag) { return (mFlags & aFlag) != 0; }
+    nsresult GetFlag(PRBool *aResult, Flag aFlag) { *aResult = GetFlag(aFlag); return NS_OK; }
+
+    // Set a boolean flag for the cache entry
+    nsresult SetFlag(PRBool aValue, Flag aFlag);
+    nsresult SetFlag(Flag aFlag)   { return SetFlag(PR_TRUE,  aFlag); }
+    nsresult ClearFlag(Flag aFlag) { return SetFlag(PR_FALSE, aFlag); }
+
+    void ComputeProfit(PRUint32 aCurrentTime);
+    static int Compare(const void *a, const void *b, void *unused);
+
+    void NoteAccess();
+    void NoteUpdate();
+
+    // Get underlying raw cache database record.
+    nsresult GetRecord(nsINetDataCacheRecord* *aRecord);
+
+    nsresult GetRecordID(PRInt32 *aRecordID);
+
+    nsresult Evict(PRUint32 aTruncatedContentLength);
+    
+    nsresult GetFileSpec(nsIFileSpec* *aFileSpec);
+
+    void NoteDownloadTime(PRTime start, PRTime end);
+
+    // placement new for arena-allocation
+    void *operator new (size_t aSize, nsIArena *aArena);
+
+    friend class nsReplacementPolicy;
+    friend class nsCacheManager;
+    friend class StreamAsFile;
+    friend class nsCacheEntryChannel;
+    friend class CacheOutputStream;
+    friend class InterceptStreamListener;
+
+private:
+
+    nsCachedNetData() {};
+    virtual ~nsCachedNetData() {};
+
+    // Initialize internal fields of this nsCachedNetData instance from the
+    // underlying raw cache database record.
+    nsresult Deserialize(PRBool aDeserializeFlags);
+
+    // Notify stream-as-file observers about change in cache entry status
+    nsresult Notify(PRUint32 aMessage, nsresult aError);
+
+    // Add/Remove stream-as-file observers
+    nsresult AddObserver(nsIStreamAsFile *aStreamAsFile, nsIStreamAsFileObserver* aObserver);
+    nsresult RemoveObserver(nsIStreamAsFileObserver* aObserver);
+
+    // Mark cache entry to indicate a write out to the cache database is required
+    void SetDirty() { mFlags |= DIRTY; }
+
+    nsresult Resurrect(nsINetDataCacheRecord *aRecord);
+
+    nsresult CommitFlags();
+
+    CacheMetaData* FindTaggedMetaData(const char* aTag, PRBool aCreate);
+
+private:
+    
+    // List of nsIStreamAsFileObserver's that will receive notification events
+    // when the cache manager or a client desires to delete/truncate a cache
+    // entry file.
+    StreamAsFileObserverClosure* mObservers;
+
+    // Protocol-specific meta-data, opaque to the cache manager
+    CacheMetaData *mMetaData;
+
+    // Next in chain for a single bucket in the replacement policy hash table
+    // that maps from record ID to nsCachedNetData
+    nsCachedNetData* mNext;
+    
+    // See flag bits, above
+    // NOTE: 16 bit member is combined with members below for
+    //       struct packing efficiency.  Do not change order of members!
+    PRUint16    mFlags;
+
+protected:
+
+    // Number of nsCacheEntryChannels referring to this record
+    PRUint8     mChannelCount;
+
+    // Below members are statistics kept per cache-entry, used to decide how
+    // profitable it will be to evict a record from the cache relative to other
+    // existing records.  Note: times are measured in *seconds* since the
+    // 1/1/70 epoch, same as a unix time_t.
+
+    // Number of accesses for this cache record
+    // NOTE: 8 bit member is combined with members above for
+    //       struct packing efficiency.  Do not change order of members!
+    PRUint8     mNumAccesses;
+
+    // A reference to the underlying, raw cache database record, either as a
+    // pointer to an in-memory object or as a database record identifier
+    union {
+        nsINetDataCacheRecord* mRecord;
+
+        // Database record ID of associated cache record.  See
+        // nsINetDataCache::GetRecordByID().
+        PRInt32  mRecordID;
+    };
+
+    // Weak link to parent cache
+    nsINetDataCache* mCache;
+
+    // Length of stored content, which may be less than storage consumed if
+    // compression is used
+    PRUint32 mLogicalLength;
+
+    // Most recent cache entry access times, used to compute access frequency
+    PRUint32 mAccessTime[MAX_K];
+    
+    // We use modification time of the original document for replacement policy
+    // computations, i.e. to compute a document's age, but if we don't know it,
+    // we use the time that the document was last written to the cache.
+    union {
+        // Document modification time, if known.
+        PRUint32 mLastModifiedTime;
+
+        // Time of last cache update for this doc
+        PRUint32 mLastUpdateTime;
+    };
+
+    union {
+      // Time until which document is fresh, i.e. does not have to be validated
+      // with server and, therefore, data in cache is guaranteed usable
+      PRUint32 mExpirationTime;
+
+      // Heuristic time at which cached document is likely to be out-of-date
+      // with respect to canonical copy on server.  Used for cache replacement
+      // policy, not for validation.
+      PRUint32 mStaleTime;
+    };
+
+    // Download time per byte, measure roughly in units of KB/s
+    float mDownloadRate;
+    
+    // Heuristic estimate of cache entry future benefits, based on above values
+    float mProfit;
+};
+
+#endif // _nsCachedNetData_h_
+

mozilla/netwerk/cache/mgr/nsReplacementPolicy.cpp

@@ -0,0 +1,666 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+#include "nsReplacementPolicy.h"
+#include "nsCachedNetData.h"
+
+#include "nsQuickSort.h"
+#include "nsIAllocator.h"
+#include "nsIEnumerator.h"
+#include "prtime.h"
+#include "prbit.h"
+#include "nsCOMPtr.h"
+#include <math.h>
+
+// Constant used to estimate frequency of access to a document based on size
+#define CACHE_CONST_B   1.35
+
+// A cache whose space is managed by this replacement policy
+class nsReplacementPolicy::CacheInfo {
+public:
+    CacheInfo(nsINetDataCache* aCache):mCache(aCache),mNext(0) {}
+
+    nsINetDataCache* mCache;
+    CacheInfo*       mNext;
+};
+
+nsReplacementPolicy::nsReplacementPolicy()
+    : mRankedEntries(0), mCaches(0), mRecordsRemovedSinceLastRanking(0),
+      mNumEntries(0), mCapacityRankedEntriesArray(0), mLastRankTime(0) {}
+
+nsReplacementPolicy::~nsReplacementPolicy()
+{
+    if (mRankedEntries)
+        nsAllocator::Free(mRankedEntries);
+    if (mMapRecordIdToEntry)
+        nsAllocator::Free(mMapRecordIdToEntry);
+}
+
+nsresult
+nsReplacementPolicy::Init(PRUint32 aMaxCacheEntries)
+{
+    nsresult rv;
+
+    rv = NS_NewHeapArena(getter_AddRefs(mArena), sizeof(nsCachedNetData) * 32);
+    if (NS_FAILED(rv)) return rv;
+
+    mMaxEntries = aMaxCacheEntries;
+
+    mHashArrayLength = PR_CeilingLog2(aMaxCacheEntries) >> 3;
+    size_t numBytes = mHashArrayLength * sizeof(*mMapRecordIdToEntry);
+    mMapRecordIdToEntry = (nsCachedNetData**)nsAllocator::Alloc(numBytes);
+    if (!mMapRecordIdToEntry)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    nsCRT::zero(mMapRecordIdToEntry, numBytes);
+
+    return NS_OK;
+}
+
+nsresult
+nsReplacementPolicy::AddCache(nsINetDataCache *aCache)
+{
+    CacheInfo *cacheInfo = new CacheInfo(aCache);
+    if (!cacheInfo)
+        return NS_ERROR_OUT_OF_MEMORY;
+    cacheInfo->mNext = mCaches;
+    mCaches = cacheInfo;
+    return NS_OK;
+}
+
+PRUint32
+nsReplacementPolicy::HashRecordID(PRInt32 aRecordID)
+{
+    return ((aRecordID >> 16) ^ aRecordID) & (mHashArrayLength - 1);
+}
+
+nsCachedNetData*
+nsReplacementPolicy::FindCacheEntryByRecordID(PRInt32 aRecordID, nsINetDataCache *aCache)
+{
+    nsresult rv;
+    nsCachedNetData* cacheEntry;
+    PRUint32 bucket = HashRecordID(aRecordID);
+
+    cacheEntry = mMapRecordIdToEntry[bucket];
+    for (;cacheEntry; cacheEntry = cacheEntry->mNext) {
+
+        PRInt32 recordID;
+        rv = cacheEntry->GetRecordID(&recordID);
+        if (NS_FAILED(rv))
+            continue;
+
+        if ((recordID == aRecordID) && (cacheEntry->mCache == aCache))
+            return cacheEntry;
+    }
+
+    return 0;
+}
+
+// Add a cache entry to the hash table that maps record ID to entries
+void
+nsReplacementPolicy::AddCacheEntry(nsCachedNetData* aCacheEntry, PRInt32 aRecordID)
+{
+    nsCachedNetData** cacheEntryp;
+    PRUint32 bucket = HashRecordID(aRecordID);
+
+    cacheEntryp = &mMapRecordIdToEntry[bucket];
+    while (*cacheEntryp)
+        cacheEntryp = &(*cacheEntryp)->mNext;
+    *cacheEntryp = aCacheEntry;
+    aCacheEntry->mNext = 0;
+}
+
+// Delete a cache entry from the hash table that maps record ID to entries
+nsresult
+nsReplacementPolicy::DeleteCacheEntry(nsCachedNetData* aCacheEntry)
+{
+    nsresult rv;
+    PRInt32 recordID;
+    rv = aCacheEntry->GetRecordID(&recordID);
+    if (NS_FAILED(rv)) return rv;
+
+    PRUint32 bucket = HashRecordID(recordID);
+
+    nsCachedNetData** cacheEntryp;
+    cacheEntryp = &mMapRecordIdToEntry[bucket];
+    while (*cacheEntryp) {
+        if (*cacheEntryp == aCacheEntry) {
+            *cacheEntryp = aCacheEntry->mNext;
+            return NS_OK;
+        }
+        cacheEntryp = &(*cacheEntryp)->mNext;
+    }
+    
+    NS_ASSERTION(0, "hash table inconsistency");
+    return NS_ERROR_FAILURE;
+}
+
+nsresult
+nsReplacementPolicy::AddAllRecordsInCache(nsINetDataCache *aCache)
+{
+    nsresult rv;
+    nsCOMPtr<nsISimpleEnumerator> iterator;
+    nsCOMPtr<nsISupports> iSupports;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    rv = aCache->NewCacheEntryIterator(getter_AddRefs(iterator));
+    if (!NS_SUCCEEDED(rv)) return rv;
+
+    while (1) {
+        PRBool notDone;
+
+        rv = iterator->HasMoreElements(&notDone);
+        if (NS_FAILED(rv)) return rv;
+        if (!notDone)
+            break;
+
+        rv = iterator->GetNext(getter_AddRefs(iSupports));
+        if (!NS_SUCCEEDED(rv)) return rv;
+        record = do_QueryInterface(iSupports);
+        
+        rv = AssociateCacheEntryWithRecord(record, aCache, 0);
+        if (!NS_SUCCEEDED(rv)) return rv;
+    }
+
+    return NS_OK;
+}
+
+// Get current time and convert to seconds since the epoch
+static PRUint32
+now32()
+{
+    double nowFP;
+    PRInt64 now64 = PR_Now();
+    LL_L2D(nowFP, now64);
+    PRUint32 now = (PRUint32)(nowFP * 1e-6);
+    return now;
+}
+
+void
+nsCachedNetData::NoteDownloadTime(PRTime start, PRTime end)
+{
+    double startFP, endFP, rate, duration;
+
+    LL_L2D(startFP, start);
+    LL_L2D(endFP, end);
+
+    duration = endFP - startFP;
+
+    // If the data arrives so fast that it can not be timed due to the clock
+    // granularity, assume a data arrival duration of 10 ms
+    if (!duration)
+        duration = 10000;
+
+    // Compute download rate in kB/s
+    rate = mLogicalLength / (duration * (1e-6 * 1024.0));
+    
+    if (mDownloadRate) {
+        // Exponentially smooth download rate
+        const double alpha = 0.5;
+        mDownloadRate = (float)(mDownloadRate * alpha + rate * (1.0 - alpha));
+    } else {
+        mDownloadRate = (float)rate;
+    }
+}
+
+// 1 hour
+#define MIN_HALFLIFE (60 * 60)
+
+// 1 week
+#define TYPICAL_HALFLIFE (7 * 24 * 60 * 60)
+
+/**
+ * Estimate the profit that would be lost if the given cache entry was evicted
+ * from the cache.  Profit is defined as the future expected download delay per
+ * byte of cached content.  The profit computation is made based on projected
+ * frequency of access, prior download performance and a heuristic staleness
+ * criteria.  The technique used is a variation of that described in the
+ * following paper:
+ *
+ *    "A Case for Delay-Conscious Caching of Web Documents"
+ *    http://www.bell-labs.com/user/rvingral/www97.html
+ *
+ * Briefly, expected profit is:
+ *
+ *   (projected frequency of access) * (download time per byte) * (probability freshness)
+ */
+void
+nsCachedNetData::ComputeProfit(PRUint32 aNow)
+{
+    PRUint32 K, now;
+
+    if (aNow)
+        now = aNow;
+    else
+        now = now32();
+    
+    K = PR_MIN(MAX_K, mNumAccesses);
+    if (!K) {
+        mProfit = 0;
+        return;
+    }
+
+    // Compute time, in seconds, since k'th most recent access
+    double timeSinceKthAccess = now - mAccessTime[K - 1];
+    if (timeSinceKthAccess <= 0.0)    // Sanity check
+        timeSinceKthAccess = 1.0;
+
+    // Estimate frequency of future document access based on past
+    //  access frequency
+    double frequencyAccess = K / timeSinceKthAccess;
+
+    // If we don't have much historical data on access frequency
+    //   use a heuristic based on document size as an estimate
+    if (mLogicalLength) {
+        if (K == 1) {
+            frequencyAccess /= pow(mLogicalLength, CACHE_CONST_B);
+        } else if (K == 2) {
+            frequencyAccess /= pow(mLogicalLength, CACHE_CONST_B / 2);
+        }
+    }
+
+    // Estimate likelihood that data in cache is fresh, i.e.
+    //  that it corresponds to the document on the server
+    double probabilityFreshness;
+    PRInt32 halfLife, age, docTime;
+    PRBool potentiallyStale;
+
+    docTime = GetFlag(LAST_MODIFIED_KNOWN) ? mLastModifiedTime : mLastUpdateTime;
+    age = now - docTime;
+
+    probabilityFreshness = 1.0; // Optimistic
+
+    if (GetFlag(EXPIRATION_KNOWN)) {
+        potentiallyStale = now > mExpirationTime;
+        halfLife = mExpirationTime - mLastModifiedTime;
+    } else if (GetFlag(STALE_TIME_KNOWN)) {
+        potentiallyStale = PR_TRUE;
+        halfLife = mStaleTime - docTime;
+    } else {
+        potentiallyStale = PR_TRUE;
+        halfLife = TYPICAL_HALFLIFE;
+    }
+    
+    if (potentiallyStale) {
+        if (halfLife < MIN_HALFLIFE)
+            halfLife = MIN_HALFLIFE;
+
+        probabilityFreshness = pow(0.5, (double)age / (double)halfLife);
+    }
+
+    mProfit = (float)(frequencyAccess * probabilityFreshness);
+    if (mDownloadRate)
+        mProfit /= mDownloadRate;
+}
+
+// Number of entries to grow mRankedEntries array when it's full
+#define STATS_GROWTH_INCREMENT  256
+
+
+// Sorting predicate for NS_Quicksort
+int
+nsCachedNetData::Compare(const void *a, const void *b, void *unused)
+{
+    nsCachedNetData* entryA = *(nsCachedNetData**)a;
+    nsCachedNetData* entryB = *(nsCachedNetData**)b;
+
+    // Percolate deleted or empty entries to the end of the mRankedEntries
+    // array, so that they can be recycled.
+    if (!entryA || entryA->GetFlag(RECYCLED)) {
+        if (!entryB || entryB->GetFlag(RECYCLED))
+            return 0;
+        else 
+            return +1;
+    } 
+    if (!entryB || entryB->GetFlag(RECYCLED))
+        return -1;
+
+    // Evicted entries (those with no content data) and active entries (those
+    // currently being updated) are collected towards the end of the sorted
+    // array just prior to the deleted cache entries, since evicted entries
+    // can't be re-evicted.
+    if (entryA->GetFlag(UPDATE_IN_PROGRESS)) {
+        if (entryB->GetFlag(UPDATE_IN_PROGRESS))
+            return 0;
+        else 
+            return +1;
+    } 
+    if (entryB->GetFlag(UPDATE_IN_PROGRESS))
+        return -1;
+
+    PRUint16 Ka = PR_MIN(MAX_K, entryA->mNumAccesses);
+    PRUint16 Kb = PR_MIN(MAX_K, entryB->mNumAccesses);
+
+    // Order cache entries by the number of times they've been accessed
+    if (Ka < Kb)
+        return -1;
+    if (Ka > Kb)
+        return +1;
+
+    /*
+     * Among records that have been accessed an equal number of times, order
+     * them by profit.
+     */
+    if (entryA->mProfit > entryB->mProfit)
+        return +1;
+    if (entryA->mProfit < entryB->mProfit)
+        return -1;
+    return 0;
+}
+
+/**
+ * Rank cache entries in terms of their elegibility for eviction.
+ */
+nsresult
+nsReplacementPolicy::RankRecords()
+{
+    PRUint32 i, now;
+
+    // Add all cache records if this is the first ranking
+    if (!mLastRankTime) {
+        nsresult rv;
+        CacheInfo *cacheInfo;
+
+        cacheInfo = mCaches;
+        while (cacheInfo) {
+            rv = AddAllRecordsInCache(cacheInfo->mCache);
+            if (NS_FAILED(rv)) return rv;
+
+            cacheInfo = cacheInfo->mNext;
+        }
+    }
+
+    // Get current time and convert to seconds since the epoch
+    now = now32();
+
+    // Recompute profit for every known cache record, except deleted ones
+    for (i = 0; i < mNumEntries; i++) {
+        nsCachedNetData* entry = mRankedEntries[i];
+        if (entry && !entry->GetFlag(nsCachedNetData::RECYCLED))
+            entry->ComputeProfit(now);
+    }
+    NS_QuickSort(mRankedEntries, mNumEntries, sizeof *mRankedEntries, 
+                 nsCachedNetData::Compare, 0);
+
+    mNumEntries -= mRecordsRemovedSinceLastRanking;
+    mRecordsRemovedSinceLastRanking = 0;
+    mLastRankTime = now;
+    return NS_OK;
+}
+
+// A heuristic policy to avoid the cost of re-ranking cache records by
+// profitability every single time space must be made available in the cache.
+void
+nsReplacementPolicy::MaybeRerankRecords()
+{
+    // Rank at most once per minute
+    PRUint32 now = now32();
+    if ((now - mLastRankTime) >= 60)
+        RankRecords();
+}
+
+void
+nsReplacementPolicy::CompactRankedEntriesArray()
+{
+    if (mRecordsRemovedSinceLastRanking || !mLastRankTime)
+        RankRecords();
+}
+
+nsresult
+nsReplacementPolicy::CheckForTooManyCacheEntries()
+{
+    if (mCapacityRankedEntriesArray == mMaxEntries) {
+        return DeleteOneEntry(0);
+    } else {
+        nsresult rv;
+        CacheInfo *cacheInfo;
+
+        cacheInfo = mCaches;
+        while (cacheInfo) {
+            PRUint32 numEntries, maxEntries;
+
+            rv = cacheInfo->mCache->GetNumEntries(&numEntries);
+            if (NS_FAILED(rv)) return rv;
+
+            rv = cacheInfo->mCache->GetMaxEntries(&maxEntries);
+            if (NS_FAILED(rv)) return rv;
+
+            if (numEntries == maxEntries)
+                return DeleteOneEntry(cacheInfo->mCache);
+
+            cacheInfo = cacheInfo->mNext;
+        }
+    }
+    return NS_OK;
+}
+
+
+/** 
+ * Create a new association between a low-level cache database record and a
+ * cache entry.  Add the entry to the set of entries eligible for eviction from
+ * the cache.  This would typically be done when the cache entry is created.
+ */
+nsresult
+nsReplacementPolicy::AssociateCacheEntryWithRecord(nsINetDataCacheRecord *aRecord,
+                                                   nsINetDataCache* aCache,
+                                                   nsCachedNetData** aResult)
+{
+    nsCachedNetData* cacheEntry;
+    nsresult rv;
+
+    // First, see if the record is already known to the replacement policy
+    PRInt32 recordID;
+    rv = aRecord->GetRecordID(&recordID);
+    if (NS_FAILED(rv)) return rv;
+    cacheEntry = FindCacheEntryByRecordID(recordID, aCache);
+    if (cacheEntry) {
+        if (aResult) {
+            if (cacheEntry->GetFlag(nsCachedNetData::DORMANT))
+                cacheEntry->Resurrect(aRecord);
+            NS_ADDREF(cacheEntry);
+            *aResult = cacheEntry;
+        }
+        return NS_OK;
+    }
+
+    // Compact the array of cache entry statistics, so that free entries appear
+    // at the end, for possible reuse.
+    if (mNumEntries && (mNumEntries == mCapacityRankedEntriesArray))
+        CompactRankedEntriesArray();
+
+    // If compaction doesn't yield available entries in the
+    // mRankedEntries array, then extend the array.
+    if (mNumEntries == mCapacityRankedEntriesArray) {
+        PRUint32 newCapacity;
+
+        rv = CheckForTooManyCacheEntries();
+        if (NS_FAILED(rv)) return rv;
+
+        newCapacity = mCapacityRankedEntriesArray + STATS_GROWTH_INCREMENT;
+        if (newCapacity > mMaxEntries)
+            newCapacity = mMaxEntries;
+
+        nsCachedNetData** newRankedEntriesArray; 
+        PRUint32 numBytes = sizeof(nsCachedNetData*) * newCapacity;
+        newRankedEntriesArray = 
+            (nsCachedNetData**)nsAllocator::Realloc(mRankedEntries, numBytes);
+        if (!newRankedEntriesArray)
+            return NS_ERROR_OUT_OF_MEMORY;
+        
+        mRankedEntries = newRankedEntriesArray;
+        mCapacityRankedEntriesArray = newCapacity;
+
+        PRUint32 i;
+        for (i = mNumEntries; i < newCapacity; i++)
+            mRankedEntries[i] = 0;
+    }
+
+    // Recycle the record after the last in-use record in the array
+    nsCachedNetData *entry = mRankedEntries[mNumEntries];
+    NS_ASSERTION(!entry || !entry->GetFlag(nsCachedNetData::RECYCLED),
+                 "Only deleted cache entries should appear at end of array");
+
+    if (!entry) {
+        entry = new(mArena) nsCachedNetData;
+        if (!entry)
+            return NS_ERROR_OUT_OF_MEMORY;
+        mRankedEntries[mNumEntries] = entry;
+    } else {
+        // Clear out recycled data structure
+        nsCRT::zero(entry, sizeof(*entry));
+    }
+
+    entry->Init(aRecord, aCache);
+    AddCacheEntry(entry, recordID);
+    
+    // Add one reference to the cache entry from the cache manager
+    NS_ADDREF(entry);
+
+    if (aResult) {
+        // And one reference from our caller
+        NS_ADDREF(entry);
+        *aResult = entry;
+    }
+
+    mNumEntries++;
+    return NS_OK;
+}
+
+nsresult
+nsReplacementPolicy::GetCachedNetData(const char* cacheKey, PRUint32 cacheKeyLength,
+                                      nsINetDataCache* aCache,
+                                      nsCachedNetData** aResult)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+
+    rv = aCache->GetCachedNetData(cacheKey, cacheKeyLength,
+                                  getter_AddRefs(record));
+    if (NS_FAILED(rv)) return rv;
+    return AssociateCacheEntryWithRecord(record, aCache, aResult);
+}
+
+/**
+ * Delete the least desirable record from the cache database.  This is used
+ * when the addition of another record would exceed either the cache manager or
+ * the cache's maximum permitted number of records.
+ */
+nsresult
+nsReplacementPolicy::DeleteOneEntry(nsINetDataCache *aCache)
+{
+    PRUint32 i;
+    nsresult rv;
+    nsCachedNetData *entry;
+
+    i = 0;
+    while (1) {
+        MaybeRerankRecords();
+        for (; i < mNumEntries; i++) {
+            entry = mRankedEntries[i];
+            if (!entry || entry->GetFlag(nsCachedNetData::RECYCLED))
+                continue;
+            if (!aCache || (entry->mCache == aCache))
+                break;
+        }
+
+        // Report error if no record found to delete
+        if (i == mNumEntries)
+            return NS_ERROR_FAILURE;
+        rv = entry->Delete();
+        if (NS_SUCCEEDED(rv)) {
+            rv = DeleteCacheEntry(entry);
+            return rv;
+        }
+    }
+}
+
+nsresult
+nsReplacementPolicy::GetStorageInUse(PRUint32* aStorageInUse)
+{
+    nsresult rv;
+    CacheInfo *cacheInfo;
+
+    *aStorageInUse = 0;
+    cacheInfo = mCaches;
+    while (cacheInfo) {
+        PRUint32 cacheStorage;
+        rv = cacheInfo->mCache->GetStorageInUse(&cacheStorage);
+        if (NS_FAILED(rv)) return rv;
+
+        *aStorageInUse += cacheStorage;
+        cacheInfo = cacheInfo->mNext;
+    }
+    return NS_OK;
+}
+
+/**
+ * Delete the least desirable records from the cache until the occupancy of the
+ * cache has been reduced by the given number of KB.  This is used when the
+ * addition of more cache data would exceed the cache's capacity. 
+ */
+nsresult
+nsReplacementPolicy::Evict(PRUint32 aTargetOccupancy)
+{
+    PRUint32 i;
+    nsCachedNetData *entry;
+    nsresult rv;
+    PRUint32 occupancy;
+    PRInt32 truncatedLength;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+
+    MaybeRerankRecords();
+    for (i = 0; i < mNumEntries; i++) {
+        rv = GetStorageInUse(&occupancy);
+        if (!NS_SUCCEEDED(rv)) return rv;
+        
+        if (occupancy <= aTargetOccupancy)
+            return NS_OK;
+
+        entry = mRankedEntries[i];
+
+        // Skip deleted/empty cache entries and ones that have already been evicted
+        if (!entry || entry->GetFlag(nsCachedNetData::UNEVICTABLE))
+            continue;
+
+        if (entry->GetFlag(nsCachedNetData::ALLOW_PARTIAL)) {
+            rv = entry->GetRecord(getter_AddRefs(record));
+            if (NS_FAILED(rv))
+                continue;
+
+            PRUint32 contentLength;
+            rv = record->GetStoredContentLength(&contentLength);
+            if (NS_FAILED(rv))
+                continue;
+            
+            // Additional cache storage required, in KB
+            PRUint32 storageToReclaim = (occupancy - aTargetOccupancy) << 10;
+            
+            truncatedLength = (PRInt32)(contentLength - storageToReclaim);
+            if (truncatedLength < 0)
+                truncatedLength = 0;
+        } else {
+            truncatedLength = 0;
+        }
+        rv = entry->Evict(truncatedLength);
+    }
+    return NS_ERROR_FAILURE;
+}

mozilla/netwerk/cache/mgr/nsReplacementPolicy.h

@@ -0,0 +1,136 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+
+/**
+ * This class manages one or more caches that share a storage resource, e.g. a
+ * file cache and a flat-database cache might each occupy space on the disk and
+ * they would share a single instance of nsReplacementPolicy.  The replacement
+ * policy heuristically chooses which cache entries to evict when storage is
+ * required to accommodate incoming cache data.
+ */
+
+#ifndef _nsReplacementPolicy_h_
+#define _nsReplacementPolicy_h_
+
+#include "nscore.h"
+#include "nsISupportsUtils.h"
+#include "nsINetDataCache.h"
+#include "nsICachedNetData.h"
+#include "nsIArena.h"
+#include "nsCOMPtr.h"
+#include "nsHashtable.h"
+
+class nsCachedNetData;
+struct PL_HashTable;
+
+/**
+ * This private class is responsible for implementing the network data cache's
+ * replacement policy, i.e. it decides which cache data should be evicted to
+ * make room for new incoming data.
+ */
+class nsReplacementPolicy {
+
+public:
+
+    nsReplacementPolicy();
+    ~nsReplacementPolicy();
+
+protected:
+
+    nsresult Init(PRUint32 aMaxCacheEntries);
+    nsresult AddCache(nsINetDataCache *aCache);
+    nsresult GetCachedNetData(const char* cacheKey, PRUint32 cacheKeyLength,
+                              nsINetDataCache* aCache,
+                              nsCachedNetData** aResult);
+    nsresult GetStorageInUse(PRUint32* aNumKBytes);
+
+    friend class nsCacheManager;
+
+private:
+    nsresult RankRecords();
+    void MaybeRerankRecords();
+    void CompactRankedEntriesArray();
+    nsresult DeleteOneEntry(nsINetDataCache* aCache);
+    nsresult Evict(PRUint32 aTargetOccupancy);
+
+    nsCachedNetData* FindCacheEntryByRecordID(PRInt32 aRecordID, nsINetDataCache *aCache);
+    void AddCacheEntry(nsCachedNetData* aCacheEntry, PRInt32 aRecordID);
+    nsresult DeleteCacheEntry(nsCachedNetData* aCacheEntry);
+    PRUint32 HashRecordID(PRInt32 aRecordID);
+    nsresult AssociateCacheEntryWithRecord(nsINetDataCacheRecord *aRecord,
+                                           nsINetDataCache* aCache,
+                                           nsCachedNetData** aResult);
+
+    nsresult AddAllRecordsInCache(nsINetDataCache *aCache);
+    nsresult CheckForTooManyCacheEntries();
+
+    class CacheInfo;
+
+private:
+
+    // Growable array of pointers to individual cache entries; It is sorted by
+    // profitability, such that low-numbered array indices refer to cache
+    // entries that are the least profitable to retain.  New cache entries are
+    // added to the end of the array.  Deleted cache entries are specially
+    // marked and percolate to the end of the array for recycling whenever
+    // mRankedEntries is sorted.  Evicted cache entries (those with no
+    // associated content data) are retained for the purpose of improving the
+    // replacement policy efficacy, and are percolated towards the end of the
+    // array, just prior to the deleted cache entries.
+    //
+    // The array is not in sorted order 100% of the time; For efficiency
+    // reasons, sorting is only done when heuristically deemed necessary.
+    nsCachedNetData**   mRankedEntries;
+
+    // Hash table buckets to map Record ID to cache entry.  We use this instead
+    // of a PL_HashTable to reduce storage requirements
+    nsCachedNetData**   mMapRecordIdToEntry;
+
+    // Length of mMapRecordIdToEntry array
+    PRUint32            mHashArrayLength;
+
+    // Linked list of caches that share this replacement policy
+    CacheInfo*          mCaches;
+
+    // Allocation area for cache entry (nsCachedNetData) instances
+    nsCOMPtr<nsIArena>  mArena;
+
+    // Bookkeeping
+    PRUint32            mRecordsRemovedSinceLastRanking;
+
+    // Maximum permitted length of mRankedEntries array
+    PRUint32            mMaxEntries;
+
+    // Number of occupied slots in mRankedEntries array
+    PRUint32            mNumEntries;
+
+    // Capacity of mRankedEntries array
+    PRUint32            mCapacityRankedEntriesArray;
+
+    // Time at which cache entries were last ranked by profitability
+    PRUint32            mLastRankTime;
+};
+
+
+#endif // _nsReplacementPolicy_h_

mozilla/netwerk/cache/public/Makefile.in

@@ -0,0 +1,43 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+MODULE		= nkcache
+
+include $(DEPTH)/config/autoconf.mk
+
+XPIDLSRCS	= \
+		nsICachedNetData.idl          \
+	        nsINetDataCacheManager.idl    \
+		nsINetDataCache.idl           \
+		nsINetDataCacheRecord.idl     \
+	        nsINetDataDiskCache.idl       \
+		nsIStreamAsFile.idl           \
+	        $(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/netwerk/cache/public/Makefile.win

@@ -0,0 +1,41 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+MODULE = nkcache
+
+DEPTH = ..\..\..
+include <$(DEPTH)/config/config.mak>
+
+
+EXPORTS =                   \
+        $(NULL)
+
+XPIDLSRCS =                             \
+        .\nsICachedNetData.idl          \
+        .\nsINetDataCacheManager.idl    \
+        .\nsINetDataCache.idl           \
+        .\nsINetDataCacheRecord.idl     \
+        .\nsINetDataDiskCache.idl       \
+        .\nsIStreamAsFile.idl           \
+        $(NULL)
+
+include <$(DEPTH)/config/rules.mak>
+

mozilla/netwerk/cache/public/nsICachedNetData.idl

@@ -0,0 +1,229 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsrootidl.idl"
+#include "nsISupports.idl"
+
+interface nsIFileSpec;
+interface nsIURI;
+interface nsIObserver;
+interface nsIChannel;
+interface nsINetDataCache;
+interface nsINetDataCacheRecord;
+interface nsILoadGroup;
+interface nsIStreamListener;
+
+/**
+ * The nsICachedNetData interface represents a single entry in a database that
+ * caches data retrieved from the network. This interface is implemented by the
+ * cache manager on top of the low-level nsINetDataCacheRecord and
+ * nsINetDataCache interfaces that are implemented by the database.
+ *
+ * Each cache record may contain both content and metadata.  The content may
+ * be, for example, GIF image data or HTML, and it is accessed through
+ * nsIChannel's streaming API.  The opaque metadata, which may contain HTTP
+ * headers among other things, is stored as a byte array.  Each entry in the
+ * cache is indexed by two different keys: a record id number and a key created
+ * by combining the URI with a "secondary key", e.g. HTTP post data.
+ *
+ * @See nsINetDataCacheRecord
+ * @See nsINetDataCache
+ * @See nsINetDataDiskCache
+ * @See nsINetDataCacheManager
+ */
+[scriptable, uuid(6aeb2a40-6d43-11d3-90c8-000064657374)]
+interface nsICachedNetData : nsISupports
+{
+    /**
+     * String form of the URI provided as an argument to the call to
+     * nsINetDataCacheManager::GetCachedNetData() that created this record.
+     */
+    readonly attribute string uriSpec;
+    
+    /**
+     * Getter for the opaque secondary database key provided as an argument to
+     * the call to nsINetDataCacheManager::GetCachedNetData() that created this
+     * record.
+     */
+    void getSecondaryKey(out unsigned long length,
+                         [retval, size_is(length)] out string secondaryKey);
+
+    /**
+     * This flag may be set by a protocol handler to indicate that it supports
+     * partial fetching of data.  In that case, the cache manager is permitted
+     * to truncate the entry's content to accommodate incoming data for other
+     * cache entries rather than deleting it wholesale.
+     */
+    attribute boolean allowPartial;
+    
+    /**
+     * This flag indicates that the write stream supplying content data for the
+     * cache did not complete normally and, therefore, the content may be
+     * truncated.
+     */
+    readonly attribute boolean partialFlag;
+
+    /**
+     * This flag can be set and cleared by a protocol handler as a form of
+     * self-notification, so as to avoid race conditions in which a protocol
+     * handler issues two identical network requests to fill the same cache
+     * entry.  The cache manager itself largely ignores this flag.
+     */
+    attribute boolean updateInProgress;
+
+    /**
+     * inUse is set if any existing channels are associated with this cache
+     * entry or if the updateInProgess flag is set.  This can be used to
+     * prevent writing to a cache entry by a protocol handler if it's being
+     * read or written elsewhere.
+     */
+    readonly attribute boolean inUse;
+
+    /**
+     * Date/time that the document was last stored on the origin server, as
+     * supplied by the protocol handler.  This value is used as input to the
+     * cache replacement policy, i.e. it is not used for validation.  If the
+     * protocol can't supply a last-modified time, this attribute should remain
+     * unset.  When unset, the value of this attribute is zero.
+     *
+     * FIXME: Should use nsIDateTime interface, once it's created
+     * instead of PRTime, for improved scriptability ? 
+     */
+    attribute PRTime lastModifiedTime;
+
+    /**
+     * Supplied by the protocol handler, the expirationTime attribute specifies
+     * the time until which the document is guaranteed fresh, i.e. the document
+     * does not have to be validated with the server and, therefore, any data
+     * in cache is definitely usable.  The value of this attribute serves as a
+     * hint to the cache replacement policy.  Only one of either staleTime or
+     * expirationTime may be set for a single cache record.  When unset, the
+     * value of this attribute is zero. 
+     */
+    attribute PRTime expirationTime;
+
+    /**
+     * Date/time supplied by the protocol handler, at which point the content
+     * is *likely* to be stale, i.e. the data in the cache may be out-of-date
+     * with respect to the data on the server.  This heuristic date does not
+     * necessarily correspond to the HTTP Expires header, as it does not
+     * determine when cached network data must be validated with the origin
+     * server, but only serves as a hint to the cache replacement policy.  Only
+     * one of either staleTime or expirationTime may be set for a single cache
+     * record.  When unset, the value of this attribute is zero.
+     */
+    attribute PRTime staleTime;
+
+    /**
+     * Date/time of last access of the data in this cache record, as determined
+     * by the cache manager.
+     */
+    readonly attribute PRTime lastAccessTime;
+
+    /**
+     * Number of times this record has been accessed since it was first stored.
+     */
+    readonly attribute PRUint16 numberAccesses;
+
+    /**
+     * Accessor methods for opaque meta-data which can be read and updated
+     * independently of the content data.
+     *
+     * The aTag argument can be used to accommodate multiple clients of the
+     * cache API, each of which wants to store its own private meta-data into
+     * the cache.  For example, there could be a "headers" tag that the HTTP
+     * protocol handler uses to store http response headers and a "image size"
+     * tag used to store the image dimensions of a GIF file.  The aData
+     * argument refers to an opaque blob of arbitrary bytes.
+     *
+     * IMPORTANT: If aData does not contain byte-oriented data, i.e. it's not a
+     *            string, the contents of aData must be byte-swapped by the,
+     *            caller, so as to make the cache files endian-independent.
+     */
+    void getAnnotation(in string aTag, 
+                       out PRUint32 aLength, [size_is(aLength), retval] out string aData);
+    void setAnnotation(in string aTag,
+                       in  PRUint32 aLength, [size_is(aLength)] in string aData);
+
+    /**
+     * As a getter, return the number of content bytes stored in the cache,
+     * i.e. via the nsIChannel streaming APIs.  This may be less than the
+     * complete content length if a partial cache fill occurred.  The cached
+     * content can be truncated by setting the value of this attribute.  The
+     * value of the attribute represents a logical, not a physical, length.  If
+     * compression has been used, the content may consume less storage than
+     * indicated by this attribute.
+     *
+     * When this attribute is set to zero the associated cache disk file, if
+     * any, should be deleted.
+     */
+    attribute PRUint32 storedContentLength;
+
+    /** 
+     * Notify any observers associated with this cache entry of the deletion
+     * request.  If all observers drop their reference to the cache entry,
+     * proceed to delete the underlying cache database record and associated
+     * content storage.
+     */
+    void delete();
+
+    /**
+     * Flush any changes in this entry's data to the cache database.  This
+     * method will automatically be called when the last reference to the cache
+     * is dropped, but it can also be called explicitly for a synchronous
+     * effect.
+     */
+    void commit();
+
+    /**
+     * Parent container cache for this entry.
+     */
+    readonly attribute nsINetDataCache cache;
+
+    /**
+     * Create a channel for reading or writing a stream of content into the
+     * entry.  It is expected that many of the nsIChannel methods return
+     * NS_NOT_IMPLEMENTED, including:
+     *
+     *    + GetURI()
+     *    + GetContentType()
+     *    + GetContentLength()
+     *
+     * Though nsIChannel provides for both async and synchronous I/O APIs, both
+     * may not be implemented.  Only AsyncRead() and OpenOutputStream() is
+     * required.  The aProxyChannel argument allows another channel to be
+     * specified as the proffered argument to nsIStreamListener methods rather
+     * than the cache's own channel.
+     */
+    nsIChannel newChannel(in nsILoadGroup aLoadGroup,
+                          in nsIChannel aProxyChannel);
+
+    /**
+     * This method can be used by a caching protocol handler to store data in
+     * the cache by forking an asynchronous read stream so that it is
+     * simultaneously sent to a requester and written into the cache.  This
+     * method implicitly sets the updateInProgress flag, if it has not already
+     * been set.
+     */
+    nsIStreamListener interceptAsyncRead(in nsIStreamListener aOriginalListener,
+                                         in PRUint32 aStartOffset);
+};

mozilla/netwerk/cache/public/nsINetDataCache.idl

@@ -0,0 +1,143 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+
+interface nsIURI;
+interface nsINetDataCacheRecord;
+interface nsISimpleEnumerator;
+interface nsIFileSpec;
+
+/**
+ * The nsINetDataCache defines the low-level API for a network-data
+ * cache, used to cache the responses to network retrieval commands.
+ * This interface, along with nsINetDataCacheRecord, is implemented by
+ * the memory cache, the file cache and, optionally, by some extension
+ * caches.  This interface is essentially a pseudo-private API for the
+ * cache manager.  Other clients should never use this interface.
+ *
+ * Each cache entry may contain both content, e.g. GIF image data, and
+ * associated metadata, e.g. HTTP headers.  Each entry is indexed by two
+ * different keys: a record id number and a key created by combining the URI
+ * with a "secondary key", e.g. HTTP post data.
+ *
+ * The nsINetDataCache interface is agnostic as to where the data is
+ * stored and whether the storage is volatile or persistent.  The
+ * memory cache, any disk caches and any extension caches must all
+ * implement this interface.
+ *
+ */
+[scriptable, uuid(ccfc58c0-6dde-11d3-90c8-000064657374)]
+interface nsINetDataCache : nsISupports
+{
+	/**
+	 * Human-readable description of the cache module, e.g. "Disk Cache"
+	 */
+	readonly attribute wstring description;
+  
+    /**
+     * Returns true if cached data is available for the given opaque key,
+     * even if only partial data is stored.
+     */
+    boolean contains([size_is(length)] in string key, in PRUint32 length);
+
+    /**
+     * Fetch the cache entry record for the given opaque key.  If one does not
+     * exist, create a new, empty record.
+     */
+    nsINetDataCacheRecord getCachedNetData([size_is(length)] in string key,
+                                           in PRUint32 length);
+
+    /**
+     * Fetch the cache entry record for the given URI using the record ID as a key.
+     */
+    nsINetDataCacheRecord getCachedNetDataByID(in PRInt32 RecordID);
+
+	/**
+	 * False indicates that this cache is entirely bypassed.
+	 */
+    attribute boolean enabled;
+
+    /**
+     * Constants for flags attribute, below
+     */
+
+    // Used for extension caches, e.g. a CD-ROM cache
+    const long READ_ONLY          = 1 << 0;
+
+    // One of these bits must be set
+    const long MEMORY_CACHE       = 1 << 1;
+    const long FLAT_FILE_CACHE    = 1 << 2;
+    const long FILE_PER_URL_CACHE = 1 << 3;
+
+	/**
+	 * See constants defined above.
+	 */
+	readonly attribute PRUint32 flags;
+
+    /**
+     * Total number of URI entries stored in the cache.
+     */
+    readonly attribute PRUint32 numEntries;
+
+    /**
+     * Maximum number of URI entries that may be stored in the cache.
+     */
+    readonly attribute PRUint32 maxEntries;
+
+    /**
+     * Enumerate the URI entries stored in the cache.
+     */
+    nsISimpleEnumerator newCacheEntryIterator();
+
+	/**
+	 * Contains a reference to the next cache in search order.  For the memory
+	 * cache, this attribute always references the disk cache.  For the disk
+	 * cache, it contains a reference to the first extension cache.
+	 */
+    attribute nsINetDataCache nextCache;
+
+    /**
+     * An estimate of the amount of storage occupied by the cache, in kB.
+     * Actual use may be slightly higher than reported due to cache overhead
+     * and heap fragmentation (in the memory cache) or block quantization (in
+     * the disk cache).
+	 */
+    readonly attribute PRUint32 storageInUse;
+
+    /**
+     * Remove all entries from a writable cache.  This could be used, for
+     * example, after a guest ends a browser session.  This is equivalent to
+     * setting the cache's Capacity to zero, except that all cache entries,
+     * even those in active use, will be deleted.  Also, any global cache
+     * database files will be deleted.
+	 */
+    void removeAll();
+};
+
+%{ C++
+// ProgID prefix for Components that implement this interface
+#define NS_NETWORK_CACHE_PROGID "component://netscape/network/cache"
+#define NS_NETWORK_MEMORY_CACHE_PROGID NS_NETWORK_CACHE_PROGID "?name=memory-cache"
+#define NS_NETWORK_FLAT_CACHE_PROGID   NS_NETWORK_CACHE_PROGID "?name=flat-cache"
+#define NS_NETWORK_FILE_CACHE_PROGID   NS_NETWORK_CACHE_PROGID "?name=file-cache"
+%}

mozilla/netwerk/cache/public/nsINetDataCacheManager.idl

@@ -0,0 +1,163 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+
+interface nsISimpleEnumerator;
+interface nsICachedNetData;
+interface nsINetDataCache;
+interface nsINetDataDiskCache;
+interface nsIURI;
+interface nsIFileSpec;
+
+/**
+ * The network-response cache manager is partly responsible for the caching of
+ * content and associated metadata that has been retrieved via the network.
+ * (The remaining responsibility for caching lies with individual network
+ * protocol handlers.)
+ *
+ * The cache manager supervises the actions of individual cache components,
+ * such as the memory cache, the disk cache and any extension caches, e.g. a
+ * read-only CD-ROM cache.
+ *
+ * @See nsINetDataCache
+ * @See nsICachedNetData
+ */
+[scriptable, uuid(71c8ab00-6d5c-11d3-90c8-000064657374)]
+interface nsINetDataCacheManager : nsISupports
+{
+    /**
+     * Flag for the GetCachedNetData() method: If set, the memory cache is
+     * neither searched nor will any data be stored into it.  This might be
+     * appropriate, for example, with images, because they have their own
+     * cache for storing *decoded* images.
+     */
+    const unsigned long BYPASS_MEMORY_CACHE       = 1 << 0;
+
+    /**
+     * Flag for the GetCachedNetData() method: If set, the disk cache
+     * is neither searched nor will any be data stored into it.
+     * However, read-only extension caches may be searched.  This
+     * might be used to avoid leaving persistent records of secure
+     * data.
+     */
+    const unsigned long BYPASS_PERSISTENT_CACHE   = 1 << 1;
+
+    /**
+     * Flag for the GetCachedNetData() method: If set, any stream
+     * content is stored in the cache as a single disk file.  Content
+     * will not be cached in the memory cache nor is it cached in a
+     * flat-file cache database.  This is used to implement the jar
+     * protocol handler and to provide the stream-as-file semantics
+     * required by the classic bowser plugin API.
+     */
+    const unsigned long CACHE_AS_FILE             = 1 << 2;
+
+    /**
+     * Fetch the cache entry record for the given URI.  If one does not exist,
+     * create a new, empty record.  The normal search order for caches is:
+     *   + Memory cache
+     *   + Disk cache
+     *   + File cache (stream-as-file cache)
+     *   + All extension caches
+     *
+     * When writing, data is typically stored in both the memory cache and the
+     * disk cache.  Both the search order and this write policy can be modified by
+     * setting one or more of the flag argument bits, as defined above.
+     *
+     * The optionally-NULL secondaryKey argument can be used, e.g. for form
+     * post data or for HTTP headers in the case of HTTP.
+     */
+    nsICachedNetData getCachedNetData(in string uri,
+                                      [size_is(secondaryKeyLength)] in string secondaryKey,
+                                      in PRUint32 secondaryKeyLength,
+                                      in PRUint32 flags);
+
+    /**
+     * Returns true if cached content is available for the given URI, even if
+     * only partial data is stored.  The flags argument behaves the same as for
+     * the GetCachedNetData() method, above.
+     */
+    boolean contains(in string uri,
+                     [size_is(secondaryKeyLength)] in string secondaryKey,
+                     in PRUint32 secondaryKeyLength,
+                     in PRUint32 flags);
+
+    /**
+     * Total number of unexpired URI entries stored in all caches.  This number
+     * does not take into account duplicate URIs, e.g. because the memory cache
+     * and the disk cache might each contain an entry for the same URI.
+     */
+    readonly attribute PRUint32 numEntries;
+
+    /**
+     * Enumerate the unexpired URI entries stored in all caches.  Some URIs may
+     * be enumerated more than once, e.g.  because the the memory cache and the
+     * disk cache might each contain an entry for the same URI.
+     */
+    nsISimpleEnumerator newCacheEntryIterator();
+
+    /*
+     * Enumerate all the loaded nsINetDataCache-implementing cache modules.
+     * The first module enumerated will be the memory cache, the second will be
+     * the disk cache, then the file cache, followed by all the extension
+     * caches, in search order. 
+     */
+    nsISimpleEnumerator newCacheModuleIterator();
+
+    /**
+     * Remove all entries from all writable caches.  This could be used, for
+     * example, after a guest ends a browser session.  This is equivalent to
+     * setting the DiskCacheCapacity to zero, except that all cache entries,
+     * even those in active use, will be deleted.  Also, any global cache
+     * database files will be deleted.
+     */
+    void RemoveAll();
+
+    /**
+     * The disk cache is made up of the file cache (for stream-as-file
+     * requests) and a (possibly independent) persistent cache that handles all
+     * other cache requests.  This attribute sets/gets the combined capacity of
+     * these caches, measured in KBytes.  Setting the capacity lower than the
+     * current amount of space currently in use may cause cache entries to be
+     * evicted from the cache to accomodate the requested capacity.
+     */
+    attribute PRUint32 diskCacheCapacity;
+
+    /**
+     * This attribute sets/gets the capacity of the memory cache, measured in
+     * KBytes.  Setting the capacity lower than the current amount of space
+     * currently in use may cause cache entries to be evicted from the cache to
+     * accomodate the requested capacity.
+     */
+    attribute PRUint32 memCacheCapacity;
+
+	/**
+	 * This attribute must be set before attempting to store into the disk cache.
+	 */
+    attribute nsIFileSpec diskCacheFolder;
+};
+
+%{ C++
+// ProgID prefix for Components that implement this interface
+#define NS_NETWORK_CACHE_MANAGER_PROGID NS_NETWORK_CACHE_PROGID "?name=manager"
+%}

mozilla/netwerk/cache/public/nsINetDataCacheRecord.idl

@@ -0,0 +1,125 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+#include "nsrootidl.idl"
+
+interface nsIFileSpec;
+interface nsIChannel;
+interface nsINetDataCache;
+
+/**
+ * The nsINetDataCacheRecord represents a single entry in a database that
+ * caches data retrieved from the network. On top of this low-level interface
+ * to the raw record data, the cache manager implements a higher-level record
+ * interface, nsICachedNetData.  Each instance of nsINetDataCacheRecord is
+ * (internally) associated with a parent database, an instance of the
+ * nsINetDataCache interface.  This interface is essentially a pseudo-private
+ * API for the cache manager.  Other clients should never use this interface.
+ *
+ * Each cache record may contain both content and metadata.  The content may
+ * be, for example, GIF image data or HTML, and it is accessed through
+ * nsIChannel's streaming API.  The opaque metadata, which may contain HTTP
+ * headers among other things, is accessed as a contiguous byte array.  Each
+ * entry in the cache is indexed by two different keys: a unique record id
+ * number, generated by the cache, and an opaque string.  The latter contains
+ * the URI and other secondary key information, e.g. HTTP form post key/value
+ * pairs.
+ *
+ * The nsINetDataCacheRecord interface is agnostic as to where the data is
+ * stored and whether the storage is volatile or persistent.  The memory cache,
+ * the disk cache, a flat-file cache and any read-only extension caches must
+ * all implement this interface.
+ *
+ * @See nsICachedNetData
+ * @See nsINetDataCache
+ * @See nsINetDataDiskCache
+ * @See nsINetDataCacheManager
+ */
+
+interface nsILoadGroup;
+
+[scriptable, uuid(fdcdd6a0-7461-11d3-90ca-0040056a906e)]
+interface nsINetDataCacheRecord : nsISupports
+{
+    /**
+     * As far as the nsINetDataCacheRecord implementation is concerned, the
+     * cache entry database key is an opaque blob, but it's intended to contain
+     * both the URI and any secondary keys, such as HTTP post data.
+     */
+    void getKey(out unsigned long length, [size_is(length), retval] out string key);
+
+    /**
+     * A persistent record number assigned by the cache which must be unique
+     * among all entries stored within the same cache.  The record ID serves as
+     * an alternate key to the cache record.  Providing that they satisfy the
+     * afforementioned uniqueness requirement, record IDs can be assigned any
+     * value by the database except that they may never be zero.
+     */
+    readonly attribute PRInt32 recordID;
+
+    /**
+     * Opaque data which can be updated for each cache entry independently of
+     * the content data.  This data is a combination of protocol-independent
+     * data provided by the cache manager and protocol-specific meta-data,
+     * e.g. HTTP headers.
+     */
+    void getMetaData(out PRUint32 length, [size_is(length), retval] out string metaData);
+    void setMetaData(in  PRUint32 length, [size_is(length)] in string data);
+
+    /**
+     * Number of content bytes stored in the cache, i.e. via the nsIChannel
+     * streaming APIs.  This may be less than the complete content length if a
+     * partial cache fill occurred.  Additionally, the cached content can be
+     * truncated by reducing the value of this attribute.  When this attribute
+     * is set to zero the associated cache disk file, if any, should be
+     * deleted.
+     */
+    attribute PRUint32 storedContentLength;
+
+    /** 
+     * Delete this cache entry and its associated content.
+     */
+    void delete();
+
+    /**
+     * Create a channel for reading or writing a stream of content into the
+     * entry.  However, many of the nsIChannel methods may return
+     * NS_NOT_IMPLEMENTED, including:
+     *
+     *    + GetURI()
+     *    + GetContentType()
+     *    + GetContentLength()
+     */
+    nsIChannel newChannel(in nsILoadGroup loadGroup);
+
+    /**
+     * If a cache is implemented such that it stores each URI's content in an
+     * individual disk file, this method will identify the file corresponding
+     * to this record.  This may be used to implement the "stream-as-file"
+     * semantics required by some plugins and by the 'jar:' protocol handler.
+     * However, not all cache implementations are *required* to store the data
+     * from each URI in an individual file, so it is acceptable for an
+     * implementation of this method to signal NS_NOT_IMPLEMENTED.
+     */
+    readonly attribute nsIFileSpec filename;
+};

mozilla/netwerk/cache/public/nsINetDataDiskCache.idl

@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsINetDataCache.idl"
+
+interface nsIFileSpec;
+
+/**
+/**
+ * A network-data disk cache is used to persistently cache the responses to
+ * network retrieval commands.  Each cache entry may contain both content,
+ * e.g. GIF image data, and associated metadata, e.g. HTTP headers.
+ */
+[scriptable, uuid(6408e390-6f13-11d3-90c8-000064657374)]
+interface nsINetDataDiskCache : nsINetDataCache
+{
+	/**
+	 * This attribute must be set before calling any other methods of this
+	 * interface.
+	 */
+    attribute nsIFileSpec diskCacheFolder;
+};
+

mozilla/netwerk/cache/public/nsIStreamAsFile.idl

@@ -0,0 +1,106 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Scott Furman, fur@netscape.com
+ */
+#include "nsrootidl.idl"
+#include "nsISupports.idl"
+
+interface nsIFileSpec;
+interface nsIStreamAsFileObserver;
+
+/**
+ * In addition to enhancing effective network response time via caching, the
+ * cache manager serves a second purpose by providing the stream-as-file
+ * service required by traditional browser plugins and the jar: protocol
+ * handler.  The interface below provides a means for a client to determine the
+ * filename associated with a stream and to detect modification/deletion of
+ * that file.
+ */
+[scriptable, uuid(0eedbbf0-92d9-11d3-90d3-0040056a906e)]
+interface nsIStreamAsFile : nsISupports
+{
+    /**
+     * Filename containing stream-as-file
+     */
+    readonly attribute nsIFileSpec fileSpec;
+
+    /**
+     * Add an observer for this cache record.  When the cache wants to delete
+     * or truncate a record, so as to make space for another cache entry's
+     * content data, it will call <code>aObserver</code>'s Observe() method,
+     * passing the nsIStreamAsFile instance as the <code>aSubject</code>
+     * argument and an appropriate message.  If the observer does not wish to
+     * inhibit deletion/truncation, it should Release() any references it has to the
+     * cache record.
+     *
+     * @See nsIStreamAsFileObserver
+     */
+    void addObserver(in nsIStreamAsFileObserver aObserver);
+
+    /**
+     * Delete an observer that was added by the AddObserver() method.
+     */
+    void removeObserver(in nsIStreamAsFileObserver aObserver);
+};
+
+/**
+ * This interface can be implemented by a client to receive notifications of
+ * either modification or deletion of a file created by the cache manager using
+ * the stream-as-file semantics.
+ */
+[scriptable, uuid(a26e27c0-92da-11d3-90d3-0040056a906e)]
+interface nsIStreamAsFileObserver : nsISupports
+{
+    /**
+     * Flag bits for argument to Observe() method.
+     */
+    const long NOTIFY_AVAILABLE    = 1 << 0; // Stream-as-file now available for reading
+    const long NOTIFY_ERROR        = 1 << 1; // Error while loading stream / creating file
+    const long REQUEST_DELETION    = 1 << 2; // Cache manager wishes to delete/truncate file
+    const long INVALIDATE          = 1 << 3; // File is out-of-date
+
+    // Convenience value
+    const long MAKE_UNAVAILABLE    = REQUEST_DELETION | INVALIDATE;
+    
+    /**
+     * Receive either a notification or a request concerning a file that has
+     * been opened using stream-as-file.  The aMessage and aError arguments
+     * have varying values depending on the nature of the notification.
+     * aMessage is set to NOTIFY_AVAILABLE when a complete stream has been read
+     * and stored on disk in a file.  At that point, and no sooner, may the
+     * filename attribute of the associated nsIStreamAsFile be accessed via the
+     * associated nsIStreamAsFile interface.  If the aMessage argument is
+     * NOTIFY_ERROR, the aError argument contains the relevant error code.  If
+     * the aMessage argument is either REQUEST_DELETION or REQUEST_TRUNCATION,
+     * the callee should immediately Release() all references to the
+     * nsIStreamAsFile (and any references to its associated nsICachedNetData
+     * instances), unless it wishes to inhibit the requested file modification.
+     * If the aMessage argument is INVALIDATE, the cache manager is replacing
+     * the file with a more recent version.  If a client wants to continue
+     * using the (now out-of-date) file, it must delete it when it has finished,
+     * as the cache manager will effectively relinquished ownership of the
+     * file.
+     */
+    void ObserveStreamAsFile(in nsIStreamAsFile aStreamAsFile,
+			     in PRUint32 aMessage,
+			     in nsresult aError);
+};

mozilla/netwerk/makefile.win

@@ -0,0 +1,39 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH = ..
+
+MODULE = necko
+
+DIRS=            \
+	base     \
+	dns      \
+	build    \
+	protocol \
+	socket   \
+	util     \
+	mime     \
+	streamconv \
+	cache    \
+	test     \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/netwerk/protocol/http/public/nsIHTTPHeader.idl

@@ -0,0 +1,32 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+
+interface nsIAtom;
+                  
+[scriptable, uuid(a3ec67f0-465a-11d3-9a89-0080c7cb1080)]
+interface nsIHTTPHeader : nsISupports
+{
+    nsIAtom GetField();
+    string GetValue();
+};

mozilla/netwerk/test/TestCacheMgr.cpp

@@ -0,0 +1,603 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsIStreamListener.h"
+#include "nsIStreamObserver.h"
+#include "nsIServiceManager.h"
+#include "nsIInputStream.h"
+#include "nsIOutputStream.h"
+#include "nsIEventQueue.h"
+#include "nsIEventQueueService.h"
+#include "nsIChannel.h"
+#include "nsCOMPtr.h"
+
+#include "nsINetDataCache.h"
+#include "nsINetDataCacheManager.h"
+#include "nsICachedNetData.h"
+
+
+// Number of test entries to be placed in the cache
+// FIXME - temporary
+#define NUM_CACHE_ENTRIES  25
+
+// Cache content stream length will have random length between zero and
+// MAX_CONTENT_LENGTH bytes
+#define MAX_CONTENT_LENGTH 20000
+
+// Limits, converted to KB
+#define DISK_CACHE_CAPACITY  ((MAX_CONTENT_LENGTH * 4) >> 10)
+#define MEM_CACHE_CAPACITY   ((MAX_CONTENT_LENGTH * 3) >> 10)
+
+// Length of random-data cache entry URI key
+#define CACHE_KEY_LENGTH 13
+
+// Length of random-data cache entry secondary key
+#define CACHE_SECONDARY_KEY_LENGTH 10
+
+// Length of random-data cache entry meta-data
+#define CACHE_PROTOCOL_PRIVATE_LENGTH 10
+
+// Mapping from test case number to RecordID
+static PRInt32 recordID[NUM_CACHE_ENTRIES];
+
+static PRInt32
+mapRecordIdToTestNum(PRInt32 aRecordID)
+{
+    int i;
+    for (i = 0; i < NUM_CACHE_ENTRIES; i++) {
+        if (recordID[i] == aRecordID)
+            return i;
+    }
+    return -1;
+}
+
+// A supply of stream data to either store or compare with
+class nsITestDataStream {
+public:
+    virtual ~nsITestDataStream() {};
+    virtual PRUint32 Next() = 0;
+    virtual void Read(char* aBuf, PRUint32 aCount) = 0;
+    virtual void ReadString(char* aBuf, PRUint32 aCount) = 0;
+
+    virtual PRBool Match(char* aBuf, PRUint32 aCount) = 0;
+    virtual PRBool MatchString(char* aBuf, PRUint32 aCount) = 0;
+    virtual void Skip(PRUint32 aCount) = 0;
+    virtual void SkipString(PRUint32 aCount) = 0;
+};
+
+// A reproducible stream of random data.
+class RandomStream : public nsITestDataStream {
+public:
+    RandomStream(PRUint32 aSeed) {
+        mStartSeed = mState = aSeed;
+    }
+    
+    PRUint32 GetStartSeed() {
+        return mStartSeed;
+    }
+    
+    PRUint32 Next() {
+        mState = 1103515245 * mState + 12345 ^ (mState >> 16);
+        return mState;
+    }
+
+    PRUint8 NextChar() {
+        PRUint8 c;
+        do {
+            c = Next();
+        } while (!isalnum(c));
+        return c;
+    }
+
+    void Read(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            *aBuf++ = Next();
+        }
+    }
+
+    // Same as Read(), but using only printable chars and
+    //   with a terminating NUL
+    void ReadString(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            *aBuf++ = NextChar();
+        }
+        *aBuf = 0;
+    }
+
+    PRBool
+    Match(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            if (*aBuf++ != (char)(Next() & 0xff))
+                return PR_FALSE;
+        }
+        return PR_TRUE;
+    }
+
+    PRBool
+    MatchString(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            if (*aBuf++ != (char)(NextChar() & 0xff))
+                return PR_FALSE;
+        }
+        
+        // Check for terminating NUL character
+        if (*aBuf)
+            return PR_FALSE;
+        return PR_TRUE;
+    }
+
+    void
+    Skip(PRUint32 aCount) {
+        while (aCount--)
+            Next();
+    }
+
+    void
+    SkipString(PRUint32 aCount) {
+        while (aCount--)
+            NextChar();
+    }
+
+protected:
+    
+    PRUint32 mState;
+    PRUint32 mStartSeed;
+};
+
+static int gNumReaders = 0;
+static PRUint32 gTotalBytesRead = 0;
+static PRUint32 gTotalBytesWritten = 0;
+static PRUint32 gTotalDuration = 0;
+
+class nsReader : public nsIStreamListener {
+public:
+    NS_DECL_ISUPPORTS
+
+    nsReader()
+        : mStartTime(0), mBytesRead(0)
+    {
+        NS_INIT_REFCNT();
+        gNumReaders++;
+    }
+
+    virtual ~nsReader() {
+        delete mTestDataStream;
+        gNumReaders--;
+    }
+
+    nsresult 
+    Init(nsITestDataStream* aRandomStream, PRUint32 aExpectedStreamLength) {
+        mTestDataStream = aRandomStream;
+        mExpectedStreamLength = aExpectedStreamLength;
+        mRefCnt = 1;
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnStartRequest(nsIChannel* channel,
+                              nsISupports* context) {
+        mStartTime = PR_IntervalNow();
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnDataAvailable(nsIChannel* channel, 
+                               nsISupports* context,
+                               nsIInputStream *aIStream, 
+                               PRUint32 aSourceOffset,
+                               PRUint32 aLength) {
+        char buf[1025];
+        while (aLength > 0) {
+            PRUint32 amt;
+            PRBool match;
+            aIStream->Read(buf, sizeof buf, &amt);
+            if (amt == 0) break;
+            aLength -= amt;
+            mBytesRead += amt;
+            match = mTestDataStream->Match(buf, amt);
+            NS_ASSERTION(match, "Stored data was corrupted on read");
+        }
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnStopRequest(nsIChannel* channel, 
+                             nsISupports* context,
+                             nsresult aStatus,
+                             const PRUnichar* aMsg) {
+        PRIntervalTime endTime;
+        PRIntervalTime duration;
+        
+        endTime = PR_IntervalNow();
+        duration = (endTime - mStartTime);
+
+        if (NS_FAILED(aStatus)) printf("channel failed.\n");
+        //        printf("read %d bytes\n", mBytesRead);
+
+        //FIXME        NS_ASSERTION(mBytesRead == mExpectedStreamLength,
+        // "Stream in cache is wrong length");
+
+        gTotalBytesRead += mBytesRead;
+        gTotalDuration += duration;
+
+        return NS_OK;
+    }
+
+protected:
+    PRIntervalTime       mStartTime;
+    PRUint32             mBytesRead;
+    nsITestDataStream*   mTestDataStream;
+    PRUint32             mExpectedStreamLength;
+};
+
+NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIStreamObserver)
+
+static nsIEventQueue* eventQueue;
+
+static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+
+nsresult
+InitQueue() {
+    nsresult rv;
+
+    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service");
+
+    rv = eventQService->CreateThreadEventQueue();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create event queue");
+  
+    rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQueue);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread");
+
+    return NS_OK;
+}
+
+// Process events until all streams are OnStopRequest'ed
+nsresult
+WaitForEvents() {
+    while (gNumReaders) {
+        eventQueue->ProcessPendingEvents();
+    }
+    return NS_OK;
+}
+
+// Read data for a single cache record and compare against testDataStream
+nsresult
+TestReadStream(nsICachedNetData *cacheEntry, nsITestDataStream *testDataStream,
+               PRUint32 expectedStreamLength)
+{
+    nsCOMPtr<nsIChannel> channel;
+    nsresult rv;
+    PRUint32 actualContentLength;
+
+    rv = cacheEntry->NewChannel(0, 0, getter_AddRefs(channel));
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+    rv = cacheEntry->GetStoredContentLength(&actualContentLength);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    // FIXME    NS_ASSERTION(actualContentLength == expectedStreamLength,
+    //                 "nsICachedNetData::GetContentLength() busted ?");
+    
+    nsReader *reader = new nsReader;
+    reader->AddRef();
+    rv = reader->Init(testDataStream, expectedStreamLength);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    
+    rv = channel->AsyncRead(0, -1, 0, reader);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    reader->Release();
+
+    return NS_OK;
+}
+
+// Convert PRTime to unix-style time_t, i.e. seconds since the epoch
+static PRUint32
+convertPRTimeToSeconds(PRTime aTime64)
+{
+    double fpTime;
+    LL_L2D(fpTime, aTime64);
+    return (PRUint32)(fpTime * 1e-6 + 0.5);
+}
+
+// Convert unix-style time_t, i.e. seconds since the epoch, to PRTime
+static PRTime
+convertSecondsToPRTime(PRUint32 aSeconds)
+{
+    PRInt64 t64;
+    LL_L2I(t64, aSeconds);
+    LL_MUL(t64, t64, 1000000);
+    return t64;
+}
+
+// Read the test data that was written in FillCache(), checking for
+// corruption, truncation.
+nsresult
+TestRead(nsINetDataCacheManager *aCache, PRUint32 aFlags)
+{
+    nsresult rv;
+    PRBool inCache;
+    nsCOMPtr<nsICachedNetData> cacheEntry;
+    RandomStream *randomStream;
+    char uriCacheKey[CACHE_KEY_LENGTH];
+    char secondaryCacheKey[CACHE_SECONDARY_KEY_LENGTH];
+    char *storedUriKey;
+    PRUint32 testNum;
+
+    gTotalBytesRead = 0;
+    gTotalDuration = 0;
+    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
+        randomStream = new RandomStream(testNum);
+        randomStream->ReadString(uriCacheKey, sizeof uriCacheKey - 1);
+        randomStream->Read(secondaryCacheKey, sizeof secondaryCacheKey);
+
+        // Ensure that entry is in the cache
+        rv = aCache->Contains(uriCacheKey,
+                              secondaryCacheKey, sizeof secondaryCacheKey,
+                              aFlags, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(inCache, "nsINetDataCacheManager::Contains error");
+        
+        rv = aCache->GetCachedNetData(uriCacheKey,
+                                      secondaryCacheKey, sizeof secondaryCacheKey,
+                                      aFlags,
+                                      getter_AddRefs(cacheEntry));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        // Test GetUriSpec() method
+        rv = cacheEntry->GetUriSpec(&storedUriKey);
+        NS_ASSERTION(NS_SUCCEEDED(rv) &&
+                     !memcmp(storedUriKey, &uriCacheKey[0], sizeof uriCacheKey),
+                     "nsICachedNetData::GetKey failed");
+        nsAllocator::Free(storedUriKey);
+
+        // Test GetSecondaryKey() method
+        PRUint32 storedSecondaryKeyLength;
+        char* storedSecondaryKey;
+        rv = cacheEntry->GetSecondaryKey(&storedSecondaryKeyLength, &storedSecondaryKey);
+        NS_ASSERTION(NS_SUCCEEDED(rv) &&
+                     !memcmp(storedSecondaryKey, &secondaryCacheKey[0],
+                             sizeof secondaryCacheKey),
+                     "nsICachedNetData::GetSecondaryKey failed");
+
+        // Compare against stored protocol data
+        char *storedProtocolData;
+        PRUint32 storedProtocolDataLength;
+        rv = cacheEntry->GetAnnotation("test data", &storedProtocolDataLength, &storedProtocolData);
+        NS_ASSERTION(NS_SUCCEEDED(rv) &&
+                     storedProtocolDataLength == CACHE_PROTOCOL_PRIVATE_LENGTH,
+                     "nsICachedNetData::GetAnnotation() failed");
+        randomStream->Match(storedProtocolData, storedProtocolDataLength);
+
+        // Test GetAllowPartial()
+        PRBool allowPartial;
+        rv = cacheEntry->GetAllowPartial(&allowPartial);
+        NS_ASSERTION(NS_SUCCEEDED(rv) &&
+                     (allowPartial == (PRBool)(randomStream->Next() & 1)),
+                     "nsICachedNetData::GetAllowPartial() failed");
+
+        // Test GetExpirationTime()
+        PRTime expirationTime;
+        PRTime expectedExpirationTime = convertSecondsToPRTime(randomStream->Next() & 0xffffff);
+        rv = cacheEntry->GetExpirationTime(&expirationTime);
+
+        NS_ASSERTION(NS_SUCCEEDED(rv) && LL_EQ(expirationTime, expectedExpirationTime),
+                     "nsICachedNetData::GetExpirationTime() failed");
+
+        PRUint32 expectedStreamLength = randomStream->Next() % MAX_CONTENT_LENGTH;
+
+        TestReadStream(cacheEntry, randomStream, expectedStreamLength);
+    }
+
+    WaitForEvents();
+
+    // Compute rate in MB/s
+    double rate = gTotalBytesRead / PR_IntervalToMilliseconds(gTotalDuration);
+    rate *= NUM_CACHE_ENTRIES;
+    rate *= 1000;
+    rate /= (1024 * 1024);
+    printf("Read  %7d bytes at a rate of %5.1f MB per second \n",
+           gTotalBytesRead, rate);
+
+    return NS_OK;
+}
+
+// Create entries in the network data cache, using random data for the
+// key, the meta-data and the stored content data.
+nsresult
+FillCache(nsINetDataCacheManager *aCache, PRUint32 aFlags, PRUint32 aCacheCapacity)
+{
+    nsresult rv;
+    PRBool inCache;
+    nsCOMPtr<nsICachedNetData> cacheEntry;
+    nsCOMPtr<nsIChannel> channel;
+    nsCOMPtr<nsIOutputStream> outStream;
+    nsCOMPtr<nsINetDataCache> containingCache;
+    char buf[1000];
+    PRUint32 protocolDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char secondaryCacheKey[CACHE_SECONDARY_KEY_LENGTH];
+    char protocolData[CACHE_PROTOCOL_PRIVATE_LENGTH];
+    PRUint32 testNum;
+    RandomStream *randomStream;
+
+    gTotalBytesWritten = 0;
+    PRIntervalTime startTime = PR_IntervalNow();
+    
+    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
+        randomStream = new RandomStream(testNum);
+        randomStream->ReadString(cacheKey, sizeof cacheKey - 1);
+        randomStream->Read(secondaryCacheKey, sizeof secondaryCacheKey);
+
+        // No entry should be in cache until we add it
+        rv = aCache->Contains(cacheKey,
+                              secondaryCacheKey, sizeof secondaryCacheKey,
+                              aFlags, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(!inCache, "nsINetDataCacheManager::Contains error");
+        
+        rv = aCache->GetCachedNetData(cacheKey,
+                                      secondaryCacheKey, sizeof secondaryCacheKey,
+                                      aFlags,
+                                      getter_AddRefs(cacheEntry));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access cacheEntry via cache key");
+
+        // Test nsINetDataCacheManager::GetNumEntries()
+        PRUint32 numEntries = (PRUint32)-1;
+        rv = aCache->GetNumEntries(&numEntries);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+        NS_ASSERTION(numEntries == testNum + 1, "GetNumEntries failure");
+
+        // Record meta-data should be initially empty
+        char *protocolDatap;
+        rv = cacheEntry->GetAnnotation("test data", &protocolDataLength, &protocolDatap);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        if ((protocolDataLength != 0) || (protocolDatap != 0))
+            return NS_ERROR_FAILURE;
+
+        // Store random data as meta-data
+        randomStream->Read(protocolData, sizeof protocolData);
+        cacheEntry->SetAnnotation("test data", sizeof protocolData, protocolData);
+
+        // Store random data as allow-partial flag
+        PRBool allowPartial = randomStream->Next() & 1;
+        rv = cacheEntry->SetAllowPartial(allowPartial);
+        NS_ASSERTION(NS_SUCCEEDED(rv),
+                     "nsICachedNetData::SetAllowPartial() failed");
+
+        // Store random data as expiration time
+        PRTime expirationTime = convertSecondsToPRTime(randomStream->Next() & 0xffffff);
+        rv = cacheEntry->SetExpirationTime(expirationTime);
+        NS_ASSERTION(NS_SUCCEEDED(rv),
+                     "nsICachedNetData::SetExpirationTime() failed");
+
+        // Cache manager complains if expiration set without setting last-modified time
+        rv = cacheEntry->SetLastModifiedTime(expirationTime);
+
+        rv = cacheEntry->NewChannel(0, 0, getter_AddRefs(channel));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        rv = cacheEntry->GetCache(getter_AddRefs(containingCache));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        rv = channel->OpenOutputStream(0, getter_AddRefs(outStream));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        
+        int streamLength = randomStream->Next() % MAX_CONTENT_LENGTH;
+        int remaining = streamLength;
+        while (remaining) {
+            PRUint32 numWritten;
+            int amount = PR_MIN(sizeof buf, remaining);
+            randomStream->Read(buf, amount);
+
+            rv = outStream->Write(buf, amount, &numWritten);
+            NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+            NS_ASSERTION(numWritten == (PRUint32)amount, "Write() bug?");
+            
+            remaining -= amount;
+
+            PRUint32 storageInUse;
+            rv = containingCache->GetStorageInUse(&storageInUse);
+            NS_ASSERTION(NS_SUCCEEDED(rv) && (storageInUse <= aCacheCapacity),
+                         "Cache manager failed to limit cache growth");
+        }
+        outStream->Close();
+        gTotalBytesWritten += streamLength;
+
+        // *Now* there should be an entry in the cache
+        rv = aCache->Contains(cacheKey,
+                              secondaryCacheKey, sizeof secondaryCacheKey,
+                              aFlags, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(inCache, "nsINetDataCacheManager::Contains error");
+
+        delete randomStream;
+    }
+
+    PRIntervalTime endTime = PR_IntervalNow();
+
+    // Compute rate in MB/s
+    double rate = gTotalBytesWritten / PR_IntervalToMilliseconds(endTime - startTime);
+    rate *= 1000;
+    rate /= (1024 * 1024);
+    printf("Wrote %7d bytes at a rate of %5.1f MB per second \n",
+           gTotalBytesWritten, rate);
+
+    return NS_OK;
+}
+
+nsresult NS_AutoregisterComponents()
+{
+  nsresult rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,
+                                                 NULL /* default */);
+  return rv;
+}
+
+nsresult
+Test(nsINetDataCacheManager *aCache, PRUint32 aFlags, PRUint32 aCacheCapacity)
+{
+    nsresult rv;
+
+    rv = aCache->RemoveAll();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
+
+    PRUint32 numEntries = (PRUint32)-1;
+    rv = aCache->GetNumEntries(&numEntries);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
+
+    rv = FillCache(aCache, aFlags, aCacheCapacity);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't fill cache with random test data");
+
+    rv = TestRead(aCache, aFlags);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't read random test data from cache");
+
+    rv = aCache->RemoveAll();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
+
+    rv = aCache->GetNumEntries(&numEntries);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
+
+    return 0;
+}
+int
+main(int argc, char* argv[])
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheManager> cache;
+
+    rv = NS_AutoregisterComponents();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't register XPCOM components");
+
+    rv = nsComponentManager::CreateInstance(NS_NETWORK_CACHE_MANAGER_PROGID,
+                                            nsnull,
+                                            NS_GET_IID(nsINetDataCacheManager),
+                                            getter_AddRefs(cache));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create cache manager factory") ;
+
+    cache->SetDiskCacheCapacity(DISK_CACHE_CAPACITY);
+    cache->SetMemCacheCapacity(MEM_CACHE_CAPACITY);
+
+    InitQueue();
+    
+    Test(cache, nsINetDataCacheManager::BYPASS_PERSISTENT_CACHE, MEM_CACHE_CAPACITY);
+    Test(cache, nsINetDataCacheManager::BYPASS_MEMORY_CACHE, DISK_CACHE_CAPACITY);
+    return 0;
+}
+

mozilla/netwerk/test/TestRawCache.cpp

@@ -0,0 +1,820 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsIStreamListener.h"
+#include "nsIStreamObserver.h"
+#include "nsIServiceManager.h"
+#include "nsIInputStream.h"
+#include "nsIOutputStream.h"
+#include "nsIEventQueue.h"
+#include "nsIEventQueueService.h"
+#include "nsIChannel.h"
+#include "nsCOMPtr.h"
+#include "nsString.h"
+#include <stdio.h>
+
+#include "nsINetDataCache.h"
+#include "nsINetDataDiskCache.h"
+#include "nsINetDataCacheRecord.h"
+#include "nsMemCacheCID.h"
+// file cache include
+#include "nsNetDiskCacheCID.h"
+#include "nsIPref.h"
+#include "prenv.h"
+#include "nsIFileStream.h"
+
+
+// Number of test entries to be placed in the cache
+#define NUM_CACHE_ENTRIES  250
+
+// Cache content stream length will have random length between zero and
+// MAX_CONTENT_LENGTH bytes
+#define MAX_CONTENT_LENGTH 20000
+
+// Length of random-data cache entry key
+#define CACHE_KEY_LENGTH 15
+
+// Length of random-data cache entry meta-data
+#define CACHE_METADATA_LENGTH 100
+
+static NS_DEFINE_CID(kMemCacheCID, NS_MEM_CACHE_FACTORY_CID);
+static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+
+// file cache cid
+static NS_DEFINE_CID(kDiskCacheCID, NS_NETDISKCACHE_CID) ;
+static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
+static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID);
+
+// Mapping from test case number to RecordID
+static PRInt32 recordID[NUM_CACHE_ENTRIES];
+
+static PRInt32
+mapRecordIdToTestNum(PRInt32 aRecordID)
+{
+    int i;
+    for (i = 0; i < NUM_CACHE_ENTRIES; i++) {
+        if (recordID[i] == aRecordID)
+            return i;
+    }
+    return -1;
+}
+
+// A supply of stream data to either store or compare with
+class nsITestDataStream {
+public:
+    virtual ~nsITestDataStream() {};
+    virtual PRUint32 Next() = 0;
+    virtual void Read(char* aBuf, PRUint32 aCount) = 0;
+
+    virtual PRBool Match(char* aBuf, PRUint32 aCount) = 0;
+    virtual void Skip(PRUint32 aCount) = 0;
+};
+
+// A reproducible stream of random data.
+class RandomStream : public nsITestDataStream {
+public:
+    RandomStream(PRUint32 aSeed) {
+        mStartSeed = mState = aSeed;
+    }
+    
+    PRUint32 GetStartSeed() {
+        return mStartSeed;
+    }
+    
+    PRUint32 Next() {
+        mState = 1103515245 * mState + 12345;
+        return mState;
+    }
+
+    void Read(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            *aBuf++ = Next();
+        }
+    }
+
+    PRBool
+    Match(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            if (*aBuf++ != (char)(Next() & 0xff))
+                return PR_FALSE;
+        }
+        return PR_TRUE;
+    }
+
+    void
+    Skip(PRUint32 aCount) {
+        while (aCount--)
+            Next();
+    }
+
+protected:
+    
+    PRUint32 mState;
+    PRUint32 mStartSeed;
+};
+
+// A stream of data that increments on each byte that is read, modulo 256
+class CounterStream : public nsITestDataStream {
+public:
+    CounterStream(PRUint32 aSeed) {
+        mStartSeed = mState = aSeed;
+    }
+    
+    PRUint32 GetStartSeed() {
+        return mStartSeed;
+    }
+    
+    PRUint32 Next() {
+        mState += 1;
+        mState &= 0xff;
+        return mState;
+    }
+
+    void Read(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            *aBuf++ = Next();
+        }
+    }
+
+    PRBool
+    Match(char* aBuf, PRUint32 aCount) {
+        PRUint32 i;
+        for (i = 0; i < aCount; i++) {
+            if (*aBuf++ != (char)Next())
+                return PR_FALSE;
+        }
+        return PR_TRUE;
+    }
+
+    void
+    Skip(PRUint32 aCount) {
+        mState += aCount;
+        mState &= 0xff;
+    }
+
+protected:
+    
+    PRUint32 mState;
+    PRUint32 mStartSeed;
+};
+
+static int gNumReaders = 0;
+static PRUint32 gTotalBytesRead = 0;
+static PRUint32 gTotalDuration = 0;
+
+class nsReader : public nsIStreamListener {
+public:
+    NS_DECL_ISUPPORTS
+
+    nsReader()
+        : mStartTime(0), mBytesRead(0)
+    {
+        NS_INIT_REFCNT();
+        gNumReaders++;
+    }
+
+    virtual ~nsReader() {
+        delete mTestDataStream;
+        gNumReaders--;
+    }
+
+    nsresult 
+    Init(nsITestDataStream* aRandomStream, PRUint32 aExpectedStreamLength) {
+        mTestDataStream = aRandomStream;
+        mExpectedStreamLength = aExpectedStreamLength;
+        mRefCnt = 1;
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnStartRequest(nsIChannel* channel,
+                              nsISupports* context) {
+        mStartTime = PR_IntervalNow();
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnDataAvailable(nsIChannel* channel, 
+                               nsISupports* context,
+                               nsIInputStream *aIStream, 
+                               PRUint32 aSourceOffset,
+                               PRUint32 aLength) {
+        char buf[1025];
+        while (aLength > 0) {
+            PRUint32 amt;
+            PRBool match;
+            aIStream->Read(buf, sizeof buf, &amt);
+            if (amt == 0) break;
+            aLength -= amt;
+            mBytesRead += amt;
+            match = mTestDataStream->Match(buf, amt);
+            NS_ASSERTION(match, "Stored data was corrupted on read");
+        }
+        return NS_OK;
+    }
+
+    NS_IMETHOD OnStopRequest(nsIChannel* channel, 
+                             nsISupports* context,
+                             nsresult aStatus,
+                             const PRUnichar* aMsg) {
+        PRIntervalTime endTime;
+        PRIntervalTime duration;
+        
+        endTime = PR_IntervalNow();
+        duration = (endTime - mStartTime);
+
+        if (NS_FAILED(aStatus)) printf("channel failed.\n");
+        //        printf("read %d bytes\n", mBytesRead);
+
+        NS_ASSERTION(mBytesRead == mExpectedStreamLength,
+                     "Stream in cache is wrong length");
+
+        gTotalBytesRead += mBytesRead;
+        gTotalDuration += duration;
+
+        return NS_OK;
+    }
+
+protected:
+    PRIntervalTime       mStartTime;
+    PRUint32             mBytesRead;
+    nsITestDataStream*   mTestDataStream;
+    PRUint32             mExpectedStreamLength;
+};
+
+NS_IMPL_ISUPPORTS2(nsReader, nsIStreamListener, nsIStreamObserver)
+
+static nsIEventQueue* eventQueue;
+
+nsresult
+InitQueue() {
+    nsresult rv;
+
+    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue service");
+
+    rv = eventQService->CreateThreadEventQueue();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create event queue");
+  
+    rv = eventQService->GetThreadEventQueue(PR_CurrentThread(), &eventQueue);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get event queue for main thread");
+
+    return NS_OK;
+}
+
+// Process events until all streams are OnStopRequest'ed
+nsresult
+WaitForEvents() {
+    while (gNumReaders) {
+        eventQueue->ProcessPendingEvents();
+    }
+    return NS_OK;
+}
+
+// Read data for a single cache record and compare against testDataStream
+nsresult
+TestReadStream(nsINetDataCacheRecord *record, nsITestDataStream *testDataStream,
+               PRUint32 expectedStreamLength)
+{
+    nsCOMPtr<nsIChannel> channel;
+    nsresult rv;
+    PRUint32 actualContentLength;
+
+    rv = record->NewChannel(0, getter_AddRefs(channel));
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+    rv = record->GetStoredContentLength(&actualContentLength);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    NS_ASSERTION(actualContentLength == expectedStreamLength,
+                 "nsINetDataCacheRecord::GetContentLength() busted ?");
+    
+    nsReader *reader = new nsReader;
+    rv = reader->Init(testDataStream, expectedStreamLength);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    
+    rv = channel->AsyncRead(0, -1, 0, reader);
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+    reader->Release();
+
+    return NS_OK;
+}
+
+// Check that records can be retrieved using their record-ID, in addition
+// to using the opaque key.
+nsresult
+TestRecordID(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    RandomStream *randomStream;
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char *metaData;
+    PRUint32 testNum;
+    PRBool match;
+
+    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        rv = cache->GetCachedNetDataByID(recordID[testNum], getter_AddRefs(record));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't obtain record using record ID");
+
+        // Match against previously stored meta-data
+        rv = record->GetMetaData(&metaDataLength, &metaData);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get record meta-data");
+        match = randomStream->Match(metaData, metaDataLength);
+        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
+
+        nsAllocator::Free(metaData);
+        delete randomStream;
+    }
+    return NS_OK;
+}
+
+// Check that all cache entries in the database are enumerated and that
+// no duplicates appear.
+nsresult
+TestEnumeration(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsCOMPtr<nsISupports> tempISupports;
+    nsCOMPtr<nsISimpleEnumerator> iterator;
+    RandomStream *randomStream;
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char *metaData;
+    PRUint32 testNum;
+    PRBool match;
+    PRInt32 recID;
+
+    int numRecords = 0;
+
+    // Iterate over all records in the cache
+    rv = cache->NewCacheEntryIterator(getter_AddRefs(iterator));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create new cache entry iterator");
+
+    PRBool notDone;
+    while (1) {
+
+        // Done iterating ?
+        rv = iterator->HasMoreElements(&notDone);
+        if (NS_FAILED(rv)) return rv;
+        if (!notDone)
+            break;
+
+        // Get next record in iteration
+        rv = iterator->GetNext(getter_AddRefs(tempISupports));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "iterator bustage");
+        record = do_QueryInterface(tempISupports);
+
+        numRecords++;
+
+        // Get record ID
+        rv = record->GetRecordID(&recID);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get Record ID");
+        testNum = mapRecordIdToTestNum(recID);
+        NS_ASSERTION(testNum != -1, "Corrupted Record ID ?");
+
+        // Erase mapping from table, so that duplicate enumerations are detected
+        recordID[testNum] = -1;
+
+        // Make sure stream matches test data
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        // Match against previously stored meta-data
+        rv = record->GetMetaData(&metaDataLength, &metaData);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get record meta-data");
+        match = randomStream->Match(metaData, metaDataLength);
+        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
+        nsAllocator::Free(metaData);
+
+        delete randomStream;
+    }
+
+    NS_ASSERTION(numRecords == NUM_CACHE_ENTRIES, "Iteration bug");
+
+    return NS_OK;
+}
+
+// Read the test data that was written in FillCache(), checking for
+// corruption, truncation.
+nsresult
+TestRead(nsINetDataCache *cache)
+{
+    nsresult rv;
+    PRBool inCache;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    RandomStream *randomStream;
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char *metaData, *storedCacheKey;
+    PRUint32 testNum, storedCacheKeyLength;
+    PRBool match;
+
+    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        // Ensure that entry is in the cache
+        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(inCache, "nsINetDataCache::Contains error");
+        
+        rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        // Match against previously stored meta-data
+        match = record->GetMetaData(&metaDataLength, &metaData);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        match = randomStream->Match(metaData, metaDataLength);
+        NS_ASSERTION(match, "Meta-data corrupted or incorrect");
+        nsAllocator::Free(metaData);
+
+        // Test GetKey() method
+        rv = record->GetKey(&storedCacheKeyLength, &storedCacheKey);
+        NS_ASSERTION(NS_SUCCEEDED(rv) &&
+                     (storedCacheKeyLength == sizeof cacheKey) &&
+                     !memcmp(storedCacheKey, &cacheKey[0], sizeof cacheKey),
+                     "nsINetDataCacheRecord::GetKey failed");
+        nsAllocator::Free(storedCacheKey);
+
+        PRUint32 expectedStreamLength = randomStream->Next() % MAX_CONTENT_LENGTH;
+
+        TestReadStream(record, randomStream, expectedStreamLength);
+    }
+
+    WaitForEvents();
+
+    // Compute rate in MB/s
+    double rate = gTotalBytesRead / PR_IntervalToMilliseconds(gTotalDuration);
+    rate *= NUM_CACHE_ENTRIES;
+    rate *= 1000;
+    rate /= (1024 * 1024);
+    printf("Read %d bytes at a rate of %5.1f MB per second \n",
+           gTotalBytesRead, rate);
+
+    return NS_OK;
+}
+
+// Repeatedly call SetStoredContentLength() on a cache entry and make
+// read the stream's data to ensure that it's not corrupted by the effect
+nsresult
+TestTruncation(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    RandomStream *randomStream;
+    char cacheKey[CACHE_KEY_LENGTH];
+
+    randomStream = new RandomStream(0);
+    randomStream->Read(cacheKey, sizeof cacheKey);
+
+    rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+    NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+    randomStream->Skip(CACHE_METADATA_LENGTH);
+    PRUint32 initialStreamLength = randomStream->Next() % MAX_CONTENT_LENGTH;
+    delete randomStream;
+
+    PRUint32 i;
+    PRUint32 delta = initialStreamLength / 64;
+    for (i = initialStreamLength; i >= delta; i -= delta) {
+        PRUint32 expectedStreamLength = i;
+
+        // Do the truncation
+        record->SetStoredContentLength(expectedStreamLength);
+        randomStream = new RandomStream(0);
+        randomStream->Skip(CACHE_KEY_LENGTH + CACHE_METADATA_LENGTH + 1);
+
+        PRUint32 afterContentLength;
+        rv = record->GetStoredContentLength(&afterContentLength);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        NS_ASSERTION(afterContentLength == expectedStreamLength,
+                     "nsINetDataCacheRecord::SetContentLength() failed to truncate record");
+
+        TestReadStream(record, randomStream, expectedStreamLength);
+        WaitForEvents();
+    }
+
+    return NS_OK;
+}
+
+// Write known data to random offsets in a single cache entry and test
+// resulting stream for correctness.
+nsresult
+TestOffsetWrites(nsINetDataCache *cache)
+{
+    nsresult rv;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsCOMPtr<nsIChannel> channel;
+    nsCOMPtr<nsIOutputStream> outStream;
+    char buf[512];
+    char cacheKey[CACHE_KEY_LENGTH];
+    RandomStream *randomStream;
+
+    randomStream = new RandomStream(0);
+    randomStream->Read(cacheKey, sizeof cacheKey);
+
+    rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access record via opaque cache key");
+
+
+    // Write buffer-fulls of data at random offsets into the cache entry.
+    // Data written is (offset % 0xff)
+    PRUint32 startingOffset;
+    PRUint32 streamLength = 0;
+    CounterStream *counterStream;
+    int i;
+    for (i = 0; i < 100; i++) {
+        rv = record->NewChannel(0, getter_AddRefs(channel));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        startingOffset = streamLength ? streamLength - (randomStream->Next() % sizeof buf): 0;
+        rv = channel->OpenOutputStream(startingOffset, getter_AddRefs(outStream));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        
+        counterStream = new CounterStream(startingOffset);
+        counterStream->Read(buf, sizeof buf);
+
+        PRUint32 numWritten;
+        rv = outStream->Write(buf, sizeof buf, &numWritten);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(numWritten == sizeof buf, "Write() bug?");
+        streamLength = startingOffset + sizeof buf;
+
+        rv = outStream->Close();
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't close channel");
+        delete counterStream;
+    }
+    
+    delete randomStream;
+
+    counterStream = new CounterStream(0);
+    TestReadStream(record, counterStream, streamLength);
+    WaitForEvents();
+
+    return NS_OK;
+}
+
+// Create entries in the network data cache, using random data for the
+// key, the meta-data and the stored content data.
+nsresult
+FillCache(nsINetDataCache *cache)
+{
+    nsresult rv;
+    PRBool inCache;
+    nsCOMPtr<nsINetDataCacheRecord> record;
+    nsCOMPtr<nsIChannel> channel;
+    nsCOMPtr<nsIOutputStream> outStream;
+    char buf[1000];
+    PRUint32 metaDataLength;
+    char cacheKey[CACHE_KEY_LENGTH];
+    char metaData[CACHE_METADATA_LENGTH];
+    PRUint32 testNum;
+    char *data;
+    RandomStream *randomStream;
+    PRUint32 totalBytesWritten = 0;
+
+    PRIntervalTime startTime = PR_IntervalNow();
+    
+    for (testNum = 0; testNum < NUM_CACHE_ENTRIES; testNum++) {
+        randomStream = new RandomStream(testNum);
+        randomStream->Read(cacheKey, sizeof cacheKey);
+
+        // No entry should be in cache until we add it
+        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(!inCache, "nsINetDataCache::Contains error");
+        
+        rv = cache->GetCachedNetData(cacheKey, sizeof cacheKey, getter_AddRefs(record));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't access record via opaque cache key");
+
+        // Test nsINetDataCacheRecord::GetRecordID()
+        rv = record->GetRecordID(&recordID[testNum]);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get Record ID");
+
+        // Test nsINetDataCache::GetNumEntries()
+        PRUint32 numEntries = (PRUint32)-1;
+        rv = cache->GetNumEntries(&numEntries);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+        NS_ASSERTION(numEntries == testNum + 1, "GetNumEntries failure");
+
+        // Record meta-data should be initially empty
+        rv = record->GetMetaData(&metaDataLength, &data);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        if ((metaDataLength != 0) || (data != 0))
+            return NS_ERROR_FAILURE;
+
+        // Store random data as meta-data
+        randomStream->Read(metaData, sizeof metaData);
+        record->SetMetaData(sizeof metaData, metaData);
+
+        rv = record->NewChannel(0, getter_AddRefs(channel));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+
+        rv = channel->OpenOutputStream(0, getter_AddRefs(outStream));
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        
+        PRUint32 beforeOccupancy;
+        rv = cache->GetStorageInUse(&beforeOccupancy);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+
+        int streamLength = randomStream->Next() % MAX_CONTENT_LENGTH;
+        int remaining = streamLength;
+        while (remaining) {
+            PRUint32 numWritten;
+            int amount = PR_MIN(sizeof buf, remaining);
+            randomStream->Read(buf, amount);
+
+            rv = outStream->Write(buf, amount, &numWritten);
+            NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+            NS_ASSERTION(numWritten == (PRUint32)amount, "Write() bug?");
+            
+            remaining -= amount;
+        }
+        outStream->Close();
+        totalBytesWritten += streamLength;
+
+        PRUint32 afterOccupancy;
+        rv = cache->GetStorageInUse(&afterOccupancy);
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+        PRUint32 streamLengthInKB = streamLength >> 10;
+        NS_ASSERTION((afterOccupancy - beforeOccupancy) >= streamLengthInKB,
+                     "nsINetDataCache::GetStorageInUse() is busted");
+        
+
+        // *Now* there should be an entry in the cache
+        rv = cache->Contains(cacheKey, sizeof cacheKey, &inCache);
+        NS_ASSERTION(NS_SUCCEEDED(rv), " ");
+        NS_ASSERTION(inCache, "nsINetDataCache::Contains error");
+
+        delete randomStream;
+    }
+
+    PRIntervalTime endTime = PR_IntervalNow();
+
+    // Compute rate in MB/s
+    double rate = totalBytesWritten / PR_IntervalToMilliseconds(endTime - startTime);
+    rate *= 1000;
+    rate /= (1024 * 1024);
+    printf("Wrote %7d bytes at a rate of %5.1f MB per second \n",
+           totalBytesWritten, rate);
+
+    return NS_OK;
+}
+
+nsresult NS_AutoregisterComponents()
+{
+  nsresult rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,
+                                                 NULL /* default */);
+  return rv;
+}
+
+PRBool initPref ()
+{
+    nsresult rv;
+    NS_WITH_SERVICE(nsIPref, prefPtr, kPrefCID, &rv);
+    if (NS_FAILED(rv))
+        return false;
+               
+    nsCOMPtr<nsIFileSpec> fileSpec;
+    rv = NS_NewFileSpec (getter_AddRefs(fileSpec));
+    if (NS_FAILED(rv))
+        return false;
+                            
+    nsCString defaultPrefFile = PR_GetEnv ("MOZILLA_FIVE_HOME");
+    if (defaultPrefFile.Length())
+        defaultPrefFile += "/";
+    else
+        defaultPrefFile = "./";
+    defaultPrefFile += "default_prefs.js";
+                                                 
+    fileSpec->SetUnixStyleFilePath (defaultPrefFile.GetBuffer());
+                                                    
+    PRBool exists = false;
+    fileSpec->Exists(&exists);
+    if (exists)
+        prefPtr->ReadUserPrefsFrom(fileSpec);
+    else
+        return false;
+    return true;
+}
+
+int
+main(int argc, char* argv[])
+{
+    nsresult rv;
+
+    if(argc <2) {
+      printf(" %s -f to test filecache\n", argv[0]) ;
+      printf(" %s -m to test memcache\n", argv[0]) ;
+      return -1 ;
+    }
+
+
+    rv = NS_AutoregisterComponents();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't register XPCOM components");
+
+    nsCOMPtr<nsINetDataCache> cache;
+
+    if (PL_strcasecmp(argv[1], "-m") == 0) {
+        rv = nsComponentManager::CreateInstance(kMemCacheCID, nsnull,
+                                            NS_GET_IID(nsINetDataCache),
+                                            getter_AddRefs(cache));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create memory cache factory");
+    } else if (PL_strcasecmp(argv[1], "-f") == 0) {
+
+        nsCOMPtr<nsINetDataDiskCache> diskcache ;
+
+        rv = nsComponentManager::CreateInstance(kDiskCacheCID, nsnull,
+                                            NS_GET_IID(nsINetDataDiskCache),
+                                             getter_AddRefs(diskcache));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't create disk cache factory") ;
+        
+        nsCOMPtr<nsIFileSpec> folder ;
+        NS_NewFileSpec(getter_AddRefs(folder)) ;
+        folder->SetUnixStyleFilePath("/tmp") ;
+        diskcache->SetDiskCacheFolder(folder) ;
+
+        cache = diskcache ;
+
+    } else {
+      printf("  %s -f to test filecache\n", argv[0]) ;
+      printf(" %s -m to test memcache\n", argv[0]) ;
+      return -1 ;
+    }
+
+    InitQueue();
+
+    PRUnichar* description;
+    rv = cache->GetDescription(&description);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache description");
+    nsCAutoString descStr(description);
+    printf("Testing: %s\n", descStr.GetBuffer());
+
+    rv = cache->RemoveAll();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
+
+    PRUint32 startOccupancy;
+    rv = cache->GetStorageInUse(&startOccupancy);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+
+    PRUint32 numEntries = (PRUint32)-1;
+    rv = cache->GetNumEntries(&numEntries);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
+
+    rv = FillCache(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't fill cache with random test data");
+
+    rv = TestRead(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't read random test data from cache");
+
+    rv = TestRecordID(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't index records using record ID");
+
+    rv = TestEnumeration(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully enumerate records");
+
+    rv = TestTruncation(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully truncate records");
+
+    rv = TestOffsetWrites(cache);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully write to records using non-zero offsets");
+
+    rv = cache->RemoveAll();
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't clear cache");
+    rv = cache->GetNumEntries(&numEntries);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get number of cache entries");
+    NS_ASSERTION(numEntries == 0, "Couldn't clear cache");
+
+    PRUint32 endOccupancy;
+    rv = cache->GetStorageInUse(&endOccupancy);
+
+    NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't get cache occupancy");
+
+    NS_ASSERTION(startOccupancy == endOccupancy, "Cache occupancy not correctly computed ?");
+
+    return 0;
+}
+

mozilla/netwerk/test/makefile.win

@@ -0,0 +1,82 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..
+
+MAKE_OBJ_TYPE	= EXE
+PROG1 = .\$(OBJDIR)\TestFileInput.exe
+PROG2 = .\$(OBJDIR)\TestSocketInput.exe
+PROG3 = .\$(OBJDIR)\TestSocketIO.exe
+PROG4 = .\$(OBJDIR)\TestProtocols.exe
+PROG5 = .\$(OBJDIR)\TestSocketTransport.exe
+PROG6 = .\$(OBJDIR)\urltest.exe
+PROG7 = .\$(OBJDIR)\TestFileInput2.exe
+PROG8 = .\$(OBJDIR)\TestFileTransport.exe
+PROG9 = .\$(OBJDIR)\TestRes.exe
+PROGA = .\$(OBJDIR)\TestRawCache.exe
+PROGB = .\$(OBJDIR)\TestCacheMgr.exe
+PROGRAMS = \
+#$(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5) $(PROG6) $(PROG7) $(PROG8) $(PROG9)\
+          $(PROGA) $(PROGB)
+
+LCFLAGS=-DUSE_NSREG -GX
+
+REQUIRES=libreg
+
+INCS = $(INCS)                  \
+        -I$(DEPTH)\dist\include \
+        $(NULL)
+
+LLIBS=                 \
+ $(DIST)\lib\xpcom.lib \
+ $(LIBNSPR)            \
+ $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(PROGRAMS)
+	-for %p in ($(PROGRAMS)) do $(MAKE_INSTALL) %p $(DIST)\bin
+
+clobber::
+	-for %p in ($(PROGRAMS)) do $(RM) %p $(DIST)\bin\%p
+
+$(PROG1): $(OBJDIR) TestFileInput.cpp
+
+$(PROG2): $(OBJDIR) TestSocketInput.cpp
+
+$(PROG3): $(OBJDIR) TestSocketIO.cpp
+
+$(PROG4): $(OBJDIR) TestProtocols.cpp
+
+$(PROG5): $(OBJDIR) TestSocketTransport.cpp
+
+$(PROG6): $(OBJDIR) urltest.cpp
+
+$(PROG7): $(OBJDIR) TestFileInput2.cpp
+
+$(PROG8): $(OBJDIR) TestFileTransport.cpp
+
+$(PROG9): $(OBJDIR) TestRes.cpp
+
+$(PROGA): $(OBJDIR) TestRawCache.cpp
+
+$(PROGB): $(OBJDIR) TestCacheMgr.cpp
+

mozilla/webtools/bugzilla/CHANGES

@@ -1,404 +0,0 @@
-This file contains only important changes made to Bugzilla.  If you
-are updating from an older verseion, make sure that you check this file!
-
-For a more complete list of what has changed, use Bonsai
-(http://cvs-mirror.mozilla.org/webtools/bonsai/cvsqueryform.cgi) to
-query the CVS tree.  For example,
-
-    http://cvs-mirror.mozilla.org/webtools/bonsai/cvsquery.cgi?module=all&branch=HEAD&branchtype=match&dir=mozilla%2Fwebtools%2Fbugzilla&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot 
-
-will tell you what has been changed in the last week.
-
-
-10/12/99 The CHANGES file is now obsolete!  There is a new file called
-checksetup.pl.  You should get in the habit of running that file every time
-you update your installation of Bugzilla.  That file will be constantly 
-updated to automatically update your installation to match any code changes.
-If you're curious as to what is going on, changes are commented in that file, 
-at the end.
-
-Many thanks to Holger Schurig <holgerschurig@nikocity.de> for writing this
-script!
-
-
-
-10/11/99 Restructured voting database to add a cached value in each
-bug recording how many total votes that bug has.  While I'm at it, I
-removed the unused "area" field from the bugs database.  It is
-distressing to realize that the bugs table has reached the maximum
-number of indices allowed by MySQL (16), which may make future
-enhancements awkward.
-
-You must feed the following to MySQL:
-
-	alter table bugs drop column area;
-	alter table bugs add column votes mediumint not null, add index (votes);
-
-You then *must* delete the data/versioncache file when you make this
-change, as it contains references to the "area" field.  Deleting it is safe,
-bugzilla will correctly regenerate it.
-
-If you have been using the voting feature at all, then you will then
-need to update the voting cache.  You can do this by visiting the
-sanitycheck.cgi page, and taking it up on its offer to rebuild the
-votes stuff.
-
-
-10/7/99 Added voting ability.  You must run the new script
-"makevotestable.sh".  You must also feed the following to mysql:
-
-	alter table products add column votesperuser smallint not null;
-
-
-
-9/15/99 Apparently, newer alphas of MySQL won't allow you to have
-"when" as a column name.  So, I have had to rename a column in the
-bugs_activity table.  You must feed the below to mysql or you won't
-work at all.
-
-	alter table bugs_activity change column when bug_when datetime not null;
-
-
-8/16/99 Added "OpenVMS" to the list of OS's. Feed this to mysql:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "Mac System 8.6", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "Neutrino", "OS/2", "BeOS", "OpenVMS", "other") not null;
-
-6/22/99 Added an entry to the attachments table to record who the submitter
-was.  Nothing uses this yet, but it still should be recorded.
-
-	alter table attachments add column submitter_id mediumint not null;
-
-You should also run this script to populate the new field:
-
-#!/usr/bonsaitools/bin/perl -w
-use diagnostics;
-use strict;
-require "globals.pl";
-$|=1;
-ConnectToDatabase();
-SendSQL("select bug_id, attach_id from attachments order by bug_id");
-my @list;
-while (MoreSQLData()) {
-    my @row = FetchSQLData();
-    push(@list, \@row);
-}
-foreach my $ref (@list) {
-    my ($bug, $attach) = (@$ref);
-    SendSQL("select long_desc from bugs where bug_id = $bug");
-    my $comment = FetchOneColumn() . "Created an attachment (id=$attach)";
-
-    if ($comment =~ m@-* Additional Comments From ([^ ]*)[- 0-9/:]*\nCreated an attachment \(id=$attach\)@) {
-	print "Found $1\n";
-	SendSQL("select userid from profiles where login_name=" .
-		SqlQuote($1));
-	my $userid = FetchOneColumn();
-	if (defined $userid && $userid > 0) {
-	    SendSQL("update attachments set submitter_id=$userid where attach_id = $attach");
-	}
-    } else {
-	print "Bug $bug can't find comment for attachment $attach\n";
-    }
-}
-
-
-
-
-
-
-6/14/99 Added "BeOS" to the list of OS's. Feed this to mysql:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "Mac System 8.6", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "Neutrino", "OS/2", "BeOS", "other") not null;
-
-
-5/27/99 Added support for dependency information.  You must run the new
-"makedependenciestable.sh" script.  You can turn off dependencies with the new
-"usedependencies" param, but it defaults to being on.  Also, read very
-carefully the description for the new "webdotbase" param; you will almost
-certainly need to tweak it.
-
-
-5/24/99 Added "Mac System 8.6" and "Neutrino" to the list of OS's.
-Feed this to mysql:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "Mac System 8.6", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "Neutrino", "OS/2", "other") not null;
-
-
-5/12/99 Added a pref to control how much email you get.  This needs a new
-column in the profiles table, so feed the following to mysql:
-
-	alter table profiles add column emailnotification enum("ExcludeSelfChanges", "CConly", "All") not null default "ExcludeSelfChanges";
-
-5/5/99 Added the ability to search by creation date.  To make this perform
-well, you ought to do the following:
-
-	alter table bugs change column creation_ts creation_ts datetime not null, add index (creation_ts);
-
-
-4/30/99 Added a new severity, "blocker".  To get this into your running
-Bugzilla, do the following:
-
-	alter table bugs change column bug_severity bug_severity enum("blocker", "critical", "major", "normal", "minor", "trivial", "enhancement") not null;
-
-
-4/22/99 There was a bug where the long descriptions of bugs had a variety of
-newline characters at the end, depending on the operating system of the browser
-that submitted the text.  This bug has been fixed, so that no further changes
-like that will happen.  But to fix problems that have already crept into your
-database, you can run the following perl script (which is slow and ugly, but
-does work:)
-#!/usr/bonsaitools/bin/perl -w
-use diagnostics;
-use strict;
-require "globals.pl";
-$|=1;
-ConnectToDatabase();
-SendSQL("select bug_id from bugs order by bug_id");
-my @list;
-while (MoreSQLData()) {
-    push(@list, FetchOneColumn());
-}
-foreach my $id (@list) {
-    if ($id % 50 == 0) {
-	print "\n$id ";
-    }
-    SendSQL("select long_desc from bugs where bug_id = $id");
-    my $comment = FetchOneColumn();
-    my $orig = $comment;
-    $comment =~ s/\r\n/\n/g;     # Get rid of windows-style line endings.
-    $comment =~ s/\r/\n/g;       # Get rid of mac-style line endings.
-    if ($comment ne $orig) {
-	SendSQL("update bugs set long_desc = " . SqlQuote($comment) .
-		" where bug_id = $id");
-	print ".";
-    } else {
-	print "-";
-    }
-}
-
-
-
-4/8/99 Added ability to store patches with bugs.  This requires a new table
-to store the data, so you will need to run the "makeattachmenttable.sh" script.
-
-3/25/99 Unfortunately, the HTML::FromText CPAN module had too many bugs, and
-so I had to roll my own.  We no longer use the HTML::FromText CPAN module.
-
-3/24/99 (This entry has been removed.  It used to say that we required the
-HTML::FromText CPAN module, but that's no longer true.)
-
-3/22/99 Added the ability to query by fields which have changed within a date
-range.  To make this perform a bit better, we need a new index:
-
-	alter table bugs_activity add index (field);
-
-3/10/99 Added 'groups' stuff, where we have different group bits that we can
-put on a person or on a bug.  Some of the group bits control access to bugzilla
-features.  And a person can't access a bug unless he has every group bit set
-that is also set on the bug.  See the comments in makegroupstable.sh for a bit
-more info.
-
-The 'maintainer' param is now used only as an email address for people to send
-complaints to.  The groups table is what is now used to determine permissions.
-
-You will need to run the new script "makegroupstable.sh".  And then you need to
-feed the following lines to MySQL (replace XXX with the login name of the
-maintainer, the person you wish to be all-powerful).
-
-	alter table bugs add column groupset bigint not null;
-	alter table profiles add column groupset bigint not null;
-	update profiles set groupset=0x7fffffffffffffff where login_name = XXX;
-
-
-
-3/8/99 Added params to control how priorities are set in a new bug.  You can
-now choose whether to let submitters of new bugs choose a priority, or whether
-they should just accept the default priority (which is now no longer hardcoded
-to "P2", but is instead a param.)  The default value of the params will cause
-the same behavior as before.
-
-3/3/99 Added a "disallownew" field to the products table.  If non-zero, then
-don't let people file new bugs against this product.  (This is for when a 
-product is retired, but you want to keep the bug reports around for posterity.)
-Feed this to MySQL:
-
-	alter table products add column disallownew tinyint not null;
-
-
-2/8/99 Added FreeBSD to the list of OS's.  Feed this to MySQL:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "FreeBSD", "OSF/1", "Solaris", "SunOS", "OS/2", "other") not null;
-
-
-2/4/99 Added a new column "description" to the components table, and added 
-links to a new page which will use this to describe the components of a 
-given product.  Feed this to MySQL:
-
-	alter table components add column description mediumtext not null;
-
-
-2/3/99 Added a new column "initialqacontact" to the components table that gives
-an initial QA contact field.  It may be empty if you wish the initial qa
-contact to be empty.  If you're not using the QA contact field, you don't need
-to add this column, but you might as well be safe and add it anyway:
-
-	alter table components add column initialqacontact tinytext not null;
-
-
-2/2/99 Added a new column "milestoneurl" to the products table that gives a URL
-which is to describe the currently defined milestones for a product.  If you
-don't use target milestone, you might be able to get away without adding this
-column, but you might as well be safe and add it anyway:
-
-	alter table products add column milestoneurl tinytext not null;
-
-
-1/29/99 Whoops; had a mispelled op_sys.  It was "Mac System 7.1.6"; it should
-be "Mac System 7.6.1".  It turns out I had no bugs with this value set, so I
-could just do the below simple command.  If you have bugs with this value, you
-may need to do something more complicated.
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.6.1", "Mac System 8.0", "Mac System 8.5", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "OSF/1", "Solaris", "SunOS", "OS/2", "other") not null;
-
-
-
-1/20/99 Added new fields: Target Milestone, QA Contact, and Status Whiteboard.
-These fields are all optional in the UI; there are parameters to turn them on.
-However, whether or not you use them, the fields need to be in the DB.  There
-is some code that needs them, even if you don't.
-
-To update your DB to have these fields, send the following to MySQL:
-
-        alter table bugs add column target_milestone varchar(20) not null,
-                add column qa_contact mediumint not null,
-                add column status_whiteboard mediumtext not null,
-                add index (target_milestone), add index (qa_contact);
-
-
-
-1/18/99 You can now query by CC.  To make this perform reasonably, the CC table
-needs some indices.  The following MySQL does the necessary stuff:
-
-	alter table cc add index (bug_id), add index (who);
-
-
-1/15/99 The op_sys field can now be queried by (and more easily tweaked).
-To make this perform reasonably, it needs an index.  The following MySQL 
-command will create the necessary index:
-
-	alter table bugs add index (op_sys);
-
-
-12/2/98 The op_sys and rep_platform fields have been tweaked.  op_sys
-is now an enum, rather than having the legal values all hard-coded in
-perl.  rep_platform now no longer allows a value of "X-Windows".
-
-Here's how I ported to the new world.  This ought to work for you too.
-Actually, it's probably overkill.  I had a lot of illegal values for op_sys
-in my tables, from importing bugs from strange places.  If you haven't done 
-anything funky, then much of the below will be a no-op.
-
-First, send the following commands to MySQL to make sure all your values for
-rep_platform and op_sys are legal in the new world..
-
-	update bugs set rep_platform="Sun" where rep_platform="X-Windows" and op_sys like "Solaris%";
-	update bugs set rep_platform="SGI" where rep_platform="X-Windows" and op_sys = "IRIX";
-	update bugs set rep_platform="SGI" where rep_platform="X-Windows" and op_sys = "HP-UX";
-	update bugs set rep_platform="DEC" where rep_platform="X-Windows" and op_sys = "OSF/1";
-	update bugs set rep_platform="PC" where rep_platform="X-Windows" and op_sys = "Linux";
-	update bugs set rep_platform="other" where rep_platform="X-Windows";
-	update bugs set rep_platform="other" where rep_platform="";
-	update bugs set op_sys="Mac System 7" where op_sys="System 7";
-	update bugs set op_sys="Mac System 7.5" where op_sys="System 7.5";
-	update bugs set op_sys="Mac System 8.0" where op_sys="8.0";
-	update bugs set op_sys="OSF/1" where op_sys="Digital Unix 4.0";
-	update bugs set op_sys="IRIX" where op_sys like "IRIX %";
-	update bugs set op_sys="HP-UX" where op_sys like "HP-UX %";
-	update bugs set op_sys="Windows NT" where op_sys like "NT %";
-	update bugs set op_sys="OSF/1" where op_sys like "OSF/1 %";
-	update bugs set op_sys="Solaris" where op_sys like "Solaris %";
-	update bugs set op_sys="SunOS" where op_sys like "SunOS%";
-	update bugs set op_sys="other" where op_sys = "Motif";
-	update bugs set op_sys="other" where op_sys = "Other";
-
-Next, send the following commands to make sure you now have only legal
-entries in your table.  If either of the queries do not come up empty, then
-you have to do more stuff like the above.
-
-	select bug_id,op_sys,rep_platform from bugs where rep_platform not regexp "^(All|DEC|HP|Macintosh|PC|SGI|Sun|X-Windows|Other)$";
-	select bug_id,op_sys,rep_platform from bugs where op_sys not regexp "^(All|Windows 3.1|Windows 95|Windows 98|Windows NT|Mac System 7|Mac System 7.5|Mac System 7.1.6|Mac System 8.0|AIX|BSDI|HP-UX|IRIX|Linux|OSF/1|Solaris|SunOS|other)$";
-
-Finally, once that's all clear, alter the table to make enforce the new legal
-entries:
-
-	alter table bugs change column op_sys op_sys enum("All", "Windows 3.1", "Windows 95", "Windows 98", "Windows NT", "Mac System 7", "Mac System 7.5", "Mac System 7.1.6", "Mac System 8.0", "AIX", "BSDI", "HP-UX", "IRIX", "Linux", "OSF/1", "Solaris", "SunOS", "other") not null, change column rep_platform rep_platform enum("All", "DEC", "HP", "Macintosh", "PC", "SGI", "Sun", "Other");
-
-
-
-
-
-11/20/98 Added searching of CC field.  To better support this, added
-some indexes to the CC table.  You probably want to execute the following
-mysql commands:
-
-	alter table cc add index (bug_id);
-	alter table cc add index (who);
-
-
-10/27/98 security check for legal products in place. bug charts are not
-available as an option if collectstats.pl has never been run. all products 
-get daily stats collected now. README updated: Chart::Base is listed as
-a requirement, instructions for using collectstats.pl included as 
-an optional step. also got silly and added optional quips to bug
-reports. 
-
-10/17/98 modified README installation instructions slightly. 
-
-10/7/98 Added a new table called "products".  Right now, this is used
-only to have a description for each product, and that description is
-only used when initially adding a new bug.  Anyway, you *must* create
-the new table (which you can do by running the new makeproducttable.sh
-script).  If you just leave it empty, things will work much as they
-did before, or you can add descriptions for some or all of your
-products.
-
-
-9/15/98 Everything has been ported to Perl.  NO MORE TCL.  This
-transition should be relatively painless, except for the "params"
-file.  This is the file that contains parameters you've set up on the
-editparams.cgi page.  Before changing to Perl, this was a tcl-syntax
-file, stored in the same directory as the code; after the change to
-Perl, it becomes a perl-syntax file, stored in a subdirectory named
-"data".  See the README file for more details on what version of Perl
-you need.
-
-So, if updating from an older version of Bugzilla, you will need to
-edit data/param, change the email address listed for
-$::param{'maintainer'}, and then go revisit the editparams.cgi page
-and reset all the parameters to your taste.  Fortunately, your old
-params file will still be around, and so you ought to be able to
-cut&paste important bits from there.
-
-Also, note that the "whineatnews" script has changed name (it now has
-an extension of .pl instead of .tcl), so you'll need to change your
-cron job.
-
-And the "comments" file has been moved to the data directory.  Just do
-"cat comments >> data/comments" to restore any old comments that may
-have been lost.
-
-
-
-9/2/98 Changed the way password validation works.  We now keep a
-crypt'd version of the password in the database, and check against
-that.  (This is silly, because we're also keeping the plaintext
-version there, but I have plans...)  Stop passing the plaintext
-password around as a cookie; instead, we have a cookie that references
-a record in a new database table, logincookies.
-
-IMPORTANT: if updating from an older version of Bugzilla, you must run
-the following commands to keep things working:
-
- ./makelogincookiestable.sh
- echo "alter table profiles add column cryptpassword varchar(64);" | mysql bugs
- echo "update profiles set cryptpassword = encrypt(password,substring(rand(),3, 4));" | mysql bugs
-

mozilla/webtools/bugzilla/README

@@ -1,477 +0,0 @@
-This is Bugzilla.  See <http://www.mozilla.org/bugs/>.
-
-
-        ==========
-        DISCLAIMER
-        ==========
-
-   This is not very well packaged code.  It's not packaged at all.  Don't
-come here expecting something you plop in a directory, twiddle a few
-things, and you're off and using it.  Work has to be done to get there.  
-We'd like to get there, but it wasn't clear when that would be, and so we
-decided to let people see it first.
-
-        ============
-        INSTALLATION
-        ============
-
-0. Introduction
-
-   Installation of bugzilla is pretty straight forward, especially if your
-machine already has MySQL and the MySQL-related perl packages installed.
-If those aren't installed yet, then that's the first order of business.  The
-other necessary ingredient is a web server set up to run cgi scripts.
-
-1. Installing the Prerequisites
-
-   The software packages necessary for the proper running of bugzilla are:
-
-        1. MySQL database server and the mysql client
-        2. Perl (5.004 or greater)
-        3. DBI Perl module 
-        4. Data::Dumper Perl module
-        5. MySQL related Perl module collection
-        6. TimeDate Perl module collection
-        7. GD perl module (1.18 or 1.19)
-        8. Chart::Base Perl module (0.99 through 0.99b)
-        9. The web server of your choice
-
-   Bugzilla has quite a few prerequisites, but none of them are TCL.
-Previous versions required TCL, but it no longer needed (or used).
-
-1.1. Getting and setting up MySQL database
-
-   Visit MySQL homepage at http://www.mysql.org and grab the latest stable
-release of the server.  Both binaries and source are available and which
-you get shouldn't matter.  Be aware that many of the binary versions
-of MySQL store their data files in /var which on many installations
-(particularly common with linux installations) is part of a smaller
-root partition.  If you decide to build from sources you can easily set
-the dataDir as an option to configure.
-
-  If you've installed from source or non-package (RPM, deb, etc.) binaries
-you'll want to make sure to add mysqld to your init scripts so the server
-daemon will come back up whenever your machine reboots.
-
-  You also may want to edit those init scripts, to make sure that
-mysqld will accept large packets.  By default, mysqld is set up to only
-accept packets up to 64K long.  This limits the size of attachments you
-may put on bugs.  If you add something like "-O max_allowed_packet=1M"
-to the command that starts mysqld (or safe_mysqld), then you will be
-able to have attachments up to about 1 megabyte.
-
-1.2. Perl (5.004 or greater)
-
-  Any machine that doesn't have perl on it is a sad machine indeed.  Perl
-for *nix systems can be gotten in source form from http://www.perl.com.
-
-  Perl is now a far cry from the the single compiler/interpreter binary it
-once was. It now includes a great many required modules and quite a
-few other support files.  If you're not up to or not inclined to build
-perl from source, you'll want to install it on your machine using some
-sort of packaging system (be it RPM, deb, or what have you) to ensure
-a sane install.  In the subsequent sections you'll be installing quite
-a few perl modules; this can be quite ornery if your perl installation
-isn't up to snuff.
-
-1.3. DBI Perl module
-
-   The DBI module is a generic Perl module used by other database related
-Perl modules.  For our purposes it's required by the MySQL-related
-modules.  As long as your Perl installation was done correctly the
-DBI module should be a breeze.  It's a mixed Perl/C module, but Perl's
-MakeMaker system simplifies the C compilation greatly.
-
-  Like almost all Perl modules DBI can be found on the Comprehensive Perl
-Archive Network (CPAN) at http://www.cpan.org .  The CPAN servers have a
-real tendency to bog down, so please use mirrors.  The current location
-at the time of this writing (02/17/99) can be found in Appendix A.
-
-  Quality, general Perl module installation instructions can be found on
-the CPAN website, but basically you'll just need to:
-
-        1. Untar the module tarball -- it should create its own directory
-        2. Enter the following commands:
-                perl Makefile.PL
-                make
-                make test
-                make install
-
-   If everything went ok that should be all it takes.  For the vast
-majority of perl modules this is all that's required.
-
-1.4 Data::Dumper Perl module
-
-   The Data::Dumper module provides data structure persistence for Perl
-(similar to Java's serialization).  It comes with later sub-releases of
-Perl 5.004, but a re-installation just to be sure it's available won't
-hurt anything.
-
-   Data::Dumper is used by the MySQL related Perl modules.  It can be
-found on CPAN (link in Appendix A) and can be installed by following
-the same four step make sequence used for the DBI module.
-
-1.5. MySQL related Perl module collection
-
-   The Perl/MySQL interface requires a few mutually-dependent perl
-modules.  These modules are grouped together into the the
-Msql-Mysql-modules package.  This package can be found at CPAN (link
-in Appendix A).  After the archive file has been downloaded it should
-be untarred.
-
-   The MySQL modules are all build using one make file which is generated
-by running:
-
-        perl Makefile.PL
-
-   The MakeMaker process will ask you a few questions about the desired
-compilation target and your MySQL installation.  For many of the questions
-the provided default will be adequate.
-
-   When asked if your desired target is the MySQL or mSQL packages
-selected the MySQL related ones.  Later you will be asked if you wish
-to provide backwards compatibility with the older MySQL packages; you
-must answer YES to this question.  The default will be no, and if you
-select it things won't work later.
-
-   A host of 'localhost' should be fine and a testing user of 'test' and
-a null password should find itself with sufficient access to run tests
-on the 'test' database which MySQL created upon installation.  If 'make
-test' and 'make install' go through without errors you should be ready
-to go as far as database connectivity is concerned.
-
-1.6. TimeDate Perl module collection
-
-   Many of the more common date/time/calendar related Perl modules have
-been grouped into a bundle similar to the MySQL modules bundle. This
-bundle is stored on the CPAN under the name TimeDate.  A (hopefully
-current) link can be found in Appendix A.  The component module we're
-most interested in is the Date::Format module, but installing all of them
-is probably a good idea anyway.  The standard Perl module installation
-instructions should work perfectly for this simple package.
-
-1.7. GD Perl module (1.18 or 1.19)
-
-   The GD library was written by Thomas Boutell a long while ago to
-programatically generate images in C.  Since then it's become almost a
-defacto standard for programatic image construction.  The Perl bindings
-to it found in the GD library are used on a million web pages to generate
-graphs on the fly.  That's what bugzilla will be using it for so you'd
-better install it if you want any of the graphing to work.
-    Actually bugzilla uses the Graph module which relies on GD itself,
-but isn't that always the way with OOP.  At any rate, you can find the
-GD library on CPAN (link in Appendix A).  Note, however, that you MUST
-use version 1.18 or 1.19, because newer versions have dropped support
-for GIFs in favor of PNGs, and bugzilla has not yet been updated to
-deal with this.
-
-1.8. Chart::Base Perl module (0.99 through 0.99b)
-
-   The Chart module provides bugzilla with on-the-fly charting
-abilities.  It can be installed in the usual fashion after it has been
-fetched from CPAN where it is found as the Chart-x.x... tarball in a
-directory to be listed in Appendix A.  Note that as with the GD perl
-module, only the specific versions listed above will work.
-
-1.9. HTTP server
-
-   You have a freedom of choice here - Apache, Netscape or any other
-server on UNIX would do. You can easily run the web server on a different
-machine than MySQL, but that makes MySQL permissions harder to manage.
-
-   You'll want to make sure that your web server will run any file
-with the .cgi extension as a cgi and not just display it.  If you're using
-apache that means uncommenting the following line in the srm.conf file:
-
-        AddHandler cgi-script .cgi
-
-   With apache you'll also want to make sure that within the access.conf
-file the line:
-
-        Options ExecCGI
-
-is in the stanza that covers the directories you intend to put the
-bugzilla .html and .cgi files into.
-
-2. Installing the Bugzilla Files
-
-   You should untar the bugzilla files into a directory that you're
-willing to make writable by the default web server user (probably
-'nobody').  You may decide to put the files off of the main web space
-for your web server or perhaps off of /usr/local with a symbolic link
-in the web space that points to the bugzilla directory.  At any rate,
-just dump all the files in the same place (optionally omitting the CVS
-directory if it accidentally got tarred up with the rest of bugzilla)
-and make sure you can get at the files in that directory through your
-web server.
-
-   Once all the files are in a web accessible directory, make that
-directory writable by your webserver's user (which may require just
-making it world writable).  
-        
-   Lastly, you'll need to set up a symbolic link from /usr/bonsaitools/bin
-to the correct location of your perl executable (probably /usr/bin/perl).
-Or, you'll have to hack all the .cgi files to change where they look
-for perl.
-
-3. Setting Up the MySQL database
-
-   After you've gotten all the software installed and working you're ready
-to start preparing the database for its life as a the back end to a high
-quality bug tracker.
-
-    First, you'll want to fix MySQL permissions.  Bugzilla always logs
-in as user "bugs", with no password.  That needs to work.  MySQL
-permissions are a deep, nasty complicated thing.  I've just turned
-them off.  If you want to do that, too, then the magic is to do run
-"mysql mysql", and feed it commands like this (replace all instances of
-HOSTNAME with the name of the machine mysql is running on):
-
-        DELETE FROM host;
-        DELETE FROM user;
-        INSERT INTO host VALUES
-          ('localhost','%','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
-        INSERT INTO host VALUES
-          (HOSTNAME,'%','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y');
-        INSERT INTO user VALUES
-          ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y',
-          'Y','Y','Y','Y','Y');
-        INSERT INTO user VALUES
-          (HOSTNAME,'','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y',
-          'Y','Y','Y');
-        INSERT INTO user VALUES
-          (HOSTNAME,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y',
-          'Y','Y','Y','Y');
-        INSERT INTO user VALUES
-          ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y',
-          'Y','Y','Y','Y');
-
-The number of 'Y' entries to use varies with the version of MySQL; they
-keep adding columns.  The list here should work with version 3.22.23b.
-
-This run of "mysql mysql" may need some extra parameters to deal with
-whatever database permissions were set up previously.  In particular,
-you might have to say "mysql -uroot mysql", and give it an appropriate
-password.
-
-For much more information about MySQL permissions, see the MySQL
-documentation.
-
-After you've tweaked the permissions, run "mysqladmin reload" to make
-sure that the database server knows to look at your new permission list.
-
-Next, you can just run the magic checksetup.pl script.  (Many thanks
-to Holger Schurig <holgerschurig@nikocity.de> for writing this script!)
-It will make sure things have reasonable permissions, set up the "data"
-directory, and create all the MySQL tables.  Just run:
-
-        ./checksetup.pl
-
-The first time you run it, it will create a file called "localconfig"
-which you should examine and perhaps tweak a bit.  Then re-run
-checksetup.pl and it will do the real work.
-
-
-At ths point, you should have a nearly empty copy of the bug tracking
-setup.
-
-4. Tweaking the Bugzilla->MySQL Connection Data
-
-   If you have played with MySQL permissions, rather than just opening it
-wide open as described above, then you may need to tweak the Bugzilla
-code to connect appropriately.
-
-   In order for bugzilla to be able to connect to the MySQL database
-you'll have to tell bugzilla where the database server is, what
-database you're connecting to, and whom to connect as.  Simply open up
-the globals.pl file in the bugzilla directory and find the line that
-begins like:
-
-        $::db = Mysql->Connect("
-
-   That line does the actual database connection.  The Connect method
-takes four parameters which are (with appropriate values):
-
-        1. server's host: just use "localhost"
-        2. database name: "bugs" if you're following these directions
-        3. MySQL username: whatever you created for your webserver user
-                probably "nobody"
-        4. Password for the MySQL account in item 3.
-
-Just fill in those values and close up globals.pl
-
-5. Setting up yourself as Maintainer
-
-    Start by creating your own bugzilla account.  To do so, just try to
-"add a bug" from the main bugzilla menu (now available from your system
-through your web browser!).  You'll be prompted for logon info, and you
-should enter your email address and then select 'mail me my password'.
-When you get the password mail, log in with it.  Don't finish entering
-that new bug.
-
-    Now, add yourself to every group.  The magic checksetup.pl script
-can do this for you, if you run it again now.  That script will notice
-if there's exactly one user in the database, and if so, add that person
-to every group.
-
-    If you want to add someone to every group by hand, you can do it by
-typing the appropriate MySQL commands.  Run mysql, and type:
-
-        update profiles set groupset=0x7fffffffffffffff
-        where login_name = 'XXX';
-
-replacing XXX with your Bugzilla email address.
-
-Now, if you go to the query page (off of the bugzilla main menu) where
-you'll now find a 'edit parameters' option which is filled with editable
-treats.
-
-6. Setting Up the Whining Cron Job (Optional)
-
-   By now you've got a fully functional bugzilla, but what good are bugs
-if they're not annoying?  To help make those bugs more annoying you can
-set up bugzilla's automatic whining system.  This can be done by adding
-the following command as a daily crontab entry (for help on that see that
-crontab man page):
-
-        cd <your-bugzilla-directory> ; ./whineatnews.pl
-
-7. Bug Graphs (Optional)
-
-   As long as you installed the GD and Graph::Base Perl modules you might
-as well turn on the nifty bugzilla bug reporting graphs.  Just add
-the command:
-
-        cd <your-bugzilla-directory> ; ./collectstats.pl
-
-as a nightly entry to your crontab and after two days have passed you'll
-be able to view bug graphs from the Bug Reports page.
-
-8. Real security for MySQL
-
-MySQL has "interesting" default security parameters:
-        mysqld defaults to running as root
-        it defaults to allowing external network connections
-        it has a known port number, and is easy to detect
-        it defaults to no passwords whatsoever
-        it defaults to allowing "File_Priv"
-This means anyone from anywhere on the internet can not only drop the
-database with one SQL command, and they can write as root to the system.
-
-To see your permissions do:
-        > mysql -u root -p
-        use mysql;
-        show tables;
-        select * from user;
-        select * from db;
-
-To fix the gaping holes:
-        DELETE FROM user WHERE User='';
-        UPDATE user SET Password=PASSWORD('new_password') WHERE user='root';
-        FLUSH PRIVILEGES;
-
-If you're not running "mit-pthreads" you can use:
-        GRANT USAGE ON *.* TO bugs@localhost;
-        GRANT ALL ON bugs.* TO bugs@localhost;
-        REVOKE DROP ON bugs.* FROM bugs@localhost;
-        FLUSH PRIVILEGES;
-
-With "mit-pthreads" you'll need to modify the "globals.pl" Mysql->Connect
-line to specify a specific host name instead of "localhost", and accept
-external connections:
-        GRANT USAGE ON *.* TO bugs@bounce.hop.com;
-        GRANT ALL ON bugs.* TO bugs@bounce.hop.com;
-        REVOKE DROP ON bugs.* FROM bugs@bounce.hop.com;
-        FLUSH PRIVILEGES;
-
-Consider also:
-        o Turning off external networking with "--skip-networking",
-          unless you have "mit-pthreads", in which case you can't.
-          Without networking, MySQL connects with a Unix domain socket.
-
-        o using the --user= option to mysqld to run it as an unprivileged
-          user.
-
-        o starting MySQL in a chroot jail
-
-        o running the httpd in a jail
-
-        o making sure the MySQL passwords are different from the OS
-          passwords (MySQL "root" has nothing to do with system "root").
-
-        o running MySQL on a separate untrusted machine
-
-        o making backups ;-)
-
-
-
----------[ Appendices ]-----------------------
-
-Appendix A. Required Software Download Links
-
-   All of these sites are current as of February 17, 1999.  Hopefully
-they'll stay current for a while.
-
-MySQL: http://www.mysql.org
-
-Perl: http://www.perl.org
-
-CPAN: http://www.cpan.org
-
-DBI Perl module: ftp://ftp.cpan.org/pub/perl/CPAN/modules/by-module/DBI/
-
-Data::Dumper module:
-        ftp://ftp.cpan.org/pub/perl/CPAN/modules/by-module/Data/
-
-MySQL related Perl modules:
-        ftp://ftp.cpan.org/pub/perl/CPAN/modules/by-module/Mysql/
-
-TimeDate Perl module collection:
-        ftp://ftp.cpan.org/pub/perl/CPAN/modules/by-module/Date/
-
-GD Perl module: ftp://ftp.cpan.org/pub/perl/CPAN/modules/by-module/GD/
-
-Chart::Base module:
-        ftp://ftp.cpan.org/pub/perl/CPAN/modules/by-module/Chart/
-
-
-Appendix B. Modifying Your Running System
-
-   Bugzilla optimizes database lookups by storing all relatively static
-information in the versioncache file, located in the data/ subdirectory
-under your installation directory (we said before it needs to be writable,
-right?!)
-
-   If you make a change to the structural data in your database (the
-versions table for example), or to the "constants" encoded in
-defparams.pl, you will need to remove the cached content from the data
-directory (by doing a "rm data/versioncache"), or your changes won't show
-up!
-
-   That file gets automatically regenerated whenever it's more than an
-hour old, so Bugzilla will eventually notice your changes by itself, but
-generally you want it to notice right away, so that you can test things.
-
-
-Appendix C. Upgrading from previous versions of Bugzilla
-
-The developers of Bugzilla are constantly adding new tables, columns and
-fields.  You'll get SQL errors if you just update the code.  The strategy
-to update is to simply always run the checksetup.pl script whenever
-you upgrade your installation of Bugzilla.  If you want to see what has
-changed, you can read the comments in that file, starting from the end.
-
-
-Appendix D. History
-
-   This document was originally adapted from the Bonsai installation
-instructions by Terry Weissman <terry@mozilla.org>.
-
-   The February 25, 1999 re-write of this page was done by Ry4an Brase
-<ry4an@ry4an.org>, with some edits by Terry Weissman, Bryce Nesbitt,
-Martin Pool, & Dan Mosedale (But don't send bug reports to them!
-Report them using bugzilla, at http://bugzilla.mozilla.org/enter_bug.cgi ,
-project Webtools, component Bugzilla).
-
-   Comments from people using this document for the first time are
-especially welcomed.

mozilla/webtools/bugzilla/addcomponent.cgi

@@ -1,98 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation. All Rights Reserved.
-# 
-# Contributor(s): Sam Ziegler <sam@ziegler.org>
-# Terry Weissman <terry@mozilla.org>
-# Mark Hamby <mhamby@logicon.com>
-
-# Code derived from editcomponents.cgi, reports.cgi
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-
-# Shut up misguided -w warnings about "used only once":
-
-use vars @::legal_product;
-
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-if (!UserInGroup("editcomponents")) {
-    print "<H1>Sorry, you aren't a member of the 'editcomponents' group.</H1>\n";
-    print "And so, you aren't allowed to add a new component.\n";
-    exit;
-}
-
-PutHeader("Add Component");
-
-print "This page lets you add a component to bugzilla.\n";
-
-unlink "data/versioncache";
-GetVersionTable();
-
-my $prodcode = "P0";
-
-my $product_popup = make_options (\@::legal_product, $::legal_product[0]);
-
-print "
-      <form method=post action=doaddcomponent.cgi>
-
-      <TABLE>
-      <TR>
-              <th align=right>Component:</th>
-              <TD><input size=60 name=\"component\" value=\"\"></TD>
-      </TR>
-      <TR>
-              <TH  align=right>Program:</TH>
-              <TD><SELECT NAME=\"product\">
-                      $product_popup
-                      </SELECT></TD>
-      </TR>
-      <TR>
-              <TH  align=right>Description:</TH>
-              <TD><input size=60 name=\"description\" value=\"\"></TD>
-      </TR>
-      <TR>
-              <TH  align=right>Initial owner:</TH>
-              <TD><input size=60 name=\"initialowner\" value=\"\"></TD>
-      </TR>
-      ";
-
-if (Param('useqacontact')) {
-      print "
-              <TR>
-                      <TH  align=right>Initial QA contact:</TH>
-                      <TD><input size=60 name=\"initialqacontact\" value=\"\"></TD>
-              </TR>
-              ";
-}
-
-print "
-      </table>
-      <hr>
-      ";
-
-print "<CENTER><input type=submit value=\"Submit changes\"></CENTER>\n";
-
-print "</form>\n";
-
-PutFooter();

mozilla/webtools/bugzilla/announce.cgi

@@ -1,245 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation. All Rights Reserved.
-# 
-# $Id: announce.cgi,v 1.1.2.4 2000-05-31 22:22:12 dkl%redhat.com Exp $
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-#                 Andrew Anderson <andrew@redhat.com>
-#		  		  Dave Lawrence <dkl@redhat.com>
-
-# include necessary packages
-use strict;
-use CGI;
-
-require 'CGI.pl';
-require 'globals.pl';
-
-# set up necessary variables
-$::cgi = new CGI;
-
-my $submit = $::cgi->param('submit');
-my $product = $::cgi->param('product');
-my $version = $::cgi->param('version');
-my $platform = $::cgi->param('arch');
-my $severity = $::cgi->param('severity');
-my $priority = $::cgi->param('priority');
-my $class = $::cgi->param('class');
-my $component = $::cgi->param('component');
-my $synopsis = $::cgi->param('synopsis');
-my $advisory = $::cgi->param('advisory');
-my $keywords = $::cgi->param('keywords');
-my $cross = $::cgi->param('cross');
-my $topic = $::cgi->param('topic');
-my $fixed = $::cgi->param('fixed');
-
-# my $summary = "";
-# my $desc = "";
-
-print "Content-type: text/html\n\n";
-
-if (!$submit) {
-	# construct a form for the rest of the information
-	PutHeader("Errata Announcement");
-	
-	print 	$::cgi->startform(-ACTION=>'announce.cgi'),
-			$::cgi->table({-BGCOLOR=>'#ECECEC', -ALIGN=>'left', -WIDTH=>'75%', -CELLSPACING=>'0', -CELLPADDING=>'4'},
-				$::cgi->TR(
-					$::cgi->td({-BGCOLOR=>'#BFBFBF', -ALIGN=>'right'},
-						$::cgi->b('Package ')
-					),
-					$::cgi->td({-ALIGN=>'left'},
-						$::cgi->textfield(-NAME=>"component",
-						                  -VALUE=>"$component",
-										  -SIZE=>60)
-					)
-				),
-				$::cgi->TR(
-					$::cgi->td({-BGCOLOR=>'#BFBFBF', -ALIGN=>'right'},
-						$::cgi->b('Product ')
-					),
-					$::cgi->td({-ALIGN=>'left'},
-					    $::cgi->textfield(-NAME=>"product",
-										  -VALUE=>"$product",
-										  -SIZE=>60)
-					)
-				),
-				$::cgi->TR(
-					$::cgi->td({-BGCOLOR=>'#BFBFBF', -ALIGN=>'right'},
-						$::cgi->b('Version ')
-					),
-					$::cgi->td({-ALIGN=>'left'},
-						$::cgi->textfield(-NAME=>"version",
-									      -VALUE=>"$version",
-										  -SIZE=>60)
-					)
-				),
-				$::cgi->TR(
-					$::cgi->td({-BGCOLOR=>'#BFBFBF', -ALIGN=>'right'},
-						$::cgi->b('Advisory ID ')
-					),
-					$::cgi->td({-ALIGN=>'left'},
-						$::cgi->textfield(-NAME=>"advisory",
-						                  -VALUE=>"$advisory",
-										  -SIZE=>60)
-					)
-				),
-				$::cgi->TR(
-					$::cgi->td({-BGCOLOR=>'#BFBFBF', -ALIGN=>'right'},
-						$::cgi->b('Synopsis ')
-					),
-					$::cgi->td({-ALIGN=>'left'},
-						$::cgi->textfield(-NAME=>"synopsis",
-										  -VALUE=>"$synopsis",
-										  -SIZE=>60)
-					)
-				),
-				$::cgi->TR(
-					$::cgi->td({-BGCOLOR=>'#BFBFBF', -ALIGN=>'right'},
-						$::cgi->b('Key Words ')
-					),
-					$::cgi->td({-ALIGN=>'left'},
-						$::cgi->textfield(-NAME=>"keywords",
-						                  -VALUE=>"$keywords",
-										  -SIZE=>60)
-				    )
-				),
-				$::cgi->TR(
-					$::cgi->td({-BGCOLOR=>'#BFBFBF', -ALIGN=>'right'},
-						$::cgi->b('Cross Reference ')
-					),
-					$::cgi->td({-ALIGN=>'left'},
-						$::cgi->textfield(-NAME=>"cross",
-										  -VALUE=>"$cross",
-										  -SIZE=>60)
-					)
-				),
-				$::cgi->TR(
-					$::cgi->td({-BGCOLOR=>'#BFBFBF', -ALIGN=>'right'},
-						$::cgi->b('Topic ')
-					),
-					$::cgi->td({-ALIGN=>'left'},
-						$::cgi->textarea(-NAME=>"topic",
-					    				 -WRAP=>"hard",
-										 -ROWS=>"2",
-										 -COLUMNS=>"60",
-										 -DEFAULT=>"$topic")
-				    )
-				),
-                $::cgi->TR(
-					$::cgi->td({-BGCOLOR=>'#BFBFBF', -ALIGN=>'right'},
-						$::cgi->b('Bug IDs Fixed ')
-					),
-					$::cgi->td({-ALIGN=>'left'},
-						$::cgi->textarea(-NAME=>"fixed",
-										 -WRAP=>"hard",
-										 -ROWS=>"2",
-										 -COLUMNS=>"60",
-										 -DEFAULT=>"$fixed")
-					)
-				)
-			),
-			$::cgi->center($::cgi->submit(-name=>"submit", -value=>"View Final")),
-			$::cgi->endform;
-	PutFooter();
-	exit;
-}
-
-# After submit, print out form on clean page
-print <<End_of_html;
-
-<PRE>
----------------------------------------------------------------------
-                   Red Hat, Inc. Errata Advisory
-
-Synopsis:               $synopsis 
-Advisory ID:            $advisory 
-Issue date:             
-Updated on:             
-Keywords:               $keywords 
-Cross references:       $cross
----------------------------------------------------------------------
-      
-1. Topic:
-     
-$topic      
-	   
-2. Bug IDs fixed:
-
-$fixed
-
-3. Relevant releases/architectures:
-
-$platform
-
-4. Obsoleted by:
-
-
-
-5. Conflicts with:
-
-
-
-6. RPMs required:
-
-Intel:
-
-Alpha:
-      
-Sparc:
-
-Source packages:
-
-
-7. Problem description:
-
-
-8. Solution:
-
-For each RPM for your particular architecture, run:
- 
-rpm -Uvh <filename>
- 
-where filename is the name of the RPM.
-      
-9. Verification:
-
-MD5 sum                           Package Name
---------------------------------------------------------------------------
-
-These packages are also PGP signed by Red Hat Inc. for security. Our
-key is available at:
-
-http://www.redhat.com/corp/contact.html
-You can verify each package with the following command:
-
-rpm --checksig  <filename>
-
-If you only wish to verify that each package has not been corrupted or
-tampered with, examine only the md5sum with the following command:
-
-rpm --checksig --nopgp <filename>
- 
-10. References:
-
-
-</PRE>
-
-End_of_html
-
-exit;

mozilla/webtools/bugzilla/backdoor.cgi

@@ -1,163 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation. All Rights Reserved.
-# 
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-# Provides a silly 'back-door' mechanism to let me automatically insert
-# bugs from the netscape bugsystem.  Other installations of Bugzilla probably
-# don't need to worry about this file any.
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-
-# Shut up misguided -w warnings about "used only once":
-
-use vars %::versions;
-
-
-ConnectToDatabase();
-
-print "Content-type: text/plain\n\n";
-
-# while (my ($key,$value) = each %ENV) {
-#     print "$key=$value\n";
-# }
-
-my $host = $ENV{'REMOTE_ADDR'};
-
-SendSQL("select passwd from backdoor where host = '$host'");
-my $passwd = FetchOneColumn();
-if (!defined $passwd || !defined $::FORM{'passwd'} ||
-    $passwd ne crypt($::FORM{'passwd'}, substr($passwd, 0, 2))) {
-    print "Who are you?\n";
-    print "Env:\n";
-    while (my ($key,$value) = each %ENV) {
-        print "$key=$value\n";
-    }
-    print "\nForm:\n";
-    while (my ($key,$value) = each %::FORM) {
-        print "$key=$value\n";
-    }
-    exit;
-}
-
-
-
-my $prod = $::FORM{'product'};
-my $comp = $::FORM{'component'};
-my $version = $::FORM{'version'};
-
-GetVersionTable();
-
-
-sub Punt {
-    my ($label, $value) = (@_);
-    my $maintainer = Param("maintainer");
-    print "I don't know how to move into Bugzilla a bug with a $label of $value.
-If you really do need to do this, speak to $maintainer and maybe he
-can teach me.";
-    exit;
-}
-
-
-# Do remapping of things from BugSplat world to Bugzilla.
-
-if ($prod eq "Communicator") {
-    $prod = "Browser";
-    $version = "other";
-}
-
-    
-# Validate fields, and whine about things that we apparently couldn't remap
-# into something legal.
-
-    
-if (!defined $::components{$prod}) {
-    Punt("product", $prod);
-}
-if (lsearch($::components{$prod}, $comp) < 0) {
-    Punt("component", $comp);
-}
-if (lsearch($::versions{$prod}, $version) < 0) {
-    $version = "other";
-    if (lsearch($::versions{$prod}, $version) < 0) {
-        Punt("version", $version);
-    }
-}
-
-
-$::FORM{'product'} = $prod;
-$::FORM{'component'} = $comp;
-$::FORM{'version'} = $version;
-
-
-$::FORM{'long_desc'} =
-    "(This bug imported from BugSplat, Netscape's internal bugsystem.  It
-was known there as bug #$::FORM{'bug_id'}
-http://scopus.netscape.com/bugsplat/show_bug.cgi?id=$::FORM{'bug_id'}
-Imported into Bugzilla on " . time2str("%D %H:%M", time()) . ")
-
-" . $::FORM{'long_desc'};
-    
-
-$::FORM{'reporter'} =
-    DBNameToIdAndCheck("$::FORM{'reporter'}\@netscape.com", 1);
-$::FORM{'assigned_to'} = 
-    DBNameToIdAndCheck("$::FORM{'assigned_to'}\@netscape.com", 1);
-if ($::FORM{'qa_contact'} ne "") {
-    $::FORM{'qa_contact'} =
-        DBNameToIdAndCheck("$::FORM{'qa_contact'}\@netscape.com", 1);
-} else {
-    $::FORM{'qa_contact'} = 0;
-}
-    
-
-my @list = ('reporter', 'assigned_to', 'product', 'version', 'rep_platform',
-            'op_sys', 'bug_status', 'bug_severity', 'priority', 'component',
-            'short_desc', 'long_desc', 'creation_ts', 'delta_ts',
-            'bug_file_loc', 'qa_contact', 'groupset');
-
-my @vallist;
-foreach my $i (@list) {
-    push @vallist, SqlQuote($::FORM{$i});
-}
-
-my $query = "insert into bugs (" .
-    join(',', @list) .
-    ") values (" .
-    join(',', @vallist) .
-    ")";
-
-
-SendSQL($query);
-
-SendSQL("select LAST_INSERT_ID()");
-my $zillaid = FetchOneColumn();
-
-foreach my $cc (split(/,/, $::FORM{'cc'})) {
-    if ($cc ne "") {
-        my $cid = DBNameToIdAndCheck("$cc\@netscape.com", 1);
-        SendSQL("insert into cc (bug_id, who) values ($zillaid, $cid)");
-    }
-}
-
-print "Created bugzilla bug $zillaid\n";
-system("./processmail", $zillaid);

mozilla/webtools/bugzilla/booleanchart.html

@@ -1,79 +0,0 @@
-<html> <head>
-<title>The "boolean chart" section of the query page</title>
-</head>
-
-<body>
-<h1>The "boolean chart" section of the query page</h1>
-
-("Boolean chart" is a terrible term; anyone got a better one I can use
-instead?)
-
-<p>
-
-The Bugzilla query page is designed to be reasonably easy to use.
-But, with such ease of use always comes some lack of power.  The
-"boolean chart" section is designed to let you do very powerful
-queries, but it's not the easiest thing to learn (or explain).
-<p>
-So.
-<p>
-
-The boolean chart starts with a single "term".  A term is a
-combination of two pulldown menus and a text field.
-You choose items from the menus, specifying "what kind of thing
-am I searching for" and "what kind of matching do I want", and type in
-a value on the text field, specifying "what should it match".
-
-<p>
-
-The real fun starts when you click on the "Or" or "And" buttons.  If
-you bonk on the "Or" button, then you get a second term to the right
-of the first one.  You can then configure that term, and the result of
-the query will be anything that matches either of the terms.
-
-<p>
-
-Or, you can bonk the "And" button, and get a new term below the
-original one, and now the result of the query will be anything that
-matches both of the terms.
-
-<p>
-
-And you can keep clicking "And" and "Or", and get a page with tons of
-terms.  "Or" has higher precedence than "And".  (In other words, you
-can think of each line of "Or" stuff as having parenthesis around it.)
-
-<p>
-
-The most subtle thing is this "Add another boolean chart" button.
-This is almost the same thing as the "And" button.  The difference is
-if you use one of the fields where several items can be associated
-with a single bug.  This includes "Comments", "CC", and all the
-"changed [something]" entries.  Now, if you have multiple terms that
-all talk about one of these fields, it's ambiguous whether they are
-allowed to be talking about different instances of that field.  So,
-to let you have it both ways, they always mean the same instance,
-unless the terms appear on different charts.
-
-<p>
-
-For example: if you search for "priority changed to P5" and
-"priority changed by person@addr", it will only find bugs where the
-given person at some time changed the priority to P5.  However, if
-what you really want is to find all bugs where the milestone was
-changed at some time by the person, and someone (possibly someone
-else) at some time changed the milestone to P5, then you would put
-the two terms in two different charts.
-
-<p>
-
-Clear as mud?  Please, I beg you, rewrite this document to make
-everything crystal clear, and send the improved version to <a
-href="mailto:terry@mozilla.org">Terry</a>.
-
-<hr>
-
-<!-- hhmts start -->
-Last modified: Fri Jan 28 12:34:41 2000
-<!-- hhmts end -->
-</body> </html>

mozilla/webtools/bugzilla/bug_form.pl

@@ -1,685 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-# 				  David Lawrence <dkl@redhat.com>
-
-use diagnostics;
-use strict;
-
-# Shut up misguided -w warnings about "used only once".  For some reason,
-# "use vars" chokes on me when I try it here.
-
-sub bug_form_pl_sillyness {
-    my $zz;
-    $zz = %::FORM;
-    $zz = %::components;
-    $zz = %::prodmaxvotes;
-    $zz = %::versions;
-    $zz = @::legal_keywords;
-    $zz = @::legal_opsys;
-    $zz = @::legal_platform;
-    $zz = @::legal_product;
-    $zz = @::legal_priority;
-    $zz = @::legal_resolution_no_dup;
-    $zz = @::legal_severity;
-	$zz = %::target_milestone;
-}
-
-my %bug_form;			# hash to hold variables passed on to the template
-my $userid = 0;			# user id of current member
-my $changeable = 0;		# whether the user can edit attributes of this bug
-
-my $loginok = quietly_check_login();
-
-if ($loginok) {
-	$userid = DBname_to_id($::COOKIE{'Bugzilla_login'});
-}
-
-my $id = $::FORM{'id'}; # id number of current bug
-
-my $query = "
-select
-        bugs.bug_id,
-        product,
-        version,
-        rep_platform,
-        op_sys,
-        bug_status,
-        resolution,
-        priority,
-        bug_severity,
-        component,
-        assigned_to,
-        reporter,
-        bug_file_loc,
-        short_desc,
-        target_milestone,
-        qa_contact,
-        status_whiteboard,
-";
-
-if ($::driver eq 'mysql') {
-	$query .= "
-        date_format(creation_ts,'%Y-%m-%d %H:%i'),
-        groupset,
-		delta_ts,
-		sum(votes.count)
-from 	bugs left join votes using(bug_id)
-where 	bugs.bug_id = $id
-and 	bugs.groupset & $::usergroupset = bugs.groupset
-		group by bugs.bug_id";
-} else {
-    $query .= "
-    TO_CHAR(creation_ts, 'YYYY-MM-DD HH:MI:SS'), 
-    groupset,
-    TO_CHAR(delta_ts, 'YYYYMMDDHH24MISS')
-from
-    bugs
-where 
-    bugs.bug_id = $id";
-}
-
-SendSQL($query);
-my %bug;
-my @row;
-if (@row = FetchSQLData()) {
-    my $count = 0;
-    foreach my $field ("bug_id", "product", "version", "rep_platform",
-		       "op_sys", "bug_status", "resolution", "priority",
-		       "bug_severity", "component", "assigned_to", "reporter",
-		       "bug_file_loc", "short_desc", "target_milestone",
-               "qa_contact", "status_whiteboard", "creation_ts",
-               "groupset", "delta_ts", "votes") {
-		$bug{$field} = shift @row;
-		if (!defined $bug{$field}) {
-	    	$bug{$field} = "";
-		}
-		$count++;
-    }
-} else {
-	if ($::driver eq 'mysql') {
-	    SendSQL("select groupset from bugs where bug_id = $id");
-	    if (@row = FetchSQLData()) {
-    	    print "<H1>Permission denied.</H1>\n";
-        	if ($loginok) {
-            	print "Sorry; you do not have the permissions necessary to see\n";
-            	print "bug $id.\n";
-				PutFooter();
-				exit;
-        	} else {
-            	print "Sorry; bug $id can only be viewed when logged\n";
-            	print "into an account with the appropriate permissions.  To\n";
-            	print "see this bug, you must first\n";
-            	print "<a href=\"show_bug.cgi?id=$id&GoAheadAndLogIn=1\">";
-            	print "log in</a>.";
-				PutFooter();
-				exit;
-        	}
-		}
-	}
-    PutError("<H1>Bug not found</H1>\n" .
-    	 	 "There does not seem to be a bug numbered $id.\n");
-}
-
-if ($::driver ne 'mysql') {
-	# If this bug has been set to private, lets see if we can view it.
-	if (!CanISee($id, $userid)) {
-    	my $error = "<H1>Permission denied.</H1>\n";
-    	if ($loginok) {
-        	$error .= "Sorry; you do not have the permissions necessary to see\n";
-        	$error .= "bug $id.\n";
-    	} else {
-        	$error .= "Sorry; bug $id can only be viewed when logged\n";
-        	$error .= "into an account with the appropriate permissions.  To\n";
-        	$error .= "see this bug, you must first\n";
-        	$error .= "<a href=\"show_bug.cgi?id=$id&GoAheadAndLogIn=1\">";
-        	$error .= "log in</a>.";
-    	}
-		PutError($error);
-	}
-}
-
-
-
-my $assignedtoid = $bug{'assigned_to'};
-my $reporterid = $bug{'reporter'};
-my $qacontactid =  $bug{'qa_contact'};
-
-# If changeable is true then changes to bug's attributes are allowed
-if ($::driver ne 'mysql') {
-	if (CanIChange($id, $userid, $reporterid, $assignedtoid)) {
-    	$changeable = 1;
-	} else {
-    	$changeable = 0;
-	}
-}
-
-$bug{'assigned_to'} = DBID_to_name($bug{'assigned_to'});
-$bug{'reporter'} = DBID_to_name($bug{'reporter'});
-
-print qq{<FORM NAME="changeform" METHOD="POST" ACTION="process_bug.cgi">\n};
-
-#  foreach my $i (sort(keys(%bug))) {
-#      my $q = value_quote($bug{$i});
-#      print qq{<INPUT TYPE="HIDDEN" NAME="orig-$i" VALUE="$q">\n};
-#  }
-
-$bug_form{'long_desc'} = GetLongDescriptionAsHTML($id);
-$bug_form{'longdesclength'} = length($bug_form{'long_desc'});
-
-GetVersionTable();
-
-#
-# These should be read from the database ...
-#
-$bug_form{'platform_popup'} = "";
-$bug_form{'priority_popup'} = "";
-$bug_form{'sev_popup'} = "";
-$bug_form{'component_popup'} = "";
-$bug_form{'component_text'} = "";
-$bug_form{'cc_element'} = "";
-$bug_form{'version_popup'} = "";
-$bug_form{'product_popup'} = "";
-$bug_form{'opsys_popup'} = "";
-
-if ($changeable) {
-    $bug_form{'platform_popup'} = "<SELECT NAME=rep_platform>\n" .
-                      make_options(\@::legal_platform, $bug{'rep_platform'}) . 
-                      "\n</SELECT>\n";
-
-    # Added by Red Hat for contract customer support 
-    if (Param('contract')) {
-        if (UserInContract($userid) && UserInGroup('setcontract')) {
-            $bug_form{'priority_popup'} = "<SELECT NAME=priority>\n" . 
-                          make_options(\@::legal_priority_contract, $bug{'priority'}) . 
-                              "\n</SELECT>\n";
-        } elsif (UserInContract($userid) && $bug{'priority'} eq 'contract') {
-            $bug_form{'priority_popup'} = "contract<BR>" . 
-                              "<SELECT NAME=priority>\n" . 
-                              make_options(\@::legal_priority, $bug{'priority'}) . 
-                              "\n</SELECT>\n";
-        } else {
-            $bug_form{'priority_popup'} = "<SELECT NAME=priority>\n" . 
-                          make_options(\@::legal_priority, $bug{'priority'}) . 
-                          "\n</SELECT>\n";
-        }
-    } else {
-        $bug_form{'priority_popup'} = "<SELECT NAME=priority>\n" . 
-                          make_options(\@::legal_priority, $bug{'priority'}) . 
-                          "\n</SELECT>\n";
-    }
-
-    $bug_form{'severity_popup'} = "<SELECT NAME=bug_severity>\n" .
-                               make_options(\@::legal_severity, $bug{'bug_severity'}) .
-                               "\n</SELECT>\n";
-
-    $bug_form{'component_popup'} = "<B><A HREF=\"describecomponents.cgi?product=$bug{'product'}\">Component:</A></B>" .
-                                     "<BR><B>$bug{'component'}</B></TD>\n<TD ROWSPAN=3 VALIGN=top>" .
-                                     make_popup('component', $::components{$bug{'product'}}, $bug{'component'}, 1, 0);
-
-#   $bug_form{'component_text'} = "<INPUT NAME=component_text SIZE=20 VALUE=\"\">"; 
-    $bug_form{'component_text'} = "(Coming Soon)";
-
-    $bug_form{'cc_element'} = "Cc:</TH><TD ALIGN=left><INPUT NAME=cc SIZE=60 VALUE=\"" . ShowCcList($id) . "\">"; 
-
-    $bug_form{'version_popup'} = "<SELECT NAME=version>\n" .
-                                    make_options($::versions{$bug{'product'}}, $bug{'version'}) .
-                                    "\n</SELECT>\n";
-
-    $bug_form{'product_popup'} = "<SELECT NAME=product>\n" .
-                                    make_options(\@::legal_product, $bug{'product'}) .
-                                    "\n</SELECT>\n";
-	$bug_form{'opsys_popup'} = "<SELECT NAME=op_sys>\n" .
-            						make_options(\@::legal_opsys, $bug{'op_sys'}) .
-            						"</SELECT>\n";
-
-} else {
-    $bug_form{'platform_popup'} = $bug{'rep_platform'};
-    $bug_form{'priority_popup'} = $bug{'priority'};
-    $bug_form{'sev_popup'} = $bug{'bug_severity'};
-    $bug_form{'component_popup'} = "<B><A HREF=\"describecomponents.cgi?product=$bug{'product'}\">Component:</A></B>" .
-                                     "</TD><TD ROWSPAN=3 VALIGN=top>" . $bug{'component'};
-    $bug_form{'component_text'} = "";
-    $bug_form{'cc_element'} = "Cc:</TH><TD ALIGN=left>" . ShowCcList($id);
-    $bug_form{'version_popup'} = $bug{'version'};
-    $bug_form{'product_popup'} = $bug{'product'};
-	$bug_form{'opsys_popup'} = $bug{'op_sys'};
-}
-
-
-$bug_form{'resolution_popup'} = make_options(\@::legal_resolution_no_dup,
-				    $bug{'resolution'});
-
-my $URL = $bug{'bug_file_loc'};
-if (defined $URL && $URL ne "none" && $URL ne "NULL" && $URL ne "") {		
-	$URL = "<B><A HREF=\"$URL\">URL:</A></B>";
-} else {
-	$URL = "<B>URL:</B>";
-}
-
-if (Param("usetargetmilestone")) {
-	my $url = "";
-	if (defined $::milestoneurl{$bug{'product'}}) {
-		$url = $::milestoneurl{$bug{'product'}};
-	}
-	if ($url eq "") {
-		$url = "notargetmilestone.html";
-	}
-	if ($bug{'target_milestone'} eq "") {
-		$bug{'target_milestone'} = " ";
-	}
-	push(@::legal_target_milestone, " ");
-	$bug_form{'milestone_popup'} = "
-<A href=\"$url\"><B>Target Milestone:</B></A></TD>
-<TD><SELECT NAME=target_milestone>\n" .
-make_options(\@::legal_target_milestone,
-$bug{'target_milestone'}) .
-"</SELECT>\n";
-}
-
-if (Param("useqacontact")) {
-	my $name = $bug{'qa_contact'} > 0 ? DBID_to_name($bug{'qa_contact'}) : "";
-	if ($changeable) {
-	    $bug_form{'qacontact_element'} = "QA Contact:</TH><TD ALIGN=left><INPUT NAME=qa_contact VALUE=\"" .
-									   value_quote($name) . "\" SIZE=60>";
-	} else {
-		$bug_form{'qacontact_element'} = "QA Contact:</TH><TD ALIGN=left>" . value_quote($name);
-	}
-}
-
-if ($changeable) {
-	$bug_form{'url_element'} = "$URL</TH><TD ALIGN=left><INPUT NAME=bug_file_loc VALUE=\"$bug{'bug_file_loc'}\" SIZE=60>";
-} else {
-    $bug_form{'url_element'} = "$URL</TH><TD ALIGN=left>$bug{'bug_file_loc'}";
-}
-
-if ($changeable) {
-    $bug_form{'summary_element'} = "Summary:</TH><TD COLSPAN=2 ALIGN=left><INPUT NAME=short_desc VALUE=\"" .
-									 value_quote($bug{'short_desc'}) . "\" SIZE=60>";
-} else {
-    $bug_form{'summary_element'} = "Summary:</TH><TD ALIGN=left>$bug{'short_desc'}";
-}
-
-if (Param("usestatuswhiteboard")) {
-    if ($changeable) {
-    	$bug_form{'whiteboard_element'} = "Status Whiteboard:</TH>" . 
-			"<TD ALIGN=left><INPUT NAME=status_whiteboard VALUE=\"" .
-			value_quote($bug{'status_whiteboard'}) . "\" SIZE=60>";
-    } else {
-    	$bug_form{'whiteboard_element'} = "Status Whiteboard:</TH>" .
-			"<TD ALIGN=left>$bug{'status_whiteboard'}";
-    }
-}
-
-if (@::legal_keywords) {
-    SendSQL("SELECT keyworddefs.name 
-             FROM keyworddefs, keywords
-             WHERE keywords.bug_id = $id AND keyworddefs.id = keywords.keywordid
-             ORDER BY keyworddefs.name");
-    my @list;
-    while (MoreSQLData()) {
-        push(@list, FetchOneColumn());
-    }
-    my $value = value_quote(join(', ', @list));
-    $bug_form{'keywords_element'} = "
-	<A HREF=\"describekeywords.cgi\">Keywords</A>:</TH>
-	<TD ALIGN=left><INPUT NAME=\"keywords\" VALUE=\"$value\" SIZE=60>\n";
-}
-
-$bug_form{'attachment_element'} = "<TABLE WIDTH=\"100%\">\n";
-
-if ($::driver eq 'mysql') {
-	SendSQL("select attach_id, filename, date_format(creation_ts, '%Y-%m-%d %h:%i:%s'), " . 
-			"description from attachments where bug_id = $id");
-} else {
-	SendSQL("select attach_id, filename, TO_CHAR(creation_ts, 'YYYY-MM-DD HH:MI:SS'), " . 
-			"description from attachments where bug_id = $id");
-}
-
-while (MoreSQLData()) {
-    my ($attachid, $filename, $date, $desc) = (FetchSQLData());
-#   if ($date =~ /^(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
-#   	$date = "$3/$4/$2 $5:$6";
-#   }	
-    my $link = "showattachment.cgi?attach_id=$attachid";
-    $desc = value_quote($desc);
-    $bug_form{'attachment_element'} .= qq{
-	<TR>
-		<TD>$date</TD><TD><A HREF="$link">$filename</A></TD><TD>$desc</TD>
-	</TR>
-};
-		
-}
-
-if ($changeable) {
-	$bug_form{'attachment_element'} .= qq{
-	<TR>
-		<TD COLSPAN=6><A HREF="createattachment.cgi?id=$id"> 
-		Create a new attachment</A> (proposed patch, testcase, etc.)</TD>
-	</TR>
-};
-}
-
-$bug_form{'attachment_element'} .= "</TABLE>\n";
-
-
-sub EmitDependList {
-    my ($desc, $myfield, $targetfield) = (@_);
-	my $depends;
-    $depends = "<TD ALIGN=right>$desc:</TD><TD>";
-    my @list;
-    SendSQL("select dependencies.$targetfield, bugs.bug_status " .
- 			"from dependencies, bugs " . 
- 			"where dependencies.$myfield = $id " .
-   			"and bugs.bug_id = dependencies.$targetfield " .
-			"order by dependencies.$targetfield");
-    while (MoreSQLData()) {
-        my ($i, $stat) = (FetchSQLData());
-        push(@list, $i);
-        my $opened = ($stat eq "NEW" || $stat eq "ASSIGNED" ||
-                      $stat eq "REOPENED");
-        if (!$opened) {
-            $depends .= "<STRIKE>";
-        }
-        $depends .= qq{<A HREF="show_bug.cgi?id=$i">$i</A>};
-        if (!$opened) {
-            $depends .= "</STRIKE>";
-        }
-        $depends .= " ";
-    }
-	if ($changeable) {
-	    $depends .= "</TD><TD><INPUT NAME=$targetfield VALUE=\"" .
-    			    join(',', @list) . "\"></TD>\n";
-	} else {
-		$depends .= "</TD>\n";
-	}	
-	return $depends;
-}
-
-if (Param("usedependencies")) {
-    $bug_form{'depends_element'} = "<TABLE><TR>\n<TH ALIGN=right>Dependencies:</TH>\n";
-    $bug_form{'depends_element'} .= EmitDependList("Bug $id depends on", "blocked", "dependson");
-    $bug_form{'depends_element'} .= qq{
-<TD ROWSPAN=2><A HREF="showdependencytree.cgi?id=$id">Show dependency tree</A>
-};
-    if (Param("webdotbase") ne "") {
-        $bug_form{'depends_element'} .= qq{
-<BR><A HREF="showdependencygraph.cgi?id=$id">Show dependency graph</A>
-};
-    }
-    $bug_form{'depends_element'} .= "</TD></TR><TR><TD></TD>";
-    $bug_form{'depends_element'} .= EmitDependList("Bug $id blocks", "dependson", "blocked");
-    $bug_form{'depends_element'} .= "</TR></TABLE>\n";
-}
-
-if ($::prodmaxvotes{$bug{'product'}}) {
-    $bug_form{'votes_element'} = qq{
-<TABLE><TR>
-<TH><A HREF="votehelp.html">Votes</A> for bug $id:</TH><TD>
-<A HREF="showvotes.cgi?bug_id=$id">$bug{'votes'}</A>
-&nbsp;&nbsp;&nbsp;<A HREF="showvotes.cgi?voteon=$id">Vote for this bug</A>
-</TD></TR></TABLE>
-};
-}
-
-if ($::driver eq 'mysql') {
-	if ($::usergroupset ne '0') {
-    	SendSQL("select bit, description, (bit & $bug{'groupset'} != 0) from groups where bit & $::usergroupset != 0 and isbuggroup != 0 order by bit");
-    	while (MoreSQLData()) {
-        	my ($bit, $description, $ison) = (FetchSQLData());
-        	my $check0 = !$ison ? " SELECTED" : "";
-        	my $check1 = $ison ? " SELECTED" : "";
-        	print "<SELECT NAME=bit-$bit><OPTION VALUE=0$check0>\n";
-        	print "People not in the \"$description\" group can see this bug\n";
-        	print "<OPTION VALUE=1$check1>\n";
-        	print "Only people in the \"$description\" group can see this bug\n";
-        	print "</SELECT><BR>\n";
-    	}
-	}
-}
-
-
-if ($changeable) {
-    # Find the default owner so user will know who assigning to
-    # if they choose the 'Assign to owner of selected component'
-    my $query = "select initialowner from components " .
-            "where program = " . SqlQuote($bug{'product'}) .
-            " and value = " . SqlQuote($bug{'component'});
-    SendSQL($query);
-    my $initial_owner = "(" . FetchOneColumn() . ")";
-
-    $bug_form{'resolution_change'} = qq{
-    <TABLE CELLSPACING=0 CELLPADDING=3 BORDER=1 WIDTH=100%>
-    <TR BGCOLOR="#CFCFCF">
-        <TD ALIGN=left><B>Change State or Resolution</B>
-        <BR>(Allowed only by reporter and privileged members)</TD>
-    </TR><TR BGCOLOR="#ECECEC">
-        <TD ALIGN=left>
-        <INPUT TYPE=radio NAME=knob VALUE=none CHECKED>
-            Leave as <b>$bug{'bug_status'} $bug{'resolution'}</b><br>
-};
-
-	# knum is which knob number we're generating, in javascript terms.
-    my $knum = 1;
-
-    my $status = $bug{'bug_status'};
-
-    if ($status eq "NEW" || $status eq "ASSIGNED" || $status eq "REOPENED") {
-        if ($status ne "ASSIGNED") {
-            $bug_form{'resolution_change'} .= "<INPUT TYPE=radio NAME=knob VALUE=accept>" .
-                  "Accept bug (change status to <b>ASSIGNED</b>)<br>";
-            $knum++;
-        }
-        if ($bug{'resolution'} ne "") {
-            $bug_form{'resolution_change'} .= "<INPUT TYPE=radio NAME=knob VALUE=clearresolution>\n" .
-                "Clear the resolution (remove the current resolution of\n" .
-                "<b>$bug{'resolution'}</b>)<br>\n";
-            $knum++;
-        }
-        $bug_form{'resolution_change'} .= "<INPUT TYPE=radio NAME=knob VALUE=resolve>" .
-               "Resolve bug, changing <A HREF=\"bug_status.cgi\">resolution</A> to " .
-               "<SELECT NAME=resolution " .
-               "ONCHANGE=\"document.changeform.knob\[$knum\].checked=true\"> " .
-               $bug_form{'resolution_popup'} . "</SELECT><br>\n";
-        $knum++;
-        $bug_form{'resolution_change'} .= "<INPUT TYPE=radio NAME=knob VALUE=duplicate> " .
-            "Resolve bug, mark it as duplicate of bug # " .
-            "<INPUT NAME=dup_id SIZE=6 ONCHANGE=\"document.changeform.knob\[$knum\].checked=true\">\n" .
-            "(<A HREF=\"buglist.cgi?component=$bug{'component'}\" target=\"new_window\">$bug{'component'} bugs</A>)<BR>\n";
-        $knum++;
-        my $assign_element = "<INPUT NAME=\"assigned_to\" SIZE=25 MAXSIZE=50 ONCHANGE=\"document.changeform.knob\[$knum\].checked=true\" VALUE=\"$bug{'assigned_to'}\">";
-
-        $bug_form{'resolution_change'} .= "<INPUT TYPE=radio NAME=knob VALUE=assign> " .
-            "<A HREF=\"bug_status.cgi#assigned_to\">Assign</A> bug to $assign_element <BR>\n";
-        $knum++;
-        $bug_form{'resolution_change'} .= "<INPUT TYPE=radio NAME=knob VALUE=assignbycomponent> " .
-            "Assign bug to owner of selected component &nbsp;$initial_owner<br>\n";
-        $knum++;
-    } else {
-		$bug_form{'resolution_change'} .= "<INPUT TYPE=hidden NAME=assigned_to VALUE=\"$bug{'assigned_to'}\">\n";
-        $bug_form{'resolution_change'} .= "<INPUT TYPE=radio NAME=knob VALUE=reopen> Reopen bug<br>\n";
-        $knum++;
-        if ($status eq "RESOLVED") {
-            $bug_form{'resolution_change'} .= "<INPUT TYPE=radio NAME=knob VALUE=verify> " .
-                "Mark bug as <b>VERIFIED</b><br>\n";
-            $knum++;
-        }
-        if ($status ne "CLOSED") {
-            $bug_form{'resolution_change'} .= "<INPUT TYPE=radio NAME=knob VALUE=close> " .
-                "Mark bug as <b>CLOSED</b><br>\n";
-            $knum++;
-        }
-    }
-
-    $bug_form{'resolution_change'} .= "
-        </TD>
-    </TR>
-    </TABLE>
-";
-
-    # Find out which groups we are a member of and form radio buttons
-    SendSQL("select user_group.groupid, groups.description, groups.isbuggroup " .
-            "from user_group, groups " .
-            "where user_group.groupid = groups.groupid " .
-            "and user_group.userid = $userid order by groups.groupid");
-    my %grouplist;
-    my @buggrouplist;
-    my @row;
-    my $flag = 0;
-    while (@row = FetchSQLData()) {
-        if ($row[2] == 0) {
-            next;
-        }
-        $grouplist{$row[0]} = $row[1];
-        $flag = 1;
-    }
-
-    if ($flag) {
-        $bug_form{'group_change'} = "
-    <TABLE CELLSPACING=0 CELLPADDING=3 BORDER=1>
-    <TR BGCOLOR=\"#CFCFCF\">
-        <TD ALIGN=left><B>Groups that can see this bug.</B><BR> 
-            (If all unchecked then same as everyone)</TD>
-    </TR><TR BGCOLOR=\"ECECEC\">
-        <TD ALIGN=left>
-";
-
-        SendSQL("select groupid from bug_group where bugid = $id");
-        while (@row = FetchSQLData()) {
-            push (@buggrouplist, $row[0]);
-        }
-
-        foreach my $group (keys %grouplist) {
-            my $checked = lsearch(\@buggrouplist, $group) >= 0 ? "CHECKED" : "";
-            $bug_form{'group_change'} .= "<INPUT TYPE=checkbox NAME=group-$group $checked VALUE=1>\n" .
-                "Only <B>$grouplist{$group}</B> can see this bug.<BR>\n";
-        }
-
-        $bug_form{'group_change'} .= "
-        </TD>
-    </TR>
-    </TABLE>
-";
-    }
-}
-
-# added <INPUT TYPE=hidden NAME=reporter VALUE=$bug{'reporter'}> to get the necessary
-# redhat changes in process_bug.cgi to work which disallows all users to make changes 
-
-if ($changeable) {
-    $bug_form{'commit_change'} = "
-    <TABLE CELLSPACING=0 CELLPADDING=3 BORDER=1>
-    <TR BGCOLOR=\"#CFCFCF\">
-        <TD ALIGN=left><B>Private Changes</B><BR>
-        (Reporter, assigned, or privileged members only)</TD>
-    </TR><TR BGCOLOR=\"#ECECEC\">
-        <TD ALIGN=center>
-        <TABLE> 
-        <TR>
-            <TD ALIGN=center VALIGN=top>    
-            <INPUT TYPE=\"submit\" VALUE=\"Save Changes\">
-            </TD><TD ALIGN=center VALIGN=top>
-            <INPUT TYPE=\"reset\" VALUE=\"Reset\">
-            <INPUT TYPE=hidden name=form_name VALUE=process_bug>
-            <INPUT TYPE=hidden NAME=reporter VALUE=\"$bug{'reporter'}\">
-            </FORM>
-            </TD>
-";
-
-    if (UserInGroup("errata")) {
-        $bug_form{'commit_change'} .= "
-        <TD ALIGN=center VALIGN=top>
-        <FORM ACTION=\"http://porkchop.redhat.com/bugzilla/newerrata.cgi\">
-        <INPUT TYPE=hidden NAME=product VALUE=\"$bug{'product'}\">
-        <INPUT TYPE=hidden NAME=synopsis VALUE=\"$bug{'component'}\">
-        <INPUT TYPE=hidden NAME=id_fixed VALUE=\"$::FORM{'id'}\">
-        <INPUT TYPE=hidden NAME=\"rep_platform-$bug{'rep_platform'}\" VALUE=\"$bug{'rep_platform'}\">
-        <INPUT TYPE=hidden NAME=\"release-$bug{'version'}\" VALUE=\"$bug{'version'}\">
-        <INPUT TYPE=submit NAME=action VALUE=\"New Errata\">
-        </FORM>
-        </TD>
-";
-    }
-    $bug_form{'commit_change'} .= "
-    </TR>
-    </TABLE>
-";
-
-} else {
-    $bug_form{'commit_change'} = "
-    <TABLE CELLSPACING=0 CELLPADDING=3 BORDER=1>
-    <TR BGCOLOR=\"CFCFCF\">
-        <TD ALIGN=left>
-        <B>Public Changes</B><BR>(Non-members will need to create account)</TD>
-    </TR><TR BGCOLOR=\"#ECECEC\"> 
-        <TD>
-        <TABLE CELLSPACING=0 CELLPADDING=0 WIDTH=\"100%\">
-        <TR>
-            <TD ALIGN=center VALIGN=center>
-			<INPUT TYPE=hidden NAME=id VALUE=$id>
-            <INPUT TYPE=hidden NAME=product VALUE=\"$bug{'product'}\">
-            <INPUT TYPE=hidden NAME=version VALUE=\"$bug{'version'}\">
-            <INPUT TYPE=hidden NAME=component VALUE=\"$bug{'component'}\"> 
-			<INPUT TYPE=hidden name=knob VALUE=add_comment>	
-            <INPUT TYPE=submit NAME=add_comment VALUE=\"Add Comment\">
-            </FORM></TD>
-            <TD ALIGN=center VALIGN=center> 
-            <FORM METHOD=post ACTION=process_bug.cgi>
-            <INPUT TYPE=hidden NAME=id VALUE=$id>
-            <INPUT TYPE=hidden NAME=product VALUE=\"$bug{'product'}\">
-            <INPUT TYPE=hidden NAME=version VALUE=\"$bug{'version'}\">
-            <INPUT TYPE=hidden NAME=component VALUE=\"$bug{'component'}\">
-            <INPUT TYPE=hidden name=knob VALUE=add_cc>
-            <INPUT TYPE=submit NAME=add_cc VALUE=\"Add Me to CC List\">
-            </FORM></TD>
-            <TD ALIGN=center VALIGN=center>
-            <FORM METHOD=post ACTION=process_bug.cgi>
-            <INPUT TYPE=hidden NAME=id VALUE=$id>
-            <INPUT TYPE=hidden NAME=product VALUE=\"$bug{'product'}\">
-            <INPUT TYPE=hidden NAME=version VALUE=\"$bug{'version'}\">
-            <INPUT TYPE=hidden NAME=component VALUE=\"$bug{'component'}\">
-            <INPUT TYPE=hidden name=knob VALUE=rem_cc>
-            <INPUT TYPE=submit NAME=add_cc VALUE=\"Remove Me from CC List\">
-            </FORM>
-            </TD>
-        </TR>
-        </TABLE>
-    </TR>
-    </TABLE>
-";
-}
-
-
-# We need to throw all remaining %bug variables into %bug_form for display if needed
-foreach my $key (keys %bug) {
-    $bug_form{$key} = $bug{$key};
-}
-foreach my $key (keys %::FORM) {
-    $bug_form{$key} = $::FORM{$key};
-}
-
-# we can now fill in the bug form template
-print LoadTemplate('bugform_redhat.tmpl', \%bug_form);
- 
-# To add back option of editing the long description, insert after the above
-# long_list.cgi line:
-#  <A HREF=\"edit_desc.cgi?id=$id\">Edit Long Description</A>
-
-1;

mozilla/webtools/bugzilla/bug_status.cgi

@@ -1,196 +0,0 @@
-#!/usr/bin/perl -w
-
-use diagnostics;
-use strict;
- 
-require 'CGI.pl';
-
-print "Content-type:text/html\n\n";
-
-PutHeader("Form Help");
-
-print "
-<TABLE WIDTH=800 ALIGN=center><TR><TD ALIGN=left>
-<H1>A Bug's Life Cycle</H1>
-
-The <B>status</B> and <B>resolution</B> field define and track the
-life cycle of a bug.
-
-<P>
-<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0 WIDTH=100%>
-  <TR ALIGN=center VALIGN=top>
-    <TD WIDTH=\"50%\"><H1>STATUS</H1></TD>
-    <TD><H1>RESOLUTION</H1></TD>
-  </TR>
-  <TR VALIGN=top>
-    <TD>The <A NAME=\"status\"><B>status</B></A> field indicates the general
-        health of a bug.  Only certain status transitions are allowed.</TD>
-    <TD>The <A NAME=\"resolution\"><B>resolution</B></A> field indicates what
-        happened to this bug.</TD>
-  </TR>
-  <TR VALIGN=top>
-    <TD>
-      <DL>
-        <DT><A NAME=\"new\"><B>NEW</B></A>
-          <DD> This bug has recently been added to the list of bugs and must
-               be processed. Bugs in this state may be <B>VERIFIED</B>,
-               remain <B>NEW</B>, or resolved and marked <B>RESOLVED</B>.
-        <DT><A NAME=\"verified\"><B>VERIFIED</B></A>
-          <DD> This bug has been verified as a bug.  Bugs in this state may
-               be <B>ASSIGNED</B>, or remain <B>VERIFIED</B>.
-        <DT><A NAME=\"assigned\"><B>ASSIGNED</B></A>
-          <DD> This bug is not yet resolved, but is assigned to the proper
-               person. From here bugs can be given to another person, or
-               resolved and become <B>RESOLVED</B>.
-        <DT><A NAME=\"reopened\"><B>REOPENED</B></A>
-          <DD>This bug was once resolved, but the resolution was deemed
-              incorrect.  For example, a <B>WORKSFORME</B> bug is
-              <B>REOPENED</B> when more information shows up and the bug is now
-              reproducible.  From here bugs are either marked <B>ASSIGNED</B>
-              or <B>RESOLVED</B>.
-      </DL>
-    </TD>
-    <TD>
-      <DL>
-             No resolution yet. All bugs which are <B>NEW</B>,
-             <B>VERIFIED</B>, <B>ASSIGNED</B>, or <B>REOPENED</B> have the
-             resolution set to blank. All other bugs will be marked with
-             one of the following resolutions.
-      </DL>
-    </TD>
-  </TR>
-  <TR VALIGN=top>
-    <TD>
-      <DL>
-        <DT><A NAME=\"resolved\"><B>RESOLVED</B></A>
-          <DD> A resolution has been found.  From here bugs can be
-               <B>REOPENED</B>.
-      </DL>
-    </TD>
-    <TD>
-      <DL>
-        <DT><A NAME=\"notabug\"><B>NOTABUG</B></A>
-          <DD> The problem described is not a bug.
-        <DT><A NAME=\"wontfix\"><B>WONTFIX</B></A>
-          <DD> The problem described is a bug which will never be fixed.
-        <DT><A NAME=\"deferred\"><B>DEFERRED</B></A>
-          <DD> The problem described is a bug which will not be fixed in this
-               version of the product.
-        <DT><A NAME=\"duplicate\"><B>DUPLICATE</B></A>
-          <DD> The problem is a duplicate of an existing bug. Marking a bug
-               duplicate requires the bug# of the duplicating bug and will at
-               least put that bug number in the description field.
-        <DT><A NAME=\"worksforme\"><B>WORKSFORME</B></A>
-          <DD> All attempts at reproducing this bug were futile, reading the
-               code produces no clues as to why this behavior would occur. If
-               more information appears later, please re-assign the bug, for
-               now, file it.
-        <DT><A NAME=\"currentrelease\"><B>CURRENTRELEASE</B></A>
-          <DD> The problem described has already been fixed and can be obtained
-               in the latest version of our product.
-        <DT><A NAME=\"rawhide\"><B>RAWHIDE</B></A>
-          <DD> The problem describe has been fixed in the latest development
-               release of our product obtainable from our ftp site.
-        <DT><A NAME=\"errata\"><B>ERRATA</B></A>
-          <DD> The problem described has been fixed and will be available as
-               an errata update from our support web site. Please check the site
-               to see if it is currently available for download.
-      </DL>
-    </TD>
-  </TR>
-</TABLE>
-
-<H1>Other Fields</H1>
-
-<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0 WIDTH=100%>
-  <TR>
-    <TH ALIGN=center VALIGN=center><A NAME=\"severity\">
-      <H2>Severity</H2></A>
-    </TH>
-    <TH ALIGN=center VALIGN=center><a name=\"priority\">
-      <h2>Priority</h2></a>
-    </TH>
-  </TR>
-  <TR>
-    <TD ALIGN=center VALIGN=center>This field describes the impact of a bug.</TD>
-    <TD ALIGN=center VALIGN=center>This field describes the importance and order in which
-        a bug should be fixed.  The available priorities are:
-    </TD>
-  </TR>
-  <TR>
-    <TD VALIGN=top>
-	<TABLE CELLPADDING=4>
-	<TR>
-		<TD><B>Security</B></TD>
-    	<TD>security issue</TD>
-	</TR><TR>
-		<TD><B>High</B></TD>
-    	<TD>crashes, loss of data, severe memory leak</TD>
-	</TR><TR>
-		<TD><B>Low</B></TD>
-    	<TD>minor loss of function, or other problem where
-        easy workaround is present</TD>
-	</TR><TR>
-    	<TD><B>Enhancement</B></TD>
-    	<TD>some feature or change you would like to see in any future releases of the product</TD>
-	</TR>
-	</TABLE>
-	</TD>
-  	<TD VALIGN=top>
-	<TABLE CELLPADDING=4>
-	<TR>
-		<TD><B>High</B></TD>
-	    <TD>Most important</TD>
-	</TR><TR>
-	    <TD><B>Normal</B></TD>
-	    <TD>Average Importance</TD>
-	</TR><TR>
-	    <TD><B>Low</B></TD>
-	    <TD>Least important</TD>
-  	</TR>
-	</TABLE>
-	</TD>
-  </TR>
-</TABLE>
-	
-<A NAME=\"rep_platform\"><H2>Platform</H2></a>
-This is the platform against which the bug was reported.
-Legal platforms include:
-
-<UL>
-  <LI> All (happens on all platforms; cross-platform bug)
-  <LI> i386
-  <LI> sparc
-  <LI> alpha
-</UL>
-
-<B>Note:</B> Selecting the option \"All\" does not select bugs assigned
-against all platforms.  It merely selects bugs that <B>occur</B> on
-all platforms.
-
-<A NAME=\"assigned_to\"><H2>Assigned To</H2></a>
-
-This is the person in charge of resolving the bug.
-
-<A NAME=\"reporter\"><H2>Reporter</H2></a>
-
-This is the person who reported the bug.
-
-<p>
-
-The default status for queries is set to NEW, ASSIGNED and REOPENED. When
-searching for bugs that have been resolved or verified, remember to set the
-status field appropriately.
-
-<P>
-<A NAME=\"description\"><H2>Description and Additional Comments</H2></a>
-Markup tags entered in these fields will appear as plain text. Numbers preceded by the word
-'bug' will be converted to hyperlinks<BR>pointing to the proper bug reports. Any email addresses
-will be automatically converted to mailto: hyperlinks. Also any urls starting<BR>with http://
-will be made automatically into hyperlinks.
-</TD></TR></TABLE>
-";
-
-PutFooter();
-
-

mozilla/webtools/bugzilla/bug_status.html

@@ -1,201 +0,0 @@
-<HTML>
-
-<!--
-     The contents of this file are subject to the Mozilla Public
-     License Version 1.1 (the "License"); you may not use this file
-     except in compliance with the License. You may obtain a copy of
-     the License at http://www.mozilla.org/MPL/
-    
-     Software distributed under the License is distributed on an "AS
-     IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-     implied. See the License for the specific language governing
-     rights and limitations under the License.
-    
-     The Original Code is the Bugzilla Bug Tracking System.
-    
-     The Initial Developer of the Original Code is Netscape Communications
-     Corporation. Portions created by Netscape are
-     Copyright (C) 1998 Netscape Communications Corporation. All
-     Rights Reserved.
-    
-     Contributor(s): 
-
-     Contributor(s): Terry Weissman <terry@mozilla.org>
--->
-
-<TITLE>A Bug's Life Cycle</TITLE>
-
-<h1 ALIGN=CENTER>A Bug's Life Cycle</h1>
-
-The <B>status</B> and <B>resolution</B> field define and track the
-life cycle of a bug.
-
-<a name="status">
-<p>
-</a>
-<TABLE BORDER=1 CELLPADDING=4>
-
-<TR ALIGN=CENTER VALIGN=TOP>
-<TD WIDTH=50%><H1>STATUS</H1> <TD><H1>RESOLUTION</H1>
-
-<TR VALIGN=TOP>
-<TD>The <B>status</B> field indicates the general health of a bug. Only
-certain status transitions are allowed.
-<TD>The <b>resolution</b> field indicates what happened to this bug.
-
-<TR VALIGN=TOP><TD>
-<DL><DT><B>UNCONFIRMED</B> 
-<DD> This bug has recently been added to the database.  Nobody has
-     validated that this bug is true.  Users who have the "canconfirm"
-     permission set may confirm this bug, changing its state to NEW.
-     Or, it may be directly resolved and marked RESOLVED.
-<DT><B>NEW</B> 
-<DD> This bug has recently been added to the assignee's list of bugs
-     and must be processed. Bugs in this state may be accepted, and
-     become <B>ASSIGNED</B>, passed on to someone else, and remain
-     <B>NEW</B>, or resolved and marked <B>RESOLVED</B>.
-<DT><B>ASSIGNED</B> 
-<DD> This bug is not yet resolved, but is assigned to the proper
-     person. From here bugs can be given to another person and become
-     <B>NEW</B>, or resolved and become <B>RESOLVED</B>.
-<DT><B>REOPENED</B>
-<DD>This bug was once resolved, but the resolution was deemed
-     incorrect.  For example, a <B>WORKSFORME</B> bug is
-     <B>REOPENED</B> when more information shows up and the bug is now
-     reproducible.  From here bugs are either marked <B>ASSIGNED</B>
-     or <B>RESOLVED</B>.
-</DL>
-<TD>
-<DL>
-<DD> No resolution yet. All bugs which are in one of these "open" states
-     have the resolution set to blank. All other bugs
-     will be marked with one of the following resolutions.
-</DL>
-
-<TR VALIGN=TOP><TD>
-<DL>
-<DT><B>RESOLVED</B> 
-<DD> A resolution has been taken, and it is awaiting verification by
-     QA. From here bugs are either re-opened and become
-     <B>REOPENED</B>, are marked <B>VERIFIED</B>, or are closed for good
-     and marked <B>CLOSED</B>.
-<DT><B>VERIFIED</B>
-<DD> QA has looked at the bug and the resolution and agrees that the
-     appropriate resolution has been taken.  Bugs remain in this state
-     until the product they were reported against actually ships, at
-     which point they become <B>CLOSED</B>.
-<DT><B>CLOSED</B> 
-<DD> The bug is considered dead, the resolution is correct. Any zombie
-     bugs who choose to walk the earth again must do so by becoming
-     <B>REOPENED</B>.
-</DL>
-
-<TD>
-<DL>
-<DT><B>FIXED</B>
-<DD> A fix for this bug is checked into the tree and tested.
-<DT><B>INVALID</B>
-<DD> The problem described is not a bug 
-<DT><B>WONTFIX</B>
-<DD> The problem described is a bug which will never be fixed.
-<DT><B>LATER</B>
-<DD> The problem described is a bug which will not be fixed in this
-     version of the product.
-<DT><B>REMIND</B>
-<DD> The problem described is a bug which will probably not be fixed in this
-     version of the product, but might still be.
-<DT><B>DUPLICATE</B>
-<DD> The problem is a duplicate of an existing bug. Marking a bug
-     duplicate requires the bug# of the duplicating bug and will at
-     least put that bug number in the description field.
-<DT><B>WORKSFORME</B>
-<DD> All attempts at reproducing this bug were futile, reading the
-     code produces no clues as to why this behavior would occur. If
-     more information appears later, please re-assign the bug, for
-     now, file it.
-</DL>
-</TABLE>
-
-<H1>Other Fields</H1>
-
-<table border=1 cellpadding=4><tr><td>
-<a name="severity"><h2>Severity</h2></a>
-
-This field describes the impact of a bug.
-
-<p>
-<p>
- 
-<table>
-<tr><th>Blocker</th><td>Blocks development and/or testing work
-<tr><th>Critical</th><td>crashes, loss of data, severe memory leak 
-<tr><th>Major</th><td>major loss of function 
-<tr><th>Minor</th><td>minor loss of function, or other problem where easy workaround is present 
-<tr><th>Trivial</th><td>cosmetic problem like misspelt words or misaligned text 
-<tr><th>Enhancement</th><td>Request for enhancement
-</table> 
-
-</td><td>
-
-<a name="priority"><h2>Priority</h2></a>
-
-This field describes the importance and order in which a bug should be
-fixed.  This field is utilized by the programmers/engineers to
-prioritized their work to be done.  The available priorities are:
-
-<p>
-<p>
-
-<table>
-<tr><th>P1</th><td>Most important
-<tr><th>P2</th><td>
-<tr><th>P3</th><td>
-<tr><th>P4</th><td>
-<tr><th>P5</th><td>Least important
-</table>
-</tr></table>
-
-<a name="rep_platform"><h2>Platform</h2></a>
-This is the hardware platform against which the bug was reported.  Legal
-platforms include:
-
-<UL>
-<LI> All (happens on all platform; cross-platform bug)
-<LI> Macintosh
-<LI> PC
-<LI> Sun
-<LI> HP
-</UL>
-
-<b>Note:</b> Selecting the option "All" does not select bugs assigned against all platforms.  It
-merely selects bugs that <b>occur</b> on all platforms.
-
-<a name="op_sys"><h2>Operating System</h2></a>
-This is the operating system against which the bug was reported.  Legal
-operating systems include:
-
-<UL>
-<LI> All (happens on all operating systems; cross-platform bug)
-<LI> Windows 95
-<LI> Mac System 8.0
-<LI> Linux
-</UL>
-
-Note that the operating system implies the platform, but not always.
-For example, Linux can run on PC and Macintosh and others.
-
-<a name="assigned_to"><h2>Assigned To</h2></a>
-
-This is the person in charge of resolving the bug.  Every time this
-field changes, the status changes to <B>NEW</B> to make it easy to see
-which new bugs have appeared on a person's list.
-
-The default status for queries is set to NEW, ASSIGNED and REOPENED. When
-searching for bugs that have been resolved or verified, remember to set the
-status field appropriately. 
-
-<hr>
-<!-- hhmts start -->
-Last modified: Wed Feb 16 20:41:24 2000
-<!-- hhmts end -->
-</body> </html>

mozilla/webtools/bugzilla/bugwritinghelp.html

@@ -1,281 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<HTML>
-
-<HEAD>
-	<META NAME="GENERATOR" Content="Symantec Visual Page 1.0">
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html;CHARSET=iso-8859-1">
-	<TITLE>Bug Writing Guidelines</TITLE>
-</HEAD>
-
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000EE" VLINK="#551A8B" ALINK="#FF0000">
-
-<H1 ALIGN="CENTER">bug writing guidelines</H1>
-<P ALIGN="CENTER"><FONT SIZE="2"><B>(Please send feedback/update requests to </B></FONT><A
-HREF="mailto:eli@prometheus-music.com"><FONT SIZE="2"><B>Eli Goldberg</B></FONT></A><FONT
-SIZE="2"><B>)</B></FONT></P>
-<P><FONT SIZE="4"><B><BR>
-Why You Should Read This</B></FONT>
-
-
-<BLOCKQUOTE>
-	<P>Simply put, the more effectively you report a bug, the more likely an engineer
-	will actually fix it. <BR>
-	<A HREF="http://bugzilla.mozilla.org"><BR>
-	</A>These bug writing guidelines are an attempt at a general tutorial on writing
-	effective bug reports for novice bug writers; not every sentence may precisely apply
-	to your software project.
-
-</BLOCKQUOTE>
-
-<P><FONT SIZE="4"><B><BR>
-How to Write a Useful Bug Report</B></FONT>
-
-
-<BLOCKQUOTE>
-	<P>Useful bug reports are ones that get bugs fixed. A useful bug report normally
-	has two qualities:
-
-	<OL>
-	<LI><B>Reproducible.</B> If an engineer can't see it or conclusively prove that it
-	exists, the engineer will probably stamp it &quot;WORKSFORME&quot; or &quot;INVALID&quot;,
-	and move on to the next bug. Every detail you can provide helps. <BR>
-	<BR>
-	
-	<LI><B>Specific.</B> The quicker the engineer can isolate the issue to a specific
-	problem, the more likely it'll be expediently fixed.<B> </B>(If a programmer or tester
-	has to decypher a bug, they spend more time cursing the submitter than fixing or
-	testing the problem.)
-	</OL>
-
-	<P>Let's say the application you're testing is a web browser. You crash at foo.com,
-	and want to write up a bug report:
-
-	<BLOCKQUOTE>
-		<P><B>BAD:</B> &quot;My browser crashed. I think I was on foo.com. My computer uses
-		Windows. I think that this is a really bad problem and you should fix it now. By
-		the way, your icons really suck. Nobody will use your software if you keep those
-		ugly icons. Oh, and my grandmother's home page doesn't look right, either, it's all
-		messed up. Good luck.&quot;<BR>
-		<BR>
-		<B>GOOD: </B>&quot;I crashed each time when I went to foo.com, using the 10.28.99
-		build on a Win NT 4.0 (Service Pack 5) system. I also rebooted into Linux, and reproduced
-		this problem using the 10.28.99 Linux build.<BR>
-		<BR>
-		It again crashed each time upon drawing the Foo banner at the top of the page. I
-		broke apart the page, and discovered that the following image link will crash the
-		application reproducibly, unless you remove the &quot;border=0&quot; attribute:<BR>
-		<BR>
-		<FONT SIZE="2"><TT>&lt;IMG SRC=&quot;http://foo.com/images/topics/topicfoos.gif&quot;
-		width=34 height=44 border=0 alt=&quot;News&quot;&gt;</TT>&quot;</FONT>
-
-	</BLOCKQUOTE>
-
-</BLOCKQUOTE>
-
-<P><FONT SIZE="4"><B><BR>
-<BR>
-How to Enter your Useful Bug Report into Bugzilla</B>:</FONT>
-
-
-<BLOCKQUOTE>
-	<P>Before you enter your bug, use the Bugzilla Query Page to determine whether the
-	defect you've discovered is a known bug, and has already been reported. (If your
-	bug is the 37th duplicate of a known issue, you're more likely to annoy the engineer.
-	Annoyed engineers fix fewer bugs.)<BR>
-	<BR>
-	Next, be sure that you've reproduced your bug using a recent build. (Engineers tend
-	to be most interested in problems afflicting the code base that they're actively
-	working on, rather than those in a code base that's hundreds of bug fixes obsolete.)<BR>
-	<BR>
-	If you've discovered a new bug using a current build, report it in Bugzilla:
-
-</BLOCKQUOTE>
-
-
-<OL>
-	<OL>
-		<LI>From your Bugzilla main page, choose &quot;Enter a new bug&quot;.
-		<LI>Select the product that you've found a bug in.
-		<LI>Enter your E-mail address, Password, and press the &quot;Login&quot; button.
-		(If you don't yet have a password, leave the password text box empty, and press the
-		&quot;E-mail me a password&quot; button instead. You'll receive an E-mail message
-		with your password shortly.)
-	</OL>
-	<P>Now, fill out the form. Here's what it all means:
-</OL>
-
-
-
-<BLOCKQUOTE>
-	<P><B>Where did you find the bug?</B>
-
-	<BLOCKQUOTE>
-		<P><B>Product: In which product did you find the bug?</B><BR>
-		You just filled this out on the last page.</P>
-		<P><B>Version: In which product version did you find the bug?</B><BR>
-		If applicable.</P>
-		<P><B>Component: In which component does the bug exist?</B><BR>
-		Bugzilla requires that you select a component to enter a bug. (If they all look meaningless,
-		click on the Component link, which links to descriptions of each component, to help
-		you make the best choice.)</P>
-		<P><B>Platform:&#160;On which hardware platform did you find this bug?</B><FONT SIZE="2"><B>
-		</B>(e.g. Macintosh, SGI, Sun, PC.) </FONT><BR>
-		If you know the bug happens on all hardware platforms, choose 'All'. Otherwise, select
-		the platform that you found the bug on, or &quot;Other&quot; if your platform isn't
-		listed.</P>
-		<P><B>OS: On which Operating System (OS) did you find this bug?</B> <FONT SIZE="2">(e.g.
-		Linux, Windows NT, Mac OS 8.5.)</FONT><BR>
-		If you know the bug happens on all OSs, choose 'All'. Otherwise, select the OS that
-		you found the bug on, or &quot;Other&quot; if your OS isn't listed.</P>
-
-	</BLOCKQUOTE>
-	<P><B><BR>
-	How important is the bug?</B>
-
-	<BLOCKQUOTE>
-		<P><B>Severity: How damaging is the bug?</B><BR>
-		This item defaults to 'normal'. (To determine the most appropriate severity for a
-		particular bug, click on the Severity link for a full explanation of each choice,
-		from Critical to Enhancement.)
-
-	</BLOCKQUOTE>
-	<P><B><BR>
-	Who will be following up on the bug?</B>
-
-	<BLOCKQUOTE>
-		<P><B>Assigned To: Which engineer should be responsible for fixing this bug?</B><BR>
-		Bugzilla will automatically assign the bug to a default engineer upon submitting
-		a bug report; the text box exists to allow you to manually assign it to a different
-		engineer. (To see the list of default engineers for each component, click on the
-		Component link.)</P>
-		<P><B>Cc: Who else should receive e-mail updates on changes to this bug? </B><BR>
-		List the full e-mail addresses of other individuals who should receive an e-mail
-		update upon every change to the bug report. You can enter as many e-mail addresses
-		as you'd like; e-mail addresses must be separated by commas, with no spaces between
-		the addresses.
-
-	</BLOCKQUOTE>
-	<P><B><BR>
-	What else can you tell the engineer about the bug?</B></P>
-
-	<BLOCKQUOTE>
-		<P><B>URL: On what URL did you discover this bug?</B><BR>
-		If you encountered the bug on a particular URL, please provide it (or, them) here.
-		If you've isolated the bug to a specific HTML snippet, please also provide a URL
-		for that, too.</P>
-
-		<P><B>Summary:</B> <B>How would you describe the bug, in approximately 60 or fewer
-		characters?</B><BR>
-		A good summary should <U>quickly and uniquely identify a bug report</U>. Otherwise,
-		developers cannot meaningfully query by bug summary, and will often fail to pay attention
-		to your bug report when reviewing a 10 page bug list.<BR>
-		<BR>
-		A summary of &quot;PCMCIA install fails on Tosh Tecra 780DVD w/ 3c589C&quot; is a
-		useful title. &quot;Software fails&quot; or &quot;install problem&quot; would be
-		examples of a bad title.</P>
-
-		<P><BR>
-		<B>Description: What else can you tell the engineer about this bug? </B><BR>
-		Please provide as detailed of a problem diagnosis in this field as possible. <BR>
-		<BR>
-		Where applicable, using the following bug report template will help ensure that all
-		relevant information comes through:
-
-		<BLOCKQUOTE>
-			<P><B>Overview Description:</B> More detailed expansion of summary.
-
-			<BLOCKQUOTE>
-				<PRE><FONT SIZE="2">Drag-selecting any page crashes Mac builds in NSGetFactory</FONT></PRE>
-
-			</BLOCKQUOTE>
-			<P><B>Steps to Reproduce: </B>The minimal set of steps necessary to trigger the bug.
-			Include any special setup steps. 
-
-			<BLOCKQUOTE>
-				<PRE><FONT SIZE="2">1) View any web page. (I used the default sample page, 
-   resource:/res/samples/test0.html)
-2) Drag-select the page. (Specifically, while holding down the 
-   mouse button, drag the mouse pointer downwards from any point in 
-   the browser's content region to the bottom of the browser's 
-   content region.)</FONT></PRE>
-
-			</BLOCKQUOTE>
-			<P><B>Actual Results:</B> What the application did after performing the above steps.
-
-			<BLOCKQUOTE>
-				<PRE><FONT SIZE="2">The application crashed. Stack crawl appended below from MacsBug.</FONT></PRE>
-
-			</BLOCKQUOTE>
-			<P><B>Expected Results:</B> What the application should have done, were the bug not
-			present.
-
-			<BLOCKQUOTE>
-				<PRE><FONT SIZE="2">The window should scroll downwards. Scrolled content should 
-be selected. (Or, at least, the application should not crash.)</FONT></PRE>
-
-			</BLOCKQUOTE>
-			<P><B>Build Date &amp; Platform:</B> Date and platform of the build that you first
-			encountered the bug in.
-
-			<BLOCKQUOTE>
-				<PRE><FONT SIZE="2">11/2/99 build on Mac OS (Checked Viewer &amp; Apprunner)</FONT></PRE>
-
-			</BLOCKQUOTE>
-			<P><B>Additional Builds and Platforms:</B> Whether or not the bug takes place on
-			other platforms or browsers.
-
-			<BLOCKQUOTE>
-				<PRE><FONT SIZE="2"> - Occurs On
-        Seamonkey (11/2/99 build on Windows NT 4.0)
-
- - Doesn't Occur On
-        Seamonkey (11/4/99 build on Red Hat Linux; feature not supported)
-        Internet Explorer 5.0 (RTM build on Windows NT 4.0)
-        Netscape Communicator 4.5 (RTM build on Mac OS)</FONT>
-</PRE>
-
-			</BLOCKQUOTE>
-			<P><B>Additional Information:</B> Any other debugging information. For crashing bugs:
-
-			<UL>
-	<LI><B>Win32:</B> if you receive a Dr. Watson error, please note the type of the
-	crash, and the module that the application crashed in. (e.g. access violation in
-	apprunner.exe)
-	<LI><B>Mac OS:</B> if you're running MacsBug, please provide the results of a <B><TT>how</TT></B>
-	and an <B><TT>sc</TT></B>.
-	<LI><B>Unix: </B>please provide a minimized stack trace, which can be generated by
-	typing <B><TT>gdb apprunner core</TT></B> into a shell prompt.
-			</UL>
-
-
-			<BLOCKQUOTE>
-				<P>
-				<PRE><FONT SIZE="2">*** MACSBUG STACK CRAWL OF CRASH (Mac OS)
-
-Calling chain using A6/R1 links
- Back chain  ISA  Caller
- 00000000    PPC  0BA85E74  
- 03AEFD80    PPC  0B742248  
- 03AEFD30    PPC  0B50FDDC  NSGetFactory+027FC
-PowerPC unmapped memory exception at 0B512BD0 NSGetFactory+055F0</FONT></PRE>
-
-			</BLOCKQUOTE>
-
-		</BLOCKQUOTE>
-
-	</BLOCKQUOTE>
-	<P>You're done! <BR>
-	<BR>
-	After double-checking your entries for any possible errors, press the &quot;Commit&quot;
-	button, and your bug report will now be in the Bugzilla database.<BR>
-	<I><BR>
-	<BR>
-	</I><FONT SIZE="2">(Thanks to Claudius Gayle, Peter Mock, Chris Pratt, Tom Schutter,
-	and Chris Yeh for contributing to this document. Constructive </FONT><A HREF="mailto:eli@prometheus-music.com"><FONT
-	SIZE="2">suggestions</FONT></A><FONT SIZE="2"> welcome.)</FONT>
-	</BLOCKQUOTE>
-
-
-</BODY>
-
-</HTML>

mozilla/webtools/bugzilla/changepassword.cgi

@@ -1,37 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-print q{Content-type: text/html
-
-<HTML>
-<HEAD>
-<META HTTP-EQUIV="Refresh"
-  CONTENT="0; URL=userprefs.cgi">
-</HEAD>
-<BODY>
-This URL is obsolete.  Forwarding you to the correct one.
-<P>
-Going to <A HREF="userprefs.cgi">userprefs.cgi</A>
-<BR>
-</BODY>
-</HTML>
-}

mozilla/webtools/bugzilla/colchange.cgi

@@ -1,115 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation. All Rights Reserved.
-# 
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-
-print "Content-type: text/html\n";
-
-# The master list not only says what fields are possible, but what order
-# they get displayed in.
-
-my @masterlist = ("opendate", "changeddate", "severity", "priority",
-                  "platform", "owner", "reporter", "status", "resolution",
-                  "component", "product", "version", "project", "os", "votes");
-
-if (Param("usetargetmilestone")) {
-    push(@masterlist, "target_milestone");
-}
-if (Param("useqacontact")) {
-    push(@masterlist, "qa_contact");
-}
-if (Param("usestatuswhiteboard")) {
-    push(@masterlist, "status_whiteboard");
-}
-
-
-push(@masterlist, ("summary", "summaryfull"));
-
-my $cookiepath = Param('cookiepath');
-
-my @collist;
-if (defined $::FORM{'rememberedquery'}) {
-    if (defined $::FORM{'resetit'}) {
-        @collist = @::default_column_list;
-    } else {
-        foreach my $i (@masterlist) {
-            if (defined $::FORM{"column_$i"}) {
-                push @collist, $i;
-            }
-        }
-    }
-    my $list = join(" ", @collist);
-    print "Set-Cookie: COLUMNLIST=$list ; path=$cookiepath ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
-    print "Refresh: 0; URL=buglist.cgi?$::FORM{'rememberedquery'}\n";
-    print "\n";
-    print "<TITLE>What a hack.</TITLE>\n";
-    PutHeader ("Change columns");
-    print "Resubmitting your query with new columns...\n";
-    exit;
-}
-
-if (defined $::COOKIE{'COLUMNLIST'}) {
-    @collist = split(/ /, $::COOKIE{'COLUMNLIST'});
-} else {
-    @collist = @::default_column_list;
-}
-
-
-my %desc;
-foreach my $i (@masterlist) {
-    $desc{$i} = $i;
-}
-
-$desc{'summary'} = "Summary (first 60 characters)";
-$desc{'summaryfull'} = "Full Summary";
-
-print "\n";
-PutHeader ("Change columns");
-print "<TABLE ALIGN=center CELLSPACING=0 CELLPADDING=4 BORDER=1>\n<TR>\n<TD ALIGN=left>";
-print "<B>Check which columns you wish to appear on the list, and then click\n";
-print "on submit.</B>\n";
-print "<p>\n";
-print "<FORM ACTION=colchange.cgi>\n";
-print "<INPUT TYPE=HIDDEN NAME=rememberedquery VALUE=$::buffer>\n";
-
-foreach my $i (@masterlist) {
-    my $c;
-    if (lsearch(\@collist, $i) >= 0) {
-        $c = 'CHECKED';
-    } else {
-        $c = '';
-    }
-    print "<INPUT TYPE=checkbox NAME=column_$i $c>$desc{$i}<br>\n";
-}
-print "<P>\n";
-print "<CENTER><INPUT TYPE=\"submit\" VALUE=\"Submit\">\n";
-print "</FORM>\n";
-print "<FORM ACTION=colchange.cgi>\n";
-print "<INPUT TYPE=HIDDEN NAME=rememberedquery VALUE=$::buffer>\n";
-print "<INPUT TYPE=HIDDEN NAME=resetit VALUE=1>\n";
-print "<INPUT TYPE=\"submit\" VALUE=\"Reset to Bugzilla default\"></CENTER>\n";
-print "</FORM>\n";
-print "</TD>\n</TR>\n</TABLE>\n";
-
-PutFooter();

mozilla/webtools/bugzilla/collectstats.pl

@@ -1,100 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>,
-#                 Harrison Page <harrison@netscape.com>
-
-# Run me out of cron at midnight to collect Bugzilla statistics.
-
-use diagnostics;
-use strict;
-use vars @::legal_product;
-
-require "globals.pl";
-
-ConnectToDatabase();
-GetVersionTable();
-
-my @myproducts;
-push( @myproducts, "-All-", @::legal_product );
-
-foreach (@myproducts) {
-    my $dir = "data/mining";
-
-    &check_data_dir ($dir);
-    &collect_stats ($dir, $_);
-}
-
-sub check_data_dir {
-    my $dir = shift;
-
-    if (! -d) {
-        mkdir $dir, 0777;
-        chmod 0777, $dir;
-    }
-}
-
-sub collect_stats {
-    my $dir = shift;
-    my $product = shift;
-    my $when = localtime (time);
-
-
-    $product =~ s/\//-/gs;
-    my $file = join '/', $dir, $product;
-    my $exists = -f $file;
-
-    if (open DATA, ">>$file") {
-        push my @row, &today;
-
-        foreach my $status ('NEW', 'ASSIGNED', 'REOPENED') {
-	    if( $product eq "-All-" ) {
-                SendSQL("select count(bug_status) from bugs where bug_status='$status'");
-	    } else {
-                SendSQL("select count(bug_status) from bugs where bug_status='$status' and product='$product'");
-	    }
-            push @row, FetchOneColumn();
-        }
-
-        if (! $exists)
-        {
-            print DATA <<FIN;
-# Bugzilla daily bug stats
-#
-# do not edit me! this file is generated.
-# 
-# fields: date|new|assigned|reopened
-# product: $product
-# created: $when
-FIN
-	}
-
-        print DATA (join '|', @row) . "\n";
-        close DATA;
-    } else {
-        print "$0: $file, $!";
-    }
-}
-
-sub today {
-    my ($dom, $mon, $year) = (localtime(time))[3, 4, 5];
-    return sprintf "%04d%02d%02d", 1900 + $year, ++$mon, $dom;
-}
-

mozilla/webtools/bugzilla/confirmhelp.html

@@ -1,154 +0,0 @@
-<HTML><head>
-
-<!--
-     The contents of this file are subject to the Mozilla Public
-     License Version 1.1 (the "License"); you may not use this file
-     except in compliance with the License. You may obtain a copy of
-     the License at http://www.mozilla.org/MPL/
-    
-     Software distributed under the License is distributed on an "AS
-     IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-     implied. See the License for the specific language governing
-     rights and limitations under the License.
-    
-     The Original Code is the Bugzilla Bug Tracking System.
-    
-     The Initial Developer of the Original Code is Netscape Communications
-     Corporation. Portions created by Netscape are
-     Copyright (C) 2000 Netscape Communications Corporation. All
-     Rights Reserved.
-    
-     Contributor(s): Terry Weissman <terry@mozilla.org>
--->
-
-<title>Understanding the UNCONFIRMED state, and other recent changes</title>
-</head>
-
-<body>
-<h1>Understanding the UNCONFIRMED state, and other recent changes</h1>
-
-[This document is aimed primarily at people who have used Bugzilla
-before the UNCONFIRMED state was implemented.  It might be helpful for
-newer users as well.]
-
-<p>
-
-New bugs in some products will now show up in a new state,
-UNCONFIRMED.  This means that we have nobody has confirmed that the
-bug is real.  Very busy engineers will probably generally ignore
-UNCONFIRMED that have been assigned to them, until they have been
-confirmed in one way or another.  (Engineers with more time will
-hopefully glance over their UNCONFIRMED bugs regularly.)
-
-<p>
-
-The <a href="bug_status.html">page describing bug fields</a> has been
-updated to include UNCONFIRMED.
-<p>
-
-There are two basic ways that a bug can become confirmed (and enter
-the NEW) state.
-
-<ul>
-  <li> A user with the appropriate permissions (see below for more on
-       permissions) decides that the bug is a valid one, and confirms
-       it.  We hope to gather a small army of responsible volunteers
-       to regularly go through bugs for us.
-  <li> The bug gathers a certain number of votes.  <b>Any</b> valid
-       Bugzilla user may vote for bugs (each user gets a certain
-       number of bugs); any UNCONFIRMED bug which enough bugs becomes
-       automatically confirmed, and enters the NEW state.
-</ul>
-
-One implication of this is that it is worth your time to search the
-bug system for duplicates of your bug to vote on them, before
-submitting your own bug.  If we can spread around knowledge of this
-fact, it ought to help cut down the number of duplicate bugs in the
-system. 
-
-<h2>Permissions.</h2>
-
-Users now have a certain set of permissions.  To see your permissions,
-check out the
-<a href="userprefs.cgi?bank=permissions">user preferences</a> page.
-
-<p>
-
-If you have the "Can confirm a bug" permission, then you will be able
-to move UNCONFIRMED bugs into the NEW state.
-
-<p>
-
-If you have the "Can edit all aspects of any bug" permission, then you
-can tweak anything about any bug.  If not, you may only edit those
-bugs that you have submitted, or that you have assigned to you (or
-qa-assigned to you).  However, anyone may add a comment to any bug.
-
-<p>
-
-Some people (initially, the initial owners and initial qa-contacts for
-components in the system) have the ability to give the above two
-permissions to other people.  So, if you really feel that you ought to
-have one of these permissions, a good person to ask (via private
-email, please!) is the person who is assigned a relevant bug.
-
-<h2>Other details.</h2>
-
-An initial stab was taken to decide who would be given which of the
-above permissions.  This was determined by some simple heurstics of
-who was assigned bugs, and who the default owners of bugs were, and a
-look at people who seem to have submitted several bugs that appear to
-have been interesting and valid.  Inevitably, we have failed to give
-someone the permissions they deserve.  Please don't take it
-personally; just bear with us as we shake out the new system.
-
-<p>
-
-
-People with one of the two bits above can easily confirm their own
-bugs, so bugs they submit will actually start out in the NEW state.
-They can override this when submitting a bug.
-
-<p>
-
-People can ACCEPT or RESOLVE a bug assigned to them, even if they
-aren't allowed to confirm it.  However, the system remembers, and if
-the bug gets REOPENED or reassigned to someone else, it will revert
-back to the UNCONFIRMED state.  If the bug has ever been confirmed,
-then REOPENing or reassigning will cause it to go to the NEW or
-REOPENED state.
-
-<p>
-
-Note that only some products support the UNCONFIRMED state.  In other
-products, all new bugs will automatically start in the NEW state.
-
-<h2>Things still to be done.</h2>
-
-There probably ought to be a way to get a bug back into the
-UNCONFIRMED state, but there isn't yet.
-
-<p>
-
-If a person has submitted several bugs that get confirmed, then this
-is probably a person who understands the system well, and deserves the
-"Can confirm a bug" permission.  This kind of person should be
-detected and promoted automatically.
-
-<p>
-
-There should also be a way to automatically promote people to get the
-"Can edit all aspects of any bug" permission.
-
-<p>
-
-The "enter a new bug" page needs to be revamped with easy ways for new
-people to educate themselves on the benefit of searching for a bug
-like the one they're about to submit and voting on it, rather than
-adding a new useless duplicate.
-
-<hr>
-<!-- hhmts start -->
-Last modified: Wed Feb 16 21:04:56 2000
-<!-- hhmts end -->
-</body> </html>

mozilla/webtools/bugzilla/contrib/BugzillaEmail.pm

@@ -1,79 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# This code is based on code found in bug_email.pl from the bugzilla
-# email tracker.  Initial contributors are :: 
-#                 Terry Weissman <terry@mozilla.org>
-#                 Gregor Fischer <fischer@suse.de>
-#                 Klaas Freitag  <freitag@suse.de>
-#                 Seth Landsman  <seth@dworkin.net>
-
-# The purpose of this module is to abstract out a bunch of the code
-#  that is central to email interfaces to bugzilla and its database
-
-# Contributor : Seth Landsman <seth@dworkin.net>
-
-# Initial checkin : 03/15/00 (SML)
-#  findUser() function moved from bug_email.pl to here
-
-push @INC, "../."; # this script now lives in contrib
-
-require "globals.pl";
-
-use diagnostics;
-use strict;
-
-my $EMAIL_TRANSFORM_NONE = "email_transform_none";
-my $EMAIL_TRANSFORM_BASE_DOMAIN = "email_transform_base_domain";
-my $EMAIL_TRANSFORM_NAME_ONLY = "email_transform_name_only";
-
-# change to do incoming email address fuzzy matching
-my $email_transform = $EMAIL_TRANSFORM_NAME_ONLY;
-
-# findUser()
-# This function takes an email address and returns the user email.
-# matching is sloppy based on the $email_transform parameter
-sub findUser($) {
-  my ($address) = @_;
-  # if $email_transform is $EMAIL_TRANSFORM_NONE, return the address, otherwise, return undef
-  if ($email_transform eq $EMAIL_TRANSFORM_NONE) {
-    my $stmt = "SELECT login_name FROM profiles WHERE profiles.login_name = \'$address\';";
-    SendSQL($stmt);
-    my $found_address = FetchOneColumn();
-    return $found_address;
-  } elsif ($email_transform eq $EMAIL_TRANSFORM_BASE_DOMAIN) {
-    my ($username) = ($address =~ /(.+)@/);
-    my $stmt = "SELECT login_name FROM profiles WHERE profiles.login_name RLIKE \'$username\';";
-    SendSQL($stmt);
-
-    my $domain;
-    my $found = undef;
-    my $found_address;
-    my $new_address = undef;
-    while ((!$found) && ($found_address = FetchOneColumn())) {
-      ($domain) = ($found_address =~ /.+@(.+)/);
-      if ($address =~ /$domain/) {
-        $found = 1;
-        $new_address = $found_address;
-      }
-    }
-    return $new_address;
-  } elsif ($email_transform eq $EMAIL_TRANSFORM_NAME_ONLY) {
-    my ($username) = ($address =~ /(.+)@/);
-    my $stmt = "SELECT login_name FROM profiles WHERE profiles.login_name RLIKE \'$username\';";
-    SendSQL($stmt);
-    my $found_address = FetchOneColumn();
-    return $found_address;
-  }
-}
-
-1;

mozilla/webtools/bugzilla/contrib/README

@@ -1,18 +0,0 @@
-This directory contains contributed software related to Bugzilla.
-Things in here have not necessarily been tested or tried by anyone
-except the original contributor, so tred carefully.  But it may still
-be useful to you.
-
-This directory includes:
-
-        gnats2bz.pl -- a perl script to help import bugs from a GNATS 
-                        database into a Bugzilla database.  Contributed by
-                        Tom Schutter <tom@platte.com>
-
-       bug_email.pl --  a perl script that can receive email containing
-                        bug reports (email-interface). Contributed by
-                        Klaas Freitag <freitag@SuSE.de>
-	
-      README.Mailif --  Readme describing the mail interface.
-  bugmail_help.html --  User help page for the mail interface.
-

mozilla/webtools/bugzilla/contrib/README.Mailif

@@ -1,80 +0,0 @@
-
-The Bugzilla Mail interface
-===========================
-
-(UPDATE 03/14/00 to better reflect reality by SML)
-
-The Bugzilla Mail interface allows to submit bugs to Bugzilla by email.
-
-The Mail Interface Contribution consists of three files:
-README.Mailif - this readme.
-bug_email.pl  - the script
-bugmail_help.html - a user help html site
-
-Installation:
-
-Next is to add a user who receives the bugmails, e. g. bugmail. Create a 
-mail account and a home directory for the user. 
-
-The mailinterface script bug_email.pl needs to get the mail through stdin.
-I use procmail for that, with the following line in the .procmailrc:
-
-BUGZILLA_HOME=/usr/local/httpd/htdocs/bugzilla
-:0 c
-|(cd $BUGZILLA_HOME/contrib; ./bug_email.pl)
-
-This defines the Bugzilla directory as the variable BUGZILLA_HOME and passes
-all incoming mail to the script after cd'ing into the bugzilla home.
-
-In some cases, it is necessary to alter the headers of incoming email.  The 
-additional line to procmail :
-
-:0 fhw
-| formail -I "From " -a "From "
-
-fixes many problems.
-
-See bugzilla.procmailrc for a sample procmailrc that works for me (SML) and
-also deals with bugzilla_email_append.pl
-
-Customation:
-
-There are some values inside the script which need to be customized for your
-needs:
-
-1. In sub-routine Reply (search 'sub Reply':
-there is the line
-    print MAIL "From: Bugzilla Mailinterface<yourmail\@here.com>\n";
-                                            ^^^^^^^^^^^^^^^^^^^^
-Fill in your correct mail here. That will make it easy for people to reply
-to the mail.
-
-2. check, if your sendmail resides in /usr/sbin/sendmail, change the path if neccessary.
-Search the script after 'default' - you find some default-Settings for bug
-reports, which are used, if the sender did not send a field for it. The defaults
-should be checked and changed.
-
-Thats hopefully all, we will come up with any configuration file or something.
-
-
-If your mail works, your script will insert mails from now on.
-
-The mailinterface supports two commandline switches:
-
-There are two command line switches :
-
--t: Testmode
-    The mailinterface does not really insert the bug into the database, but
-    writes some debug output to stdout and writes the mail into the file
-    bug_email_test.log in the data-dir.
-
--r: restricted mode
-    All lines before the first line with a keyword character are skipped.
-    In not restricted, default mode, these lines are added to the long 
-    description of the bug.
-
-
-02/2000 - Klaas Freitag, SuSE GmbH <freitag@suse.de>
-03/2000 - Seth M. Landsman <seth@cs.brandeis.edu>
- bug_email.pl now lives out of bugzilla/contrib
- added line about formail

mozilla/webtools/bugzilla/contrib/bugmail_help.html

@@ -1,223 +0,0 @@
-<HTML>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<!--
-     The contents of this file are subject to the Mozilla Public
-     License Version 1.1 (the "License"); you may not use this file
-     except in compliance with the License. You may obtain a copy of
-     the License at http://www.mozilla.org/MPL/
-    
-     Software distributed under the License is distributed on an "AS
-     IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-     implied. See the License for the specific language governing
-     rights and limitations under the License.
-    
-     The Original Code is the Bugzilla Bug Tracking System.
-    
-     Contributor(s): Klaas Freitag <Freitag@SuSE.de>
--->
-
-<HEAD> <TITLE>Bugzilla Mail Interface</TITLE> </HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER><H1>The Bugzilla Mail Interface</H1>
-Contributor: <A HREF="mailto:freitag@suse.de">Klaas Freitag</A>, SuSE GmbH 
-</CENTER>
-<P>
-The bugzilla Mail interface allows the registered bugzilla users to submit bugs by 
-sending email with a bug description. This is usefull for people, who do not work 
-inhouse and want to submitt bugs to the bugzilla system.
-<p>
-
-
-I know, show me the <A HREF="#examplemail">example-mail !</A>
-
-
-<H2>What do you need to do to submitt a bug by mail ?</H2>
-You need to send a email in the described format to the bugmail-user of the 
-bugzilla-system. This is <A HREF="mailto:our_bugzilla@xyz.com">yourbugzilla@here.com</A>
-
-You receive a reply mail with the new bug-ID if your request was ok. 
-If not, you get a mail with 
-some help on the bugmail system and a specific analysis of your request.
-<P>
-Please dont refuse to send one or two wrong mails, you will get all the information 
-you need in the replies, and <I>only</I> in the mail replies. The information on this
-page, concerning available products, versions and so on, is not dynamicly generated and 
-may  be old therefore.
-
-<H1>The Mail Format</H1>
-The bugmail needs a special format , which consists of some keywords and suitable 
-values for them and a description text. Note that the keyword block needs to be
-above of the description text.
-
-<H2>Keywords</H2>
-You need to tell bugzilla some properties of the bugs. This is done by keywords, which
-start on a new line with a @, followed by the keyword and and equal-sign, followed by a
-hopefully valid value.
-
-
-<TABLE BORDER=4 FRAME=box CELLSPACING="5" width=95%> <COLGROUP> <col width="2*"> 
-<col width="5*"> <col width="1*"> </COLGROUP>
-	<TR>
-		<TH>Keyword</TH>
-		<TH>Value description</TH>
-		<TH>required and default value</TH>
-	</TR>
-	<TR>
-	        <TD>@product</TD>
-	        <TD>The product which has a bug</TD>
-	        <TD>yes. <br> This is the most important information. Many other
-		fields depend on the product.</TD>
-	</TR>
-	<TR>
-	        <TD>@component</TD>
-	        <TD>the desired component which is affected by the bug</TD>
-	        <TD>yes. <br> As the @product, this is a very important 
-		field.</TD>
-	</TR>
-	<TR>
-	        <TD>@version</TD>
-	        <TD>The version of the product</TD>
-	        <TD>yes. <br>See @product and @component</TD>
-	</TR>
-	<TR>
-	        <TD>@short_desc</TD>
-	        <TD>A summary of your bug report</TD>
-	        <TD>yes. <br>This summary of the error you want to report 
-		describes what happen. You may skip the long description,
-		but not this summary.<br>
-		<b>Note:</b>The short description may be given in the mail subject
-		instead of using the keyword !</TD>
-	</TR>
-	<TR>
-	        <TD>@rep_platform</TD>
-	        <TD>The desired platform</TD>
-	        <TD>no.<br>If you dont give a value, this field is set to <I>All</I>.</TD>
-	</TR>
-	<TR>
-	        <TD>@bug_severity</TD>
-	        <TD>The severity of the bug</TD>
-	        <TD>no. <br> If you dont give a value, this field is set to 
-		<I>normal</I></TD>
-	</TR>
-	<TR>
-	        <TD>@priority</TD>
-	        <TD>The priority of the bug</TD>
-	        <TD>no.<br>If you dont give a value, this field is set to <I>P3</I></TD>
-	</TR>
-	<TR>
-	        <TD>@op_sys</TD>
-	        <TD>The operating system</TD>
-	        <TD>no.<br>If you dont give a value, this field is set to <I>Linux</I>.</TD>
-	</TR>
-	<TR>
-	        <TD>@assigned_to</TD>
-	        <TD>The one to whom the bug is assigned to</TD>
-	        <TD>no. <br>There is an initial owner for every product/version/component.
-		He owns the bug by default. The initial owner can only be found if 
-		product, version and component are valid.</TD>
-	</TR>
-	<TR>
-	        <TD>@bug_file_loc</TD>
-	        <TD>?</TD>
-	        <TD>no.</TD>
-	</TR>
-	<TR>
-	        <TD>@status_whiteboard</TD>
-	        <TD>?</TD>
-	        <TD>no.</TD>
-	</TR>
-	<TR>
-	        <TD>@target_milestone</TD>
-	        <TD>?</TD>
-	        <TD>no.</TD>
-	</TR>
-	<TR>
-	        <TD>@groupset</TD>
-	        <TD>rules the visibility of the bug.</TD>
-	        <TD>no.<br>This value defaults to the smallest of the available groups,
-		which is <I>readInternal</I>.</TD>
-	</TR>
-	<TR>
-	        <TD>@qa_contact</TD>
-	        <TD>the quality manager for the product</TD>
-	        <TD>no.<br>This value can be retrieved from product, component and 
-		version</TD>
-	</TR>
-
-</TABLE>
-<H2>Valid values</H2>
-Give string values for the most keys above. Some keywords  require special values:<br>
-<ol>
-<li>E-Mail adresses: If you want to set the qa-contact, specify a email-adress for @qa_contact. The email must be known by bugzilla of course.</li>
-<li>Listvalues: Most of the values have to be one of a list of valid values. Try by sending
-a mail and read the reply. Skip fields if you dont get help for them unless you dont know
-which values you may choose.</li>
-<li>free Text: The descriptions may be free text. </li>
-<li>Special: The field groupset may be specified in different in three different kinds:
- <ol>
-    <li> A plain numeric way, which is one usually huge number, e. g. <I>65536</I></li>
-    <li> a string with added numbers e.g. <I>65536+131072</I></li>
-    <li> a string list, e.g. <I>ReadInternal, ReadBeta </I></li>
- </ol>
-</li>
-</ol>
-
-<p>
-
-But most of them need <b>valid</b> values.
-<p>
-Sorry, you will not find lists of valid products, components and the other stuff
-here. Send a mail to with any text, and you will get a list of valid keywords in the reply.
-
-<p>
-Some of the values must be choosen from a list:<br>
-<ol>
-  <li>bug_severity: blocker, critical, major, normal, minor, trivial, enhancement</li>
-  <li>op_sys: Linux </li>
-  <li>priority: P1, P2, P3, P4, P5</li>
-  <li>rep_platform: All, i386, AXP, i686, Other</li></ol>
-  
-
-<p>
-
-After you have specified the required keywords and maybe some other value, you may 
-describe your bug. You dont need  a keyword for starting your bug description. All 
-text which follows the keyword block is handled as long description of the bug.
-<p>
-
-The bugmail interface is able to find required information by itself. E.g. if you specify
-a product which has exactly one component, this component will be found by the interface
-automatically. 
-
-<H1>Attachments</H1>
-
-The mail interface is able to cope with MIME-attachments. 
-People could for example add a logfile as a mail attachment, and it will appear in 
-bugzilla as attachment. A comment for the attachment should be added, it will describe
-the attachment in bugzilla.
-
-<H1><A NAME="examplemail">Example Mail</A></H1>
-
-See the example of the mail <b>body</b> (Dont forget to specify the short description
-in the mail subject):<hr><pre>
-
-  @product      = Bugzilla
-  @component    = general
-  @version      = All
-  @groupset     = ReadWorld ReadPartners
-  @op_sys       = Linux
-  @priority     = P3
-  @rep_platform = i386
-
-
-  This is the description of the bug I found. It is not neccessary to start
-  it with a keyword. 
-
-  Note: The short_description is neccessary and may be given with the keyword
-  @short_description or will be retrieved from the mail subject.
-
-
-</pre><hr>
-
-</BODY>
-</HTML>

mozilla/webtools/bugzilla/contrib/bugzilla.procmailrc

@@ -1,30 +0,0 @@
-:0 fhw
-| formail -I "From " -a "From "
-
-BUGZILLA_HOME=/home/bugzilla/WEB/bugzilla/contrib
-
-:0
-* ^Subject: .*\[Bug .*\]
-RESULT=|(cd $BUGZILLA_HOME && ./bugzilla_email_append.pl)
-
-
-# Feed mail to stdin of bug_email.pl
-:0 Ec
-#* !^Subject: .*[Bug .*]
-RESULT=|(cd $BUGZILLA_HOME && ./bug_email.pl )
-
-# write result to a logfile
-:0 c
-|echo `date '+%d.%m.%y %H:%M:  '` $RESULT >> $HOME/bug_email.log
-
-
-:0 c
-|echo "----------------------------------" >> $HOME/bug_email.log
-
-:0 c
-$HOME/bug_email.log
- 
-# Move mail to the inbox
-:0
-$HOME/Mail/INBOX
-

mozilla/webtools/bugzilla/contrib/bugzilla_email_append.pl

@@ -1,189 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-
-# The purpose of this script is to take an email message, which
-# specifies a bugid and append it to the bug as part of the longdesc
-# table
-
-# Contributor : Seth M. Landsman <seth@dworkin.net>
-
-# 03/15/00 : Initial version by SML
-# 03/15/00 : processmail gets called
-
-# Email subject must be of format :
-# .* Bug ### .*
-# replying to a typical bugzilla email should be valid
-
-# TODO : 
-# 1. better way to get the body text (I don't know what dump_entity() is 
-#   actually doing
-
-use diagnostics;
-use strict;
-use MIME::Parser;
-
-push @INC, "../."; # this script lives in contrib
-require "globals.pl";
-require "BugzillaEmail.pm";
-
-# Create a new MIME parser:
-my $parser = new MIME::Parser;
-
-my $Comment = "";
-
-# Create and set the output directory:
-# FIXME: There should be a $BUGZILLA_HOME variable (SML)
-(-d "../data/mimedump-tmp") or mkdir "../data/mimedump-tmp",0755 or die "mkdir: $!";
-(-w "../data/mimedump-tmp") or die "can't write to directory";
-
-$parser->output_dir("../data/mimedump-tmp");
-    
-# Read the MIME message:
-my $entity = $parser->read(\*STDIN) or die "couldn't parse MIME stream";
-$entity->remove_sig(10);          # Removes the signature in the last 10 lines
-
-# Getting values from parsed mail
-my $Sender = $entity->get( 'From' );
-$Sender ||=  $entity->get( 'Reply-To' );
-my $Message_ID = $entity->get( 'Message-Id' );
-
-die (" *** Cant find Sender-adress in sent mail ! ***\n" ) unless defined( $Sender );
-chomp( $Sender );
-chomp( $Message_ID );
-
-print "Dealing with the sender $Sender\n";
-
-ConnectToDatabase();
-
-my $SenderShort = $Sender;
-$SenderShort =~ s/^.*?([a-zA-Z0-9_.-]+?\@[a-zA-Z0-9_.-]+\.[a-zA-Z0-9_.-]+).*$/$1/;
-
-$SenderShort = findUser($SenderShort);
-
-print "SenderShort is $SenderShort\n";
-if (!defined($SenderShort)) {
-  $SenderShort = $Sender;
-  $SenderShort =~ s/^.*?([a-zA-Z0-9_.-]+?\@[a-zA-Z0-9_.-]+\.[a-zA-Z0-9_.-]+).*$/$1/;
-}
-print "The sendershort is now $SenderShort\n";
-
-if (!defined($SenderShort)) {
-  DealWithError("No such user $SenderShort exists.");
-}
-
-my $Subject = $entity->get('Subject');
-print "The subject is $Subject\n";
-
-my ($bugid) = ($Subject =~ /\[Bug ([\d]+)\]/);
-print "The bugid is $bugid\n";
-
-# make sure the bug exists
-
-SendSQL("SELECT bug_id FROM bugs WHERE bug_id = $bugid;");
-my $found_id = FetchOneColumn();
-print "Did we find the bug? $found_id-\n";
-if (!defined($found_id)) {
-  DealWithError("Bug $bugid does not exist");
-}
-
-# get the user id
-SendSQL("SELECT userid FROM profiles WHERE login_name = \'$SenderShort\';");
-my $userid = FetchOneColumn();
-if (!defined($userid)) {
-  DealWithError("Userid not found for $SenderShort");
-}
-
-# parse out the text of the message
-dump_entity($entity);
-
-# Get rid of the bug id
-$Subject =~ s/\[Bug [\d]+\]//;
-#my $Comment = "This is only a test ...";
-my $Body = "Subject: " . $Subject . "\n" . $Comment;
-
-# shove it in the table
-my $long_desc_query = "INSERT INTO longdescs SET bug_id=$found_id, who=$userid, bug_when=NOW(), thetext=" . SqlQuote($Body) . ";";
-SendSQL($long_desc_query);
-
-system("cd .. ; ./processmail $found_id '$SenderShort'");
-
-sub DealWithError {
-  my ($reason) = @_;
-  print $reason . "\n";
-}
-
-# Yanking this wholesale from bug_email, 'cause I know this works.  I'll
-#  figure out what it really does later
-#------------------------------
-#
-# dump_entity ENTITY, NAME
-#
-# Recursive routine for parsing a mime coded mail.
-# One mail may contain more than one mime blocks, which need to be
-# handled. Therefore, this function is called recursively.
-#
-# It gets the for bugzilla important information from the mailbody and 
-# stores them into the global attachment-list @attachments. The attachment-list
-# is needed in storeAttachments.
-#
-sub dump_entity {
-    my ($entity, $name) = @_;
-    defined($name) or $name = "'anonymous'";
-    my $IO;
-
-
-    # Output the body:
-    my @parts = $entity->parts;
-    if (@parts) {                     # multipart...
-	my $i;
-	foreach $i (0 .. $#parts) {       # dump each part...
-	    dump_entity($parts[$i], ("$name, part ".(1+$i)));
-	}
-    } else {                            # single part...	
-
-	# Get MIME type, and display accordingly...
-	my $msg_part = $entity->head->get( 'Content-Disposition' );
-	
-	$msg_part ||= ""; 
-
-	my ($type, $subtype) = split('/', $entity->head->mime_type);
-	my $body = $entity->bodyhandle;
-	my ($data, $on_disk );
-
-	if(  $msg_part =~ /^attachment/ ) {
-	    # Attached File
-	    my $des = $entity->head->get('Content-Description');
-	    $des ||= "";
-
-	    if( defined( $body->path )) { # Data is on disk
-		$on_disk = 1;
-		$data = $body->path;
-		
-	    } else {                      # Data is in core
-		$on_disk = 0;
-		$data = $body->as_string;
-	    }
-#	    push ( @attachments, [ $data, $entity->head->mime_type, $on_disk, $des ] );
-	} else {
-	    # Real Message
-	    if ($type =~ /^(text|message)$/) {     # text: display it...
-		if ($IO = $body->open("r")) {
-		    $Comment .=  $_ while (defined($_ = $IO->getline));
-		    $IO->close;
-		} else {       # d'oh!
-		    print "$0: couldn't find/open '$name': $!";
-		}
-	    } else { print "Oooops - no Body !\n"; }
-	}
-    }
-}

mozilla/webtools/bugzilla/createaccount.cgi

@@ -1,93 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-#                 David Gardiner <david.gardiner@unisa.edu.au>
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-
-# Shut up misguided -w warnings about "used only once":
-
-use vars %::FORM;
-
-ConnectToDatabase();
-
-# Clear out the login cookies.  Make people log in again if they create an
-# account; otherwise, they'll probably get confused.
-my $cookiepath = Param('cookiepath');
-print "Set-Cookie: Bugzilla_login= ; path=$cookiepath ; expires=Sun, 30-Jun-80 00:00:00 GMT
-Set-Cookie: Bugzilla_logincookie= ; path=$cookiepath ; expires=Sun, 30-Jun-80 00:00:00 GMT
-Set-Cookie: Bugzilla_password= ; path=$cookiepath ; expires=Sun, 30-Jun-80 00:00:00 GMT
-Content-type: text/html
-
-";
-
-
-my $login = $::FORM{'login'};
-my $realname = $::FORM{'realname'};
-if (defined $login) {
-    CheckEmailSyntax($login);
-    if (DBname_to_id($login) != 0) {
-	PutHeader("Account exists");
-	print "<CENTER>A bugzilla account for the name <B><tt>$login</tt></B> already\n";
-	print "exists.<P>If you have forgotten the password for it, then\n";
-	print "<a href=query.cgi?GoAheadAndLogIn>click here</a> and use\n";
-	print "the <b>E-mail me a password</b> button.</CENTER>\n";
-        PutFooter();
-	exit;
-    }
-    PutHeader("Account created");
-    my $password = InsertNewUser($login, $realname);
-    MailPassword($login, $password);
-    print "<CENTER>A bugzilla account for <B><tt>$login</tt></B> has been created.  The\n";
-    print "password has been e-mailed to that address.<P>When it is\n";
-    print "received, you may <a href=query.cgi?GoAheadAndLogIn>click\n";
-    print "here</a> and log in.  Or, you can just <a href=\"\">go back to\n";
-    print "the top</a>.</CENTER>\n";
-    PutFooter();
-    exit;
-}
-
-PutHeader("Create a new bugzilla account");
-print qq{
-<CENTER><B>
-To create a bugzilla account, all that you need to do is to enter a<BR>
-legitimate e-mail address. The account will be created, and its<BR>
-password will be mailed to you. Optionally you may enter your<BR>real name 
-as well.
-
-<FORM method=get>
-<TABLE>
-<TR>
-	<TH ALIGN=right>E-mail address:</TH>
-	<TD><INPUT SIZE=35 NAME=login></TD>
-</TR><TR>
-	<TD ALIGN=right><B>Real name:</B></TD>
-	<TD><INPUT SIZE=35 NAME=realname></TD>
-</TR>
-</TABLE>
-<INPUT TYPE=submit NAME=submit VALUE="Submit">
-</CENTER>
-};
-
-PutFooter();

mozilla/webtools/bugzilla/createattachment.cgi

@@ -1,130 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation. All Rights Reserved.
-# 
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-#                 David Gardiner <david.gardiner@unisa.edu.au>
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-
-use vars %::COOKIE, %::FILENAME;
-
-sub Punt {
-    my ($str) = (@_);
-    print "<CENTER>$str<P>Please hit <b>Back</b> and try again.</CENTER>\n";
-    exit;
-}
-
-confirm_login();
-
-my $id = $::FORM{'id'};
-
-print "Content-type: text/html\n\n";
-PutHeader("Create an attachment", "Create attachment", "Bug $id");
-
-if (!defined($::FORM{'data'})) {
-    print qq{
-<TABLE ALIGN=center><TR><TD ALIGN=left>
-<FORM METHOD=post ENCTYPE="multipart/form-data">
-<INPUT TYPE=hidden NAME=id value=$id>
-To attach a file to <A HREF="show_bug.cgi?id=$id">bug $id</A>, place it in a
-file on your local machine, and enter the path to that file here:<BR>
-<INPUT TYPE=file NAME=data SIZE=60>
-<P>
-Please also provide a one-line description of this attachment:<BR>
-<INPUT NAME=description SIZE=60>
-<BR>
-What kind of file is this?
-<BR><INPUT TYPE=radio NAME=type VALUE=patch>Patch file (text/plain, diffs)
-<BR><INPUT TYPE=radio NAME=type VALUE="text/plain">Plain text (text/plain)
-<BR><INPUT TYPE=radio NAME=type VALUE="text/html">HTML source (text/html)
-<BR><INPUT TYPE=radio NAME=type VALUE="image/gif">GIF Image (image/gif)
-<BR><INPUT TYPE=radio NAME=type VALUE="image/jpeg">JPEG Image (image/jpeg)
-<BR><INPUT TYPE=radio NAME=type VALUE="image/png">PNG Image (image/png)
-<BR><INPUT TYPE=radio NAME=type VALUE="application/octet-stream">Binary file (application/octet-stream)
-<BR><INPUT TYPE=radio NAME=type VALUE="other">Other (enter mime type: <INPUT NAME=othertype size=30>)
-<P>
-<CENTER><INPUT TYPE=submit VALUE="Submit"></CENTER>
-</FORM>
-</TD></TR></TABLE>
-<P>
-};
-} else {
-    if ($::FORM{'data'} eq "" || !defined $::FILENAME{'data'}) {
-        Punt("No file was provided, or it was empty.");
-    }
-    my $desc = trim($::FORM{'description'});
-    if ($desc eq "") {
-        Punt("You must provide a description of your attachment.");
-    }
-    my $ispatch = 0;
-    my $mimetype = $::FORM{'type'};
-    if (!defined $mimetype) {
-        Punt("You must select which kind of file you have.");
-    }
-    $mimetype = trim($mimetype);
-    if ($mimetype eq "patch") {
-        $mimetype = "text/plain";
-        $ispatch = 1;
-    }
-    if ($mimetype eq "other") {
-        $mimetype = $::FORM{'othertype'};
-    }
-    if ($mimetype !~ m@^(\w|-)+/(\w|-)+$@) {
-        Punt("You must select a legal mime type.  '<tt>$mimetype</tt>' simply will not do.");
-    }
-
-	if ($::driver eq "mysql") {
-	    SendSQL("insert into attachments (bug_id, filename, description, mimetype, " .
-				"ispatch, submitter_id, thedata) values ($id," .
-            	SqlQuote($::FILENAME{'data'}) . ", " . SqlQuote($desc) . ", " .
-            	SqlQuote($mimetype) . ", $ispatch, " .
-            	DBNameToIdAndCheck($::COOKIE{'Bugzilla_login'}) . ", " .
-            	SqlQuote($::FORM{'data'}) . ")");
-    	SendSQL("select LAST_INSERT_ID()");
-	} else {
-		# all this is necessary to allow inserting large fields into Oracle
-		use DBD::Oracle qw{:ora_types};
-
-		my $query = "insert into attachments (attach_id, bug_id, filename, description, mimetype, " .
-                	"ispatch, submitter_id, creation_ts, thedata) values (attachments_seq.nextval, $id," .
-                	SqlQuote($::FILENAME{'data'}) . ", " . SqlQuote($desc) . ", " .
-                	SqlQuote($mimetype) . ", $ispatch, " .
-                	DBNameToIdAndCheck($::COOKIE{'Bugzilla_login'}) . ", sysdate, :1)";
-
-		my $oracle_sth = $::db->prepare($query);
-		$oracle_sth->bind_param(1, $::FORM{'data'}, { ora_field => 'thedata', ora_type => ORA_BLOB });
-    	$oracle_sth->execute || die "$query: " . $DBI::errstr;
-
-		# get the attach_id we just created
-        SendSQL("select attachments_seq.currval from dual");
-	}
-
-    my $attachid = FetchOneColumn();
-    AppendComment($id, $::COOKIE{"Bugzilla_login"},
-                  "Created an attachment (id=$attachid)\n$desc\n");
-
-    print "<TABLE BORDER=1 CELLSPACING=0 ALIGN=center><TD><H2>Attachment to bug $id created</H2>\n";
-    system("./processmail", $id, $::COOKIE{'Bugzilla_login'});
-    print "<TD><A HREF=\"show_bug.cgi?id=$id\">Go Back to BUG# $id</A></TABLE>\n";
-}
-
-PutFooter();

mozilla/webtools/bugzilla/createerrata.cgi

@@ -1,882 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation. All Rights Reserved.
-# 
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-# 				  David Lawrence <dkl@redhat.com>
-
-use diagnostics;
-use strict;
-use XML::Generator;
-use XML::Parser;
-use CGI::XMLForm;
-use Net::FTP;
-
-require 'CGI.pl';
-require 'globals.pl';
-
-############### Global variables and other stuff
-use vars qw{$cgi};
-my $xml_dir = '/home/httpd/html/bugzilla/data/errata_xml/';
-
-# HACK: This should be done automatically
-my @final_releases = ('4.2', '5.2', '6.1'); 
-
-# update server information
-my $server = "wallace.redhat.com";
-my $login = "anonymous";
-my $password = "bugzilla\@redhat.com";
-my $tmp_dir = "/tmp/errata";
-
-# todays date
-my ($day, $mon, $year) = (localtime)[3,4,5];
-$year = $year+1900;
-$mon = $mon+1;
-
-umask 0000;
-
-############### Start Security
-confirm_login();
-if (!UserInGroup("errata")) {
-	print "<P><FONT COLOR=red><B>Sorry: </B></FONT>\n";
-	print "<B>You are not a member of the 'Errata' group.</B>\n";
-	exit;
-}
-############### End Security
-
-GetVersionTable();
-
-############### Start XML/HTML subroutines
-
-################################################################################
-# 
-# Subroutine:  gen_xml
-# 
-# Description: Creates a xml file with errata information contained within 
-# 
-# Exceptions:  NONE
-#
-# Parameters:   
-#
-# Return Value: exits upon successful completetion 
-
-sub gen_xml {
-	my $update = $cgi->param('update');
-	$cgi->delete('update');
-	$cgi->delete('action');
-
-	my $filename = $cgi->param("/errata/metadata/id") . ".xml";
-
-	open(OUT, ">$xml_dir/$filename") or die "Could not open $filename for writing: $!";
-	if ($cgi->param()) {
-		print OUT $cgi->toXML;
-	}
-	close(OUT);
-	print "<A HREF=\"createerrata.cgi?load_file=$filename&action=Update+Errata&update=1\">$filename</A> saved!<P>\n";
-	insert_db($cgi->param('/errata/metadata/type'),
-			  $cgi->param('/errata/metadata/issued_on'),
-			  $cgi->param('/errata/metadata/updated_on'),
-			  $cgi->param('/errata/metadata/id'));
-}
-
-################################################################################
-# 
-# Subroutine:  load_xml 
-# 
-# Description: load in xml file for editing and resubmitting
-# 
-# Exceptions:  NONE
-#
-# Parameters:  advisory string 
-#
-# Return Value: NONE
-
-sub load_xml {
-	my $filename = $::FORM{'load_file'};
-
-	my %form_vars    = ("/errata/metadata/type" => "type",
-				   		"/errata/metadata/issued_on" => "issued_on",
-						"/errata/metadata/updated_on" => "updated_on",
-						"/errata/metadata/id" => "advisory_id",
-						"/errata/metadata/component" => "component",
-						"/errata/metadata/synopsis" => "synopsis",
-						"/errata/metadata/keywords" => "keywords",
-						"/errata/metadata/cross_ref" => "cross_ref",
-						"/errata/content/obsoleted" => "obsoleted",
-						"/errata/content/conflicts" => "conflicts",
-						"/errata/content/topic" => "topic",
-						"/errata/content/description" => "description",
-						"/errata/content/solution" => "solution",
-						"/errata/content/id_fixed" => "id_fixed",
-						"/errata/content/references" => "references",
-						"/errata/content/release_arch"	=> "release_arch",
-						"/errata/content/rpms" => "packages" );
-	my @queries = keys %form_vars;
-
-#### 
-#   foreach my $query (@queries) {
-#        print "$query <BR>\n"; 
-#   }
-#	print "<P>\n";
-	
-	open(inXML, "<$xml_dir/$filename") or die "Could not open $filename for reading: $!";
-    my @results = $cgi->readXML(*inXML, @queries);
-	close(inXML);
-
-####	
-#	foreach my $result (@results) {
-#		print "$result <BR>\n";
-#	}	
-#	print "<P>\n";
-	
-	my %hash;
-	my $count = 0;
-	while($count <= $#results) {
-		my $temp = $results[$count];
-		$count = $count + 1;
-		$hash{$temp} = $results[$count];
-		$count = $count + 1;
-	}
-	
-	foreach my $k (keys %hash) {
-		if (!defined($hash{$k})) { 
-			next; 
-		}
-		$::FORM{$form_vars{$k}} = $hash{$k};
-	}
-
-	# make updated_on today's date
-	$::FORM{'updated_on'} = sprintf("%s-%s-%s", $year, $mon, $day);
-
-	# fix the advisory_id
-	my @temp = split(':', $::FORM{'advisory_id'});
-	$::FORM{'advisory_id'} = $temp[1];
-
-#	if ($::FORM{'update'} eq "1") {
-#		@temp = split('-', $::FORM{'advisory_id'});
-#		$temp[1] = sprintf("%.2d", $temp[1]+1);
-#		$::FORM{'advisory_id'} = "$temp[0]-$temp[1]";
-#	}
-	
-	# fix the release and arch form stuff
-	my @form_items;
-	foreach my $form (split ("\n", $::FORM{'release_arch'})) {
-		my @form_items = split (' ', $form);
-		$::FORM{"rel_arch-$form_items[0]-$form_items[1]"} = "$form_items[0]-$form_items[1]";
-	}
-
-####
-#	foreach my $i (keys %::FORM) {
-#		print "$i = $::FORM{$i}<BR>\n";
-#	}
-
-	# call form generation and exit
-	gen_form();
-	PutFooter();
-	exit;
-}
-
-################################################################################
-# 
-# Subroutine:  insert_db 
-# 
-# Description: insert new errata identifier into the database 
-# 
-# Exceptions:  NONE
-#
-# Parameters:  global advisory string parameters 
-#
-# Return Value: 
-
-sub insert_db {
-	my $type = shift;
-	my $issue = shift;
-	my $updated = shift;
-	my $id = shift;
-	my ($next_id, $rev) = ("", "");
-	my @temp;
-
-	if ($type eq "Security Advisory") {
-        $type = 'RHSA';
-    }
-    if ($type eq "Bug Fix Advisory") {
-        $type = 'RHBA';
-    }
-    if ($type eq "Product Enhancement Advisory") {
-        $type = 'RHEA'; 
-    }
-
-	@temp = split(':', $id);
-	($next_id, $rev) = split('-', $temp[1]);
-
-	my $query ="";
-	if ($::FORM{'update'} eq "1") { 
-		$query = "update errata set revision = $rev" .
-				 ", updated_on = " . SqlQuote($updated) . 
-				 " where id = $next_id";
-		
-	} else {
-		$query = "insert into errata (id, revision, issue_date, type) " . 
-					" values ($next_id, $rev, " . SqlQuote($issue) .
-            		", " . SqlQuote($type) . ")";
-	}
-	SendSQL($query);
-    print "Database updated.\n";
-}
-
-################################################################################
-# 
-# Subroutine:   gen_advisory_string
-# 
-# Description:  Generate an unique advisory identifier
-# 
-# Exceptions:  NONE
-#
-# Parameters:  
-#
-# Return Value:  Returns an unique advisory identifier string 
-
-sub gen_advisory_string {
-	if ($::FORM{'type'} eq "Security Advisory") {
-		return "RHSA-$year:" . $::FORM{'advisory_id'};
-	}
-	if ($::FORM{'type'} eq "Bug Fix Advisory") {
-		return "RHBA-$year:" . $::FORM{'advisory_id'};
-	}
-	if ($::FORM{'type'} eq "Product Enhancement Advisory") {
-		return "RHEA-$year:" . $::FORM{'advisory_id'};
-	}
-}
-
-################################################################################
-# 
-# Subroutine:   gen_preview
-# 
-# Description:  Generate a formatted view of how the Errata will look.
-# 
-# Exceptions:  NONE
-#
-# Parameters:  
-#
-# Return Value:  
-
-sub gen_preview {
-	check_form();
-
-	# if we are updating then increment the advisory id
-    if ($::FORM{'update'} eq "1") {
-        my @temp = split('-', $::FORM{'advisory_id'});
-		$temp[0] = sprintf("%.3d", $temp[0]);
-        $temp[1] = sprintf("%.2d", $temp[1]+1);
-        $::FORM{'advisory_id'} = "$temp[0]-$temp[1]";
-    }
-
-	my $advisory = gen_advisory_string();
-	
-    print qq{
-<P>
-<TABLE WIDTH=800 BORDER=1 CELLPADDING=3 CELLSPACING=0>
-<TR BGCOLOR="#ECECEC">
-	<TD>
-    <PRE>
----------------------------------------------------------------------
-                   Red Hat, Inc. $::FORM{'type'}
-
-Synopsis:           $::FORM{'synopsis'}
-Advisory ID:        $advisory
-Issue date:         $::FORM{'issued_on'}
-Updated on:         $::FORM{'updated_on'}
-Keywords:           $::FORM{'keywords'}
-Cross references:   $::FORM{'cross_ref'}
----------------------------------------------------------------------
-
-1. Topic:
-
-$::FORM{'topic'}
-
-2. Relevant releases/architectures:
-
-};
-
-	my %rel_arch;
-	foreach my $rel (grep(/^rel_arch-.*$/, keys %::FORM)) {
-		$rel =~ s/^rel_arch-//g;
-		my @temp = split('-', $rel);
-		push (@{$rel_arch{$temp[0]}}, $temp[1]);
-	}
-
-	foreach my $line (sort(keys %rel_arch)) {
-		my @reverse = reverse @{$rel_arch{$line}};
-		@{$rel_arch{$line}} = @reverse;
-		print "Red Hat Linux " . int($line) . ".x - @{$rel_arch{$line}}\n";
-	}
-
-	print qq{
-3. Problem description:
-
-$::FORM{'description'}
-
-4. Solution:
-
-$::FORM{'solution'}
-
-5. Bug IDs fixed (http://bugzilla.redhat.com/bugzilla for more info):
-
-};
-
-	# Generate summarys for each of the bugs listed
-	foreach my $bug (split(' ', $::FORM{'id_fixed'})) {
-		SendSQL("select short_desc from bugs where bug_id = $bug");
-		while(my $desc = FetchOneColumn()) {
-			print "$bug  -  $desc\n";
-		}
-	}
-
-        print qq{
-6. Obsoleted by:
-
-$::FORM{'obsoleted'}
-
-7. Conflicts with:
-
-$::FORM{'conflicts'}
-
-8. RPMs required:
-};
-
-	# Generate rpms lists based on release-arch info and rpm names
-	my @full_paths;
-	my @releases = keys (%rel_arch);
-	foreach my $release (sort(@releases)) {
-		print "\nRed Hat Linux " . int($release) . ".x:\n";
-		my @rpms;
-		my @names;
-		foreach my $line (split ('\n', $::FORM{'packages'})) {
-			chomp($line);
-			$line =~ s/\s+//g;
-			if ($line eq "") { 
-				next; 
-			}
-			push (@names, $line);
-		}
-		foreach my $arch (@{$rel_arch{$release}}) {
-			print "\n$arch:\n";
-			foreach my $name (sort(@names)) {
-				my $full_path = "ftp://ftp.redhat.com/redhat/updates/$release/$arch/$name.$arch.rpm";
-				print "$full_path\n";
-				push (@full_paths, $full_path);
-			}
-		}
-		print "\nSRPMS:\n";
-		foreach my $name (@names) {
-			my $full_path = "ftp://ftp.redhat.com/redhat/updates/$release/SRPMS/$name.src.rpm";
-			print "$full_path\n";
-			push (@full_paths, );
-		}
-	}
- 
-	print qq{
-9. Verification:
-
-MD5 sum                           Package Name
---------------------------------------------------------------------------
-};
-
-	# This will eventually print md5sums automatically
-	my $md5sum = gen_md5sum(\@full_paths);
-	print $md5sum;
-	
-	print qq{
-These packages are GPG signed by Red Hat, Inc. for security.  Our key
-is available at:
-    http://www.redhat.com/corp/contact.html
-
-You can verify each package with the following command:
-    rpm --checksig  <filename>
-
-If you only wish to verify that each package has not been corrupted or
-tampered with, examine only the md5sum with the following command:
-    rpm --checksig --nogpg <filename>
-
-10. References:
-
-$::FORM{'references'}
-
-    </PRE>
-    </TD>
-</TR>
-</TABLE>
-};
-
-	####################### XML Stuff #########################
-	# resend all the form elements formatted for xml creation #
-	print 	$cgi->startform(-METHOD=>"GET"),
-    		$cgi->hidden(-NAME=>"/errata/metadata/type", -VALUE=>$::FORM{'type'}),
-			$cgi->hidden(-NAME=>"/errata/metadata/component", -VALUE=>$::FORM{'component'}),
-			$cgi->hidden(-NAME=>"/errata/metadata/issued_on", -VALUE=>$::FORM{'issued_on'}),
-			$cgi->hidden(-NAME=>"/errata/metadata/updated_on", -VALUE=>$::FORM{'updated_on'}),
-			$cgi->hidden(-NAME=>"/errata/metadata/id", -VALUE=>$advisory),
-    		$cgi->hidden(-NAME=>"/errata/metadata/synopsis", -VALUE=>$::FORM{'synopsis'}),
-    		$cgi->hidden(-NAME=>"/errata/metadata/keywords", -VALUE=>$::FORM{'keywords'}),
-    		$cgi->hidden(-NAME=>"/errata/metadata/cross_ref", -VALUE=>$::FORM{'cross_ref'}),
-			$cgi->hidden(-NAME=>"/errata/content/id_fixed", -VALUE=>$::FORM{'id_fixed'}),
-    		$cgi->hidden(-NAME=>"/errata/content/obsoleted", -VALUE=>$::FORM{'obsoleted'}),
-            $cgi->hidden(-NAME=>"/errata/content/conflicts", -VALUE=>$::FORM{'conflicts'}),
-    		$cgi->hidden(-NAME=>"/errata/content/topic", -VALUE=>$::FORM{'topic'}),
-    		$cgi->hidden(-NAME=>"/errata/content/solution", -VALUE=>$::FORM{'solution'}),
-    		$cgi->hidden(-NAME=>"/errata/content/description", -VALUE=>$::FORM{'description'}),
-			$cgi->hidden(-NAME=>"/errata/content/references", -VALUE=>$::FORM{'references'});
-
-	# Release per architecture information
-	my $rel_arch_string;
-	foreach my $line (sort(keys %rel_arch)) {
-		foreach my $arch (@{$rel_arch{$line}}) {
-			$rel_arch_string .= "$line $arch\n";
-		}
-    }
-	print $cgi->hidden(-NAME=>"/errata/content/release_arch", -VALUE=>$rel_arch_string);
-	
-	# If this is an update then pass it along
-	if ($::FORM{'update'}) {	
-		print $cgi->hidden(-NAME=>'update', -VALUE=>'1');
-	}
-		
-	print	$cgi->hidden(-NAME=>"/errata/content/rpms", -VALUE=>$::FORM{'packages'}),
-			$cgi->submit(-NAME=>'action', -VALUE=>'Generate Errata'), "&nbsp;",
-			$cgi->a({-HREF=>'createerrata.cgi?action=New+Errata'}, "[Start Over]"),
-			$cgi->endform();
-
-	#														  #
-	##################### End XML Stuff ####################### 
-}
-
-################################################################################
-# 
-# Subroutine:   gen_form
-# 
-# Description:  Generate the form for entering in additional errata information
-# 
-# Exceptions:  None
-#
-# Parameters:  None
-#
-# Return Value: None
-
-sub gen_form {
-	# lets set some sane defaults
-	if (!$::FORM{'type'}) {
-		$::FORM{'type'} = "Security Advisory";
-	}
-
-	print qq{
-<FORM METHOD="GET" ACTION="createerrata.cgi">
-
-<!-- Begin Meta Data -->
-<TABLE WIDTH=800 CELLPADDING=3 CELLSPACING=0 BORDER=1>
-<TR BGCOLOR="#BFBFBF">
-	<TH ALIGN=left><B>Meta Data</B></TH>
-</TR><TR BGCOLOR="#ECECEC">
-	<TD ALIGN=left>
-	<TABLE WIDTH="100%" BORDER=0 CELLSPACING=0 CELLPADDING=3>
-	<TR>
-    	<TD ALIGN=right><B>Errata Type</B></TD>
-    	<TD ALIGN=left>
-};
-		
-		foreach my $i ("Security Advisory", "Bug Fix Advisory", "Product Enhancement Advisory") {
-			if ($::FORM{'type'} eq $i) {
-            	print qq{\t\t<INPUT TYPE="radio" NAME="type" VALUE="$i" CHECKED>$i<BR>\n};
-        	} else {
-            	print qq{\t\t<INPUT TYPE="radio" NAME="type" VALUE="$i">$i<BR>\n};
-        	}
-		}
-
-	print qq{
-        </TD>
-        <TD ALIGN=right><B>Advisory&nbsp;ID</B></TD>
-        <TD ALIGN=left><INPUT TYPE="text" NAME="advisory_id" VALUE="$::FORM{'advisory_id'}" SIZE=20 MAXLENGTH=20><BR>
-		(Incremented automatically for updates)</TD>
-    </TR><TR>
-    	<TD ALIGN=right><B>Synopsis</B></TD>
-    	<TD  ALIGN=left COLSPAN="3">
-    	<INPUT TYPE="text" NAME="synopsis" VALUE="$::FORM{'synopsis'}" SIZE=60 MAXLENGTH=78>
-    	</TD>
-	</TR><TR>
-    	<TD ALIGN=right><B>Issue date</B></TD>
-    	<TD ALIGN=left>
-    	<INPUT TYPE="text" NAME="issued_on" VALUE="$::FORM{'issued_on'}" SIZE=15 MAXLENGTH=15>
-    	</TD>
-    	<TD ALIGN=right><B>Updated On</B></TD>
-    	<TD ALIGN=left>
-    	<INPUT TYPE="text" NAME="updated_on" VALUE="$::FORM{'updated_on'}" SIZE=15 MAXLENGTH=15>
-    	</TD>
-	</TR><tr>
-    	<TD ALIGN=right><B>Keywords</B></TD>
-    	<TD ALIGN=left COLSPAN="3"><INPUT TYPE="text" NAME="keywords" VALUE="$::FORM{'keywords'}" SIZE=60 MAXLENGTH=78></TD>
-	</TR><TR>
-    	<TD ALIGN=right><B>Cross References</B></TD>
-    	<TD ALIGN=left COLSPAN="3"><INPUT TYPE="text" NAME="cross_ref" VALUE="$::FORM{'cross_ref'}" SIZE=60 MAXLENGTH=78></TD>
-	</TR>
-	</TABLE>
-	</TD>
-</TR>
-</TABLE>
-<P>
-
-<!-- Begin Content Data -->
-<TABLE WIDTH=800 CELLPADDING=3 CELLSPACING=0 BORDER=1>
-<TR BGCOLOR="#BFBFBF">
-    <TH ALIGN=left><B>Content Data</B></TH>
-</TR><TR BGCOLOR="#ECECEC">
-    <TD ALIGN=left>
-	<TABLE WIDTH="100%" CELLSPACING=0 CELLPADDING=3>
-	<TR>
-    	<TD ALIGN=right><B>Topic</B></TD>
-    	<TD ALIGN=left COLSPAN=3>
-    	<TEXTAREA NAME="topic" ROWS=10 COLS=70 WRAP=hard>$::FORM{'topic'}</TEXTAREA>
-    	</TD>
-	</TR><TR>	
-    	<TD ALIGN=right><B>Bug IDs fixed</B></TD>
-    	<TD ALIGN=left COLSPAN="3"><INPUT TYPE="text" NAME="id_fixed" VALUE="$::FORM{'id_fixed'}" SIZE=60></TD>
-	</TR><TR>
-    	<TD ALIGN=right><B>Releases</B></TD>
-    	<TD ALIGN=left>
-		<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=2>
-		<TR>
-			<TH></TH>
-			<TH ALIGN=center COLSPAN=4>Architectures</TH>
-		</TR><TR>
-			<TD ALIGN=center></TD>
-			<TD ALIGN=center>i386</TD>
-			<TD ALIGN=center>Alpha</TD><TD ALIGN=center>Sparc</TD>
-		</TR>
-};
-
-	foreach my $i (@final_releases) {
-		if ($i eq "src") { next; }
-		print "\t\t<TR>\n\t\t\t<TD ALIGN=center WIDTH=30>$i</TD>\n\t\t\t";
-		foreach my $j (@::legal_platform) {
-			if ($j eq "All") { next; }
-			print "<TD ALIGN=center WIDTH=30>";
-			if ($::FORM{"release-$i"} and $::FORM{"rep_platform-$j"}) {
-				print qq{<INPUT TYPE="checkbox" NAME="rel_arch-$i-$j" VALUE="$i-$j" CHECKED>};
-			} elsif ($::FORM{"rel_arch-$i-$j"}) {
-				print qq{<INPUT TYPE="checkbox" NAME="rel_arch-$i-$j" VALUE="$i-$j" CHECKED>};
-			} else {
-				print qq{<INPUT TYPE="checkbox" NAME="rel_arch-$i-$j" VALUE="$i-$j">};
-			}
-			print "</TD>\n";
-		}
-		print "</TR>\n";
-    }
-
-    print qq{
-		</TABLE>
-    	</TD>
-};
-    
-	print qq{
-	</TR><TR>
-    	<TD ALIGN=right><B>Obsoleted&nbsp;by</B></TD>
-    	<TD ALIGN=left><INPUT TYPE="text" NAME="obsoleted" SIZE=24 MAXSIZE=40 VALUE="$::FORM{'obsoleted'}"></TD>
-    	<TD ALIGN=right><B>Conflicts&nbsp;with</B></TD>
-    	<TD ALIGN=left><INPUT TYPE="text" NAME="conflicts" SIZE=24 MAXSIZE=40 VALUE="$::FORM{'conflicts'}"></TD>
-	</TR><TR>
-    	<TD ALIGN=right><B>Problem Description</B></TD>
-    	<TD ALIGN=left COLSPAN=3>
-    	<TEXTAREA NAME="description" ROWS=10 COLS=70 WRAP=hard>$::FORM{'description'}</TEXTAREA>
-    	</TD>
-	</TR><TR>
-    	<TD ALIGN=right><B>Solution</B></TD>
-    	<TD ALIGN=left COLSPAN=3>
-    	<TEXTAREA NAME="solution" ROWS=10 COLS=70 WRAP=hard>$::FORM{'solution'}
-    	</TEXTAREA>
-    	</TD>
-	</TR><TR>
-    	<TD ALIGN=right><B>Name-Version-Rev</B><BR>(package links get<BR>automatically generated)</TD>
-    	<TD ALIGN=left COLSPAN=3>
-    	<TEXTAREA NAME="packages" ROWS=10 COLS=70 WRAP=hard>$::FORM{'packages'}</TEXTAREA>
-    	</TD>
-	</TR><TR>
-		<TD ALIGN=right><B>References</B></TD>
-        <TD ALIGN=left COLSPAN=3>
-        <TEXTAREA NAME="references" ROWS=10 COLS=70 WRAP=hard>$::FORM{'references'}</TEXTAREA>
-	</TABLE>
-    </TD>
-</TR>
-</TABLE>
-<P>
-<TABLE>
-<TR>
-	<TD><B><INPUT TYPE="submit" NAME=action VALUE="Preview Errata"></B></TD>
-	<TD><B><INPUT TYPE="submit" NAME=action VALUE="Past Errata"></B></TD>
-</TR>
-</TABLE>
-};
-
-	if($::FORM{'update'}) {
-		print qq{<INPUT TYPE=hidden NAME=update VALUE=1>};
-	}
-
-	print qq{
-</FORM>
-};
-
-}
-
-################################################################################
-# 
-# Subroutine:   gen_list
-# 
-# Description:  Generate a link to past errata and link them for loading
-# 
-# Exceptions:  None
-#
-# Parameters:  None
-#
-# Return Value: None
-
-sub gen_list {
-	print qq{
-<P>
-(Click to edit or view old errata announcement)
-<TABLE CELLPADDING=3 CELLSPACING=0 BORDER=1 WIDTH=600>
-<TR BGCOLOR="#BFBFBF">
-	<TH ALIGN=left>Full Name</TH>
-	<TH ALIGN=left>ID/Rev</TH>
-	<TH ALIGN=left>Errata Type</TH>
-	<TH ALIGN=left>Issue Date</TH>
-	<TH ALIGN=left>Updated On</TH>
-</TR>
-};
-	
-	my @row;
-	SendSQL("select * from errata");
-	while (@row = FetchSQLData()) {
-		my $id = sprintf("%.3d", $row[0]);
-		my $rev = sprintf("%.2d", $row[1]);
-		my $errata_type = $row[2];
-		my $date = $row[3]; 
-		my ($year, $mon, $day) = ($date =~ /(\d+)-(\d+)-(\d+)/);
-		print "<TR BGCOLOR=\"#ECECEC\">\n";
-		print "<TD ALIGN=left><A HREF=\"createerrata.cgi?action=Update+Errata&update=1&load_file=$errata_type-$year:$id-$rev.xml\">";
-		print "$errata_type-$year:$id-$rev</A></TD>\n";
-		print "<TD ALIGN=left>$id-$rev</TD>\n";
-		print "<TD ALIGN=left>";
-		if ($errata_type eq "RHSA") {
-			print "Security Advisory";
-		} elsif ($errata_type eq "RHBA") {
-			print "Bug Fix Advisory";
-		} elsif ($errata_type eq "RHEA") {
-			print "Product Enhancement Advisory";
-		}
-		print "</TD>\n";
-		print "<TD ALIGN=left>$date</TD>\n";
-		print "<TD ALIGN=left>$row[4]&nbsp;</TD>\n";
-		print "</TD>\n";
-	}
-
-print qq{
-</TABLE>
-};
-
-}
-
-################################################################################
-# 
-# Subroutine:  check_form 
-# 
-# Description:  sanity checking of some form variables
-# 
-# Exceptions:  None
-#
-# Parameters:  None
-#
-# Return Value: None
-
-sub check_form {
-    # A little sanity checking
-    # Advisory ID #
-    if ($::FORM{'advisory_id'} =~ /\s/) {
-        print "Advisory ID can not contain spaces!";
-        exit;
-    }
-
-    # Issue Date #
-    if ($::FORM{'issued_on'} !~ m/\d{4}-\d{1,2}-\d{1,2}/) {
-        print "Issue Date must be in the form YYYY-MM-DD!";
-        exit;
-    }
-
-    # Updated On #
-	if ($::FORM{'update'} eq "1") {
-    	if ($::FORM{'updated_on'} !~ m/\d{4}-\d{1,2}-\d{1,2}/) {
-        	print "Updated Date must be in the form YYYY-MM-DD!";
-        	exit;
-    	}
-	}
-
-    # Packages #
-#    if ($::FORM{'packages'} !~ m!\S+\s+[^-\s]+-[^-\s]+-\S+!) {
-#        print "Package entries must match 'RHL N-R-V md5sum'!";
-#        exit;
-#    }
-
-	# Topic #
-	if ($::FORM{'topic'} eq "") {
-		$::FORM{'topic'} = "N-A";
-	}
-
-	# Synopsis #
-	if ($::FORM{'synopsis'} eq "") {
-        $::FORM{'synopsis'} = "N-A";
-    }
-
-	# Cross references #
-	if ($::FORM{'cross_ref'} eq "") {
-        $::FORM{'cross_ref'} = "N-A";
-    }
-
-	# Keywords #
-	if ($::FORM{'keywords'} eq "") {
-        $::FORM{'keywords'} = "N-A";
-    }
-
-	# Description #
-	if ($::FORM{'description'} eq "") {
-        $::FORM{'description'} = "N-A";
-    }
-
-	# Obsoleted by #
-	if ($::FORM{'obsoleted'} eq "") {
-        $::FORM{'obsoleted'} = "N-A";
-    }
-
-	# Conflicts with #
-	if ($::FORM{'conflicts'} eq "") {
-        $::FORM{'conflicts'} = "N-A";
-    }
-
-	# References #
-	if ($::FORM{'references'} eq "") {
-        $::FORM{'references'} = "N-A";
-    }
-}
-
-################################################################################
-# 
-# Subroutine:  check_form 
-# 
-# Description:  sanity checking of some form variables
-# 
-# Exceptions:  None
-#
-# Parameters:  None
-#
-# Return Value: None
-
-sub gen_md5sum {
-	my @full_paths = @{ shift; };
-	my $md5sums;
-	my $local;
-
-#	if (! -d $tmp_dir) {
-#		mkdir($tmp_dir);
-#	}
-
-	my $ftp = new Net::FTP($server);
-	$ftp->login($login, $password);
-	$ftp->binary;
-
-	foreach my $path (@full_paths) {
-		$path =~ s/ftp:\/\/ftp.redhat.com\///g;
-		$local = rindex($path, '/');
-    	$local = substr($path, $local+1);
-		my $result = $ftp->get($path, "$tmp_dir/$local");
-		if ($result) {
-			$md5sums .= "*insert md5sum here* $path \n";
-		} else {
-			$md5sums .= "*insert md5sum here* $path \n";
-		}
-	}
-
-#	foreach my $foo (@full_paths) {
-#		$foo =~ s/ftp:\/\/ftp.redhat.com\/redhat/updates\///g;
-#		$md5sums .= "*insert md5sum here* $foo\n";	
-#	}
-
-	$ftp->quit;
-	
-	return $md5sums;
-}
-
-############## Start Main 
-
-print "Content-type: text/html\n\n";
-
-$cgi = new CGI::XMLForm;
-
-# Uncomment the next line for debugging purposes
-# print $cgi->dump;
-
-if ($::FORM{'action'} eq "Generate Errata") {
-	PutHeader("Generate Errata");
-	$cgi->delete('action');
-	gen_xml();
-
-} elsif ($::FORM{'action'} eq "Preview Errata") {
-	PutHeader("Preview Errata");
-	delete $::FORM{'action'};
-	gen_preview();
-
-} elsif ($::FORM{'action'} eq "Past Errata") {
-	PutHeader("Past Errata");
-	gen_list();
-
-} elsif ($::FORM{'action'} eq "Update Errata") {
-	PutHeader("Update Errata");
-	delete $::FORM{'action'};
-	load_xml();
-	gen_form();
-
-} elsif ($::FORM{'action'} eq "New Errata") {
-	PutHeader("New Errata");
-	delete $::FORM{'action'};
-
-	# select the next id information from database
-	SendSQL("select max(id) from errata");
-	my $next_id = FetchOneColumn() + 1;
-	my $rev = 1;
-	$next_id = sprintf("%.3d", $next_id);
-	$rev = sprintf("%.2d", $rev);
-	$::FORM{'advisory_id'} = "$next_id-$rev";
-	
-	# issue date for new errata's is todays date
-	$::FORM{'issued_on'} = sprintf("%s-%s-%s", $year, $mon, $day);
-	$::FORM{'updated_on'} = sprintf("%s-%s-%s", $year, $mon, $day);
-
-    gen_form();
-
-} else {
-	PutHeader("Illegal Errata Action");
-}
-
-PutFooter();
-exit;
-
-############### End Main 

mozilla/webtools/bugzilla/defparams.pl

@@ -1,592 +0,0 @@
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-#                 Dawn Endico <endico@mozilla.org>
-#                 Dan Mosedale <dmose@mozilla.org>
-#                 Joe Robins <jmrobins@tgix.com>
-#				  David Lawrence <dkl@redhat.com>
-
-
-# This file defines all the parameters that we have a GUI to edit within
-# Bugzilla.
-
-use diagnostics;
-use strict;
-
-# Shut up misguided -w warnings about "used only once".  For some reason,
-# "use vars" chokes on me when I try it here.
-
-sub bug_form_pl_sillyness {
-    my $zz;
-    $zz = %::param_checker;
-    $zz = %::param_desc;
-    $zz = %::param_type;
-}
-
-sub WriteParams {
-    foreach my $i (@::param_list) {
-	if (!defined $::param{$i}) {
-	    $::param{$i} = $::param_default{$i};
-            if (!defined $::param{$i}) {
-                die "No default parameter ever specified for $i";
-            }
-	}
-    }
-    mkdir("data", 0777);
-    chmod 0777, "data";
-    my $tmpname = "data/params.$$";
-    open(FID, ">$tmpname") || die "Can't create $tmpname";
-    my $v = $::param{'version'};
-    delete $::param{'version'};  # Don't write the version number out to
-                                # the params file.
-    print FID GenerateCode('%::param');
-    $::param{'version'} = $v;
-    print FID "1;\n";
-    close FID;
-    rename $tmpname, "data/params" || die "Can't rename $tmpname to data/params";
-    chmod 0666, "data/params";
-}
-    
-
-sub DefParam {
-    my ($id, $desc, $type, $default, $checker) = (@_);
-    push @::param_list, $id;
-    $::param_desc{$id} = $desc;
-    $::param_type{$id} = $type;
-    $::param_default{$id} = $default;
-    if (defined $checker) {
-	$::param_checker{$id} = $checker;
-    }
-}
-
-
-sub check_numeric {
-    my ($value) = (@_);
-    if ($value !~ /^[0-9]+$/) {
-	return "must be a numeric value";
-    }
-    return "";
-}
-
-
-sub check_shadowdb {
-    my ($value) = (@_);
-    $value = trim($value);
-    if ($value eq "") {
-        return "";
-    }
-    SendSQL("SHOW DATABASES");
-    while (MoreSQLData()) {
-        my $n = FetchOneColumn();
-        if (lc($n) eq lc($value)) {
-            return "The $n database already exists.  If that's really the name you want to use for the backup, please CAREFULLY make the existing database go away somehow, and then try again.";
-        }
-    }
-    SendSQL("CREATE DATABASE $value");
-    SendSQL("INSERT INTO shadowlog (command) VALUES ('SYNCUP')", 1);
-    return "";
-}
-    
-@::param_list = ();
-
-# OK, here are the definitions themselves.
-#
-# The type of parameters (the third parameter to DefParam) can be one
-# of the following:
-#
-# t -- A short text entry field (suitable for a single line)
-# l -- A long text field (suitable for many lines)
-# b -- A boolean value (either 1 or 0)
-# i -- An integer.
-# defenum -- This param defines an enum that defines a column in one of
-#	     the database tables.  The name of the parameter is of the form
-#	     "tablename.columnname".
-
-DefParam("contract",
-     "Contract support (Red Hat)",
-     "b",
-     1);
-
-DefParam("templatepath",
-	 "The path to your html template files",
-	 "t",
-	 "templates");
-
-DefParam("maintainer",
-	 "The email address of the person who maintains this installation of Bugzilla.",
-	 "t",
-         'THE MAINTAINER HAS NOT YET BEEN SET');
-
-DefParam("urlbase",
-	 "The URL that is the common initial leading part of all Bugzilla URLs.",
-	 "t",
-	 "http://bugzilla.redhat.com/bugzilla/",
-	 \&check_urlbase);
-
-sub check_urlbase {
-    my ($url) = (@_);
-    if ($url !~ m:^http.*/$:) {
-	return "must be a legal URL, that starts with http and ends with a slash.";
-    }
-    return "";
-}
-
-DefParam("preferlists",
-	"If this is on, Bugzilla will display most selection options as selection lists. If this is off, Bugzilla will use radio buttons and checkboxes instead.",
-	"b",
-	1);
-
-DefParam("prettyasciimail",
-	"If this is on, Bugzilla will send email reports formatted (assuming 76 character monospace font display). If this is off, email reports are sent using the old 'one-item-per-line' format.",
-	"b",
-	0);
-
-DefParam("capitalizelists",
-	"If this is on, Bugzilla will capitalize list entries, checkboxes, and radio buttons. If this is off, Bugzilla will leave these items untouched.",
-	"b",
-	0);
-
-
-DefParam("usequip",
-	"If this is on, Bugzilla displays a silly quip at the beginning of buglists, and lets users add to the list of quips.",
-	"b",
-	1);
-
-
-# Added parameter - JMR, 2/16/00
-DefParam("usebuggroups",
-         "If this is on, Bugzilla will associate a bug group with each product in the database, and use it for querying bugs.",
-         "b",
-         0); 
- 
-# Added parameter - JMR, 2/16/00
-DefParam("usebuggroupsentry",
-         "If this is on, Bugzilla will use product bug groups to restrict who can enter bugs.  Requires usebuggroups to be on as well.",
-         "b",
-         0); 
- 
-DefParam("shadowdb",
-         "If non-empty, then this is the name of another database in which Bugzilla will keep a shadow read-only copy of everything.  This is done so that long slow read-only operations can be used against this db, and not lock up things for everyone else.  Turning on this parameter will create the given database; be careful not to use the name of an existing database with useful data in it!",
-         "t",
-         "",
-         \&check_shadowdb);
-
-DefParam("queryagainstshadowdb",
-         "If this is on, and the shadowdb is set, then queries will happen against the shadow database.",
-         "b",
-         0);
-         
-
-DefParam("usedespot",
-         "If this is on, then we are using the Despot system to control our database of users.  Bugzilla won't ever write into the user database, it will let the Despot code maintain that.  And Bugzilla will send the user over to Despot URLs if they need to change their password.  Also, in that case, Bugzilla will treat the passwords stored in the database as being crypt'd, not plaintext.",
-         "b",
-         0);
-
-DefParam("despotbaseurl",
-         "The base URL for despot.  Used only if <b>usedespot</b> is turned on, above.",
-         "t",
-         "http://cvs-mirror.mozilla.org/webtools/despot/despot.cgi",
-         \&check_despotbaseurl);
-
-
-sub check_despotbaseurl {
-    my ($url) = (@_);
-    if ($url !~ /^http.*cgi$/) {
-	return "must be a legal URL, that starts with http and ends with .cgi";
-    }
-    return "";
-}
-
-
-DefParam("headerhtml",
-         "Additional HTML to add to the HEAD area of documents, eg. links to stylesheets.",
-         "l",
-         '');
-
-DefParam("footerhtml",
-         "HTML to add to the bottom of every page. By default it displays the blurbhtml, and %commandmenu%, a menu of useful commands.  You probably really want either headerhtml or footerhtml to include %commandmenu%.",
-         "l",
-         '<TABLE BORDER="0"><TR><TD BGCOLOR="#000000" VALIGN="TOP">
-<TABLE BORDER="0" CELLPADDING="10" CELLSPACING="0" WIDTH="100%" BGCOLOR="lightyellow">
-<TR><TD>
-%blurbhtml%
-<BR>
-%commandmenu%
-</TD></TR></TABLE></TD></TR></TABLE>');
-
-
-DefParam("errorhtml",
-         "This is what is printed out when a form is improperly filled out.  %errormsg% is replaced by the actual error itself; %<i>anythingelse</i>% gets replaced by the definition of that parameter (as defined on this page).",
-         "l",
-         qq{<TABLE CELLPADDING=20><TR><TD BGCOLOR="#ff0000">
-<FONT SIZE="+2">%errormsg%</FONT></TD></TR></TABLE>
-<P>Please press <B>Back</B> and try again.<P>});
-
-
-DefParam("bannerhtml",
-         "The html that gets emitted at the head of every Bugzilla page. 
-Anything of the form %<i>word</i>% gets replaced by the defintion of that 
-word (as defined on this page).",
-         "l",
-         q{<TABLE BGCOLOR="#000000" WIDTH="100%" BORDER=0 CELLPADDING=0 CELLSPACING=0>
-<TR><TD><A HREF="http://www.mozilla.org/"><IMG
- SRC="http://www.mozilla.org/images/mozilla-banner.gif" ALT=""
-BORDER=0 WIDTH=600 HEIGHT=58></A></TD></TR></TABLE>
-<CENTER><FONT SIZE=-1>Bugzilla version %version%
-</FONT></CENTER>});
-
-
-DefParam("blurbhtml",
-         "A blurb that appears as part of the header of every Bugzilla page.  This is a place to put brief warnings, pointers to one or two related pages, etc.",
-         "l",
-         "This is <B>Bugzilla</B>: the Mozilla bug system.  For more 
-information about what Bugzilla is and what it can do, see 
-<A HREF=\"http://www.mozilla.org/\">mozilla.org</A>'s
-<A HREF=\"http://www.mozilla.org/bugs/\"><B>bug pages</B></A>.");
-
-
-DefParam("mybugstemplate",
-         "This is the URL to use to bring up a simple 'all of my bugs' list for a user.  %userid% will get replaced with the login name of a user.",
-         "t",
-         "buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=%userid%&emailtype1=exact&emailassigned_to1=1&emailreporter1=1");
-    
-
-
-DefParam("shutdownhtml",
-         "If this field is non-empty, then Bugzilla will be completely disabled and this text will be displayed instead of all the Bugzilla pages.",
-         "l",
-         "");
-
-
-DefParam("passwordmail",
-q{The email that gets sent to people to tell them their password.  Within
-this text, %mailaddress% gets replaced by the person's email address,
-%login% gets replaced by the person's login (usually the same thing), and
-%password% gets replaced by their password.  %<i>anythingelse</i>% gets
-replaced by the definition of that parameter (as defined on this page).},
-         "l",
-         q{From: bugzilla@redhat.com
-To: %mailaddress%
-X-loop: bugzilla@redhat.com
-Subject: Your Bugzilla password.
-
-To use the wonders of Bugzilla, you can use the following:
-
- E-mail address: %login%
-       Password: %password%
-
- To change your password, go to:
- %urlbase%userprefs.cgi
-});
-
-
-
-DefParam("changedmail",
-q{The email that gets sent to people when a bug changes.  Within this
-text, %to% gets replaced by the assigned-to and reported-by people,
-separated by a comma (with duplication removed, if they're the same
-person).  %cc% gets replaced by the list of people on the CC list,
-separated by commas.  %bugid% gets replaced by the bug number.
-%diffs% gets replaced by the diff text from the old version to the new
-version of this bug.  %neworchanged% is either "New" or "Changed",
-depending on whether this mail is reporting a new bug or changes made
-to an existing one.  %summary% gets replaced by the summary of this
-bug.  %<i>anythingelse</i>% gets replaced by the definition of that
-parameter (as defined on this page).},
-         "l",
-"From: bugzilla\@redhat.com
-To: %to%
-X-loop: bugzilla\@redhat.com
-Cc: %cc%
-Subject: [Bug %bugid%] %neworchanged% - %summary%
-
-%urlbase%show_bug.cgi?id=%bugid%
-
-%diffs%");
-
-DefParam("newemailtech",
-q{There is now experimental code in Bugzilla to do the email diffs in a 
-new and exciting way.  But this stuff is not very cooked yet.  So, right
-now, to use it, the maintainer has to turn on this checkbox, and each user
-has to then turn on the "New email tech" preference.},
-    "b",
-    0);
-
-
-DefParam("newchangedmail",
-q{The same as 'changedmail', but used for the newemailtech stuff.},
-         "l",
-"From: bugzilla\@redhat.com
-To: %to%
-Cc: %cc%
-Subject: [Bug %bugid%] %neworchanged% - %summary%
-
-%urlbase%show_bug.cgi?id=%bugid%
-
-%diffs%");
-
-
-
-DefParam("whinedays",
-         "The number of days that we'll let a bug sit untouched in a NEW state before our cronjob will whine at the owner.",
-         "t",
-         7,
-         \&check_numeric);
-
-
-DefParam("whinemail",
-         "The email that gets sent to anyone who has a NEW bug that hasn't been touched for more than <b>whinedays</b>.  Within this text, %email% gets replaced by the offender's email address.  %userid% gets replaced by the offender's bugzilla login (which, in most installations, is the same as the email address.)  %<i>anythingelse</i>% gets replaced by the definition of that parameter (as defined on this page).<p> It is a good idea to make sure this message has a valid From: address, so that if the mail bounces, a real person can know that there are bugs assigned to an invalid address.",
-         "l",
-         q{From: %maintainer%
-To: %email%
-Subject: Your Bugzilla buglist needs attention.
-
-[This e-mail has been automatically generated.]
-
-You have one or more bugs assigned to you in the Bugzilla 
-bugsystem (%urlbase%) that require
-attention.
-
-All of these bugs are in the NEW state, and have not been touched
-in %whinedays% days or more.  You need to take a look at them, and 
-decide on an initial action.
-
-Generally, this means one of three things:
-
-(1) You decide this bug is really quick to deal with (like, it's INVALID),
-    and so you get rid of it immediately.
-(2) You decide the bug doesn't belong to you, and you reassign it to someone
-    else.  (Hint: if you don't know who to reassign it to, make sure that
-    the Component field seems reasonable, and then use the "Reassign bug to
-    owner of selected component" option.)
-(3) You decide the bug belongs to you, but you can't solve it this moment.
-    Just use the "Accept bug" command.
-
-To get a list of all NEW bugs, you can use this URL (bookmark it if you like!):
-
-    %urlbase%buglist.cgi?bug_status=NEW&assigned_to=%userid%
-
-Or, you can use the general query page, at
-%urlbase%query.cgi.
-
-Appended below are the individual URLs to get to all of your NEW bugs that 
-haven't been touched for a week or more.
-
-You will get this message once a day until you've dealt with these bugs!
-
-});
-
-
-
-DefParam("defaultquery",
- 	 "This is the default query that initially comes up when you submit a bug.  It's in URL parameter format, which makes it hard to read.  Sorry!",
-	 "t",
-	 "bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=%22Importance%22");
-
-
-DefParam("letsubmitterchoosepriority",
-         "If this is on, then people submitting bugs can choose an initial priority for that bug.  If off, then all bugs initially have the default priority selected above.",
-         "b",
-         1);
-
-
-sub check_priority {
-    my ($value) = (@_);
-    GetVersionTable();
-    if (lsearch(\@::legal_priority, $value) < 0) {
-        return "Must be a legal priority value: one of " .
-            join(", ", @::legal_priority);
-    }
-    return "";
-}
-
-
-DefParam("defaultpriority",
-         "This is the priority that newly entered bugs are set to.",
-         "t",
-         "normal",
-         \&check_priority);
-
-
-DefParam("usetargetmilestone",
-	 "Do you wish to use the Target Milestone field?",
-	 "b",
-	 0);
-
-
-DefParam("nummilestones",
-         "If using Target Milestone, how many milestones do you wish to
-          appear?",
-         "t",
-         10,
-         \&check_numeric);
-
-
-DefParam("curmilestone",
-         "If using Target Milestone, Which milestone are we working toward right now?",
-         "t",
-         1,
-         \&check_numeric);
-
-
-DefParam("useqacontact",
-	 "Do you wish to use the QA Contact field?",
-	 "b",
-	 0);
-
-
-DefParam("usestatuswhiteboard",
-	 "Do you wish to use the Status Whiteboard field?",
-	 "b",
-	 0);
-
-
-DefParam("usebrowserinfo",
-	 "Do you want bug reports to be assigned an OS & Platform based on the browser
-	  the user makes the report from?",
-	 "b",
-	 0);
-
-
-DefParam("usedependencies",
-         "Do you wish to use dependencies (allowing you to mark which bugs depend on which other ones)?",
-         "b",
-         1);
-
-
-DefParam("webdotbase",
-         "This is the URL prefix that is common to all requests for webdot.  The <a href=\"http://www.research.att.com/~north/cgi-bin/webdot.cgi\">webdot package</a> is a very swell thing that generates pictures of graphs.  If you have an installation of bugsplat that hides behind a firewall, then to get graphs to work, you will have to install a copy of webdot behind your firewall, and change this path to match.  Also, webdot has some trouble with software domain names, so you may have to play games and hack the %urlbase% part of this.  If this all seems like too much trouble, you can set this paramater to be the empty string, which will cause the graphing feature to be disabled entirely.",
-         "t",
-         "http://www.research.att.com/~north/cgi-bin/webdot.cgi/%urlbase%");
-
-
-DefParam("entryheaderhtml",
-         "This is a special header for the bug entry page. The text will be printed after the page header, before the bug entry form. It is meant to be a place to put pointers to intructions on how to enter bugs.",
-         "l",
-         '<A HREF="bugwritinghelp.html">Bug writing guidelines</A>');
-
-
-DefParam("expectbigqueries",
-         "If this is on, then we will tell mysql to <tt>set option SQL_BIG_TABLES=1</tt> before doing queries on bugs.  This will be a little slower, but one will not get the error <tt>The table ### is full</tt> for big queries that require a big temporary table.",
-         "b",
-         0);
-
-
-DefParam("emailregexp",
-         'This defines the regexp to use for legal email addresses.  The default tries to match fully qualified email addresses.  Another popular value to put here is <tt>^[^@, ]*$</tt>, which means "local usernames, no @ allowed.',
-         "t",
-         q:^[^@, ]*@[^@, ]*\\.[^@, ]*$:);
-
-
-DefParam("emailregexpdesc",
-         "This describes in english words what kinds of legal addresses are allowed by the <tt>emailregexp</tt> param.",
-         "l",
-         "A legal address must contain exactly one '\@', and at least one '.' after the \@, and may not contain any commas or spaces.");
-
-
-DefParam("emailsuffix",
-         "This is a string to append to any email addresses when actually sending mail to that address.  It is useful if you have changed the <tt>emailregexp</tt> param to only allow local usernames, but you want the mail to be delivered to username\@my.local.hostname.",
-         "t",
-         "");
-
-
-DefParam("voteremovedmail",
-q{This is a mail message to send to anyone who gets a vote removed from a bug for any reason.  %to% gets replaced by a comma-separated list of people who used to be voting for this bug.  %bugid% gets replaced by the bug number.  %reason% gets replaced by a short reason describing why the vote was removed. %count% is how many votes got removed. %<i>anythingelse</i>% gets replaced by the definition of thatparameter (as defined on this page).},
-         "l",
-"From: bugzilla\@redhat.com
-To: %to%
-X-loop: bugzilla\@redhat.com
-Subject: [Bug %bugid%] Your vote has been removed from this bug
-
-You used to have a vote on bug %bugid%, but it has been removed.
-
-Reason: %reason%
-
-Votes removed: %count%
-
-%urlbase%show_bug.cgi?id=%bugid%
-");
-
-         
-DefParam("allowbugdeletion",
-         q{The pages to edit products and components and versions can delete all associated bugs when you delete a product (or component or version).  Since that is a pretty scary idea, you have to turn on this option before any such deletions will ever happen.},
-         "b",
-         0);
-
-
-DefParam("allowuserdeletion",
-         q{The pages to edit users can also let you delete a user.  But there is no code that goes and cleans up any references to that user in other tables, so such deletions are kinda scary.  So, you have to turn on this option before any such deletions will ever happen.},
-         "b",
-         0);
-
-
-DefParam("strictvaluechecks",
-         "Do stricter integrity checking on both form submission values and values read in from the database.",
-         "b",
-         0);
-
-
-DefParam("browserbugmessage",
-         "If strictvaluechecks is on, and the bugzilla gets unexpected data from the browser, in addition to displaying the cause of the problem, it will output this HTML as well.",
-         "l",
-         "this may indicate a bug in your browser.\n");
-
-
-#
-# Parameters to force users to comment their changes for different actions.
-DefParam("commentonaccept", 
-         "If this option is on, the user needs to enter a short comment if he accepts the bug",
-         "b", 0 );
-DefParam("commentonclearresolution", 
-         "If this option is on, the user needs to enter a short comment if the bugs resolution is cleared",
-         "b", 0 );
-DefParam("commentonconfirm", 
-         "If this option is on, the user needs to enter a short comment when confirming a bug",
-         "b", 0 );
-DefParam("commentonresolve", 
-         "If this option is on, the user needs to enter a short comment if the bug is resolved",
-         "b", 0 );
-DefParam("commentonreassign", 
-         "If this option is on, the user needs to enter a short comment if the bug is reassigned",
-         "b", 0 );
-DefParam("commentonreassignbycomponent", 
-         "If this option is on, the user needs to enter a short comment if the bug is reassigned by component",
-         "b", 0 );
-DefParam("commentonreopen", 
-         "If this option is on, the user needs to enter a short comment if the bug is reopened",
-         "b", 0 );
-DefParam("commentonverify", 
-         "If this option is on, the user needs to enter a short comment if the bug is verified",
-         "b", 0 );
-DefParam("commentonclose", 
-         "If this option is on, the user needs to enter a short comment if the bug is closed",
-         "b", 0 );
-DefParam("commentonduplicate",
-         "If this option is on, the user needs to enter a short comment if the bug is marked as duplicate",
-         "b", 0 );
-
-# Added so that multiple instances of bugzilla may be ran on the same web server
-DefParam("cookiepath",
-         "Html path is set each time a cookie is sent to the user's browser",
-         "t",
-         "/bugzilla/");
-
-1;
-

mozilla/webtools/bugzilla/describecomponents.cgi

@@ -1,100 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-use vars %::FORM;
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-
-ConnectToDatabase();
-GetVersionTable();
-
-print "Content-type: text/html\n\n";
-
-my $product = $::FORM{'product'};
-if (!defined $product || lsearch(\@::legal_product, $product) < 0) {
-
-    PutHeader("Components");
-    print "
-<FORM>
-<CENTER><B>Please specify the product whose components you want described.</B>
-<P>
-Product: <SELECT NAME=product>
-";
-    print make_options(\@::legal_product);
-    print "
-</SELECT>
-<P>
-<INPUT TYPE=\"submit\" VALUE=\"Submit\">
-</CENTER>
-</FORM>
-";
-	PutFooter();
-    exit;
-}
-
-
-PutHeader("Components", "Components", $product);
-print "
-<TABLE ALIGN=center WIDTH=800>
-<TR>
-<TH ALIGN=left>Component</TH>
-<TH ALIGN=left>Default owner</TH>
-";
-
-my $useqacontact = Param("useqacontact");
-
-my $cols = 2;
-if ($useqacontact) {
-    print "<TH ALIGN=left>Default qa contact</TH>";
-    $cols++;
-}
-
-my $colbut1 = $cols - 1;
-
-print "</TR>";
-
-SendSQL("select value, initialowner, initialqacontact, description from components where program = " . SqlQuote($product) . " order by value");
-
-while (MoreSQLData()) {
-    my @row = FetchSQLData();
-    my ($component, $initialowner, $initialqacontact, $description) = (@row);
-
-    print qq|
-<tr><td colspan=$cols><hr></td></tr>
-<tr><td rowspan=2>$component</td>
-<td><a href="mailto:$initialowner">$initialowner</a></td>
-|;
-    if ($useqacontact) {
-        print qq|
-<td><a href="mailto:$initialqacontact">$initialqacontact</a></td>
-|;
-    }
-    print "</TR><TR><TD COLSPAN=$colbut1>$description</TD></TR>\n";
-}
-
-print "<TR><TD COLSPAN=$cols><HR></TD></TR></TABLE>\n";
-
-PutFooter();
-

mozilla/webtools/bugzilla/describekeywords.cgi

@@ -1,97 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Terry Weissman.
-# Portions created by Terry Weissman are
-# Copyright (C) 2000 Terry Weissman. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-
-ConnectToDatabase();
-
-print "Content-type: text/html\n\n";
-
-PutHeader("Bugzilla keyword description");
-
-my $tableheader = qq{
-<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0 ALIGN=center>
-<TR BGCOLOR="#BFBFBF">
-<TH ALIGN="left">Name</TH>
-<TH ALIGN="left">Description</TH>
-<TH ALIGN="left">Bugs</TH>
-</TR>
-};
-
-print $tableheader;
-my $line_count = 0;
-my $max_table_size = 50;
-
-if ($::driver eq 'mysql') {
-	SendSQL("SELECT keyworddefs.name, keyworddefs.description, 
-    	     COUNT(keywords.bug_id), keywords.bug_id
-        	 FROM keyworddefs LEFT JOIN keywords ON keyworddefs.id=keywords.keywordid
-         	 GROUP BY keyworddefs.id
-         	 ORDER BY keyworddefs.name");
-} else {
-	SendSQL("SELECT keyworddefs.name, keyworddefs.description, 
-             COUNT(keywords.bug_id), keywords.bug_id
-             FROM keyworddefs, keywords 
-			 WHERE keyworddefs.id = keywords.keywordid (+)
-             GROUP BY keyworddefs.name, keyworddefs.description, keywords.bug_id
-             ORDER BY keyworddefs.name");
-}
-
-while (MoreSQLData()) {
-    my ($name, $description, $bugs, $onebug) = FetchSQLData();
-    if ($bugs && $onebug) {
-        # This 'onebug' stuff is silly hackery for old versions of
-        # MySQL that seem to return a count() of 1 even if there are
-        # no matching.  So, we ask for an actual bug number.  If it
-        # can't find any bugs that match the keyword, then we set the
-        # count to be zero, ignoring what it had responded.
-        my $q = url_quote($name);
-        $bugs = qq{<A HREF="buglist.cgi?keywords=$q">$bugs</A>};
-    } else {
-        $bugs = "none";
-    }
-    if ($line_count == $max_table_size) {
-        print "</table>\n$tableheader";
-        $line_count = 0;
-    }
-    $line_count++;
-    print qq{
-<TR BGCOLOR="#ECECEC">
-<TH ALIGN=left>$name</TH>
-<TD>$description</TD>
-<TD ALIGN=left>$bugs</TD>
-</TR>
-};
-}
-
-print "</TABLE><P>\n";
-
-quietly_check_login();
-
-if (UserInGroup("editkeywords")) {
-    print "<p><CENTER><a href=editkeywords.cgi>Edit keywords</a></CENTER><p>\n";
-}
-
-PutFooter();

mozilla/webtools/bugzilla/doaddcomponent.cgi

@@ -1,104 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation. All Rights Reserved.
-# 
-# Contributor(s): Sam Ziegler <sam@ziegler.org>
-# Terry Weissman <terry@mozilla.org>
-# Mark Hamby <mhamby@logicon.com>
-
-# Code derived from doeditcomponents.cgi
-
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-# foreach my $i (sort(keys %::FORM)) {
-#     print value_quote("$i $::FORM{$i}") . "<BR>\n";
-# }
-
-if (!UserInGroup("editcomponents")) {
-    print "<H1>Sorry, you aren't a member of the 'editcomponents' group.</H1>\n";
-    print "And so, you aren't allowed to add components.\n";
-    exit;
-}
-
-
-PutHeader("Adding new component");
-
-unlink "data/versioncache";
-GetVersionTable();
-
-my $component = trim($::FORM{"component"});
-my $product = trim($::FORM{"product"});
-my $description = trim($::FORM{"description"});
-my $initialowner = trim($::FORM{"initialowner"});
-
-if (!defined $::FORM{"initialqacontact"}) {
-    # May not be defined if we're not using this field.
-    $::FORM{'initialqacontact'} = "";
-}
-my $initialqacontact = trim($::FORM{"initialqacontact"});
-
-if ($component eq "") {
-    print "You must enter a name for the new component.  Please press\n";
-    print "<b>Back</b> and try again.\n";
-    exit;
-}
-
-# Check to ensure the component doesn't exist already.
-SendSQL("SELECT value FROM components WHERE " .
-      "program = " . SqlQuote($product) . " and " .
-      "value = " . SqlQuote($component));
-my @row = FetchSQLData();
-if (@row) {
-        print "<H1>Component already exists</H1>";
-        print "The component '$component' already exists\n";
-        print "for product '$product'.<P>\n";
-        print "<p><a href=query.cgi>Go back to the query page</a>\n";
-        exit;
-}
-
-# Check that the email addresses are legitimate.
-foreach my $addr ($initialowner, $initialqacontact) {
-    if ($addr ne "") {
-        DBNameToIdAndCheck($addr);
-    }
-}
-
-# Add the new component.
-SendSQL("INSERT INTO components ( " .
-      "value, program, description, initialowner, initialqacontact" .
-      " ) VALUES ( " .
-      SqlQuote($component) . "," .
-      SqlQuote($product) . "," .
-      SqlQuote($description) . "," .
-      SqlQuote($initialowner) . "," .
-      SqlQuote($initialqacontact) . ")" );
-
-unlink "data/versioncache";
-
-print "OK, done.<p>\n";
-print "<a href=addcomponent.cgi>Edit another new component.</a><p>\n";
-print "<a href=editcomponents.cgi>Edit existing components.</a><p>\n";
-print "<a href=query.cgi>Go back to the query page.</a>\n";

mozilla/webtools/bugzilla/doeditcomponents.cgi

@@ -1,73 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation. All Rights Reserved.
-# 
-# $Id: doeditcomponents.cgi,v 1.6.2.4 2000-05-31 22:22:14 dkl%redhat.com Exp $
-#
-# Contributor(s): Sam Ziegler <sam@ziegler.org>
-#                 Andrew Anderson <andrew@redhat.com>
-
-use diagnostics;
-use strict;
-use CGI;
-
-$::cgi = new CGI;
-
-require "CGI.pl";
-
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-if (!UserInGroup("editcomponents")) {
-    print "<H1>Sorry, you aren't a member of the 'editcomponents' group.</H1>\n";
-    print "And so, you aren't allowed to edit the owners.\n";
-    exit;
-}
-
-PutHeader("Saving new owners");
-
-SendSQL("select program, value, initialowner from components 
-	 where program = \'" . $::cgi->param('cur_program') . "\' order by program, value");
-
-my @line;
-my @updates;
-my $curIndex = 0;
-my $cgiItem;
-
-while (@line = FetchSQLData()) {
-    my $curItem = "$line[0]_$line[1]";
-    my $cgiItem = $::cgi->param($curItem);
-    if ($cgiItem ne "") {
-        $cgiItem =~ s/\r\n/\n/;
-        if ($cgiItem ne "$line[2]") {
-            print "$line[0]: $line[1] is now owned by $cgiItem.<BR>\n";
-            $updates[$curIndex++] = "update components set initialowner = '$cgiItem' where program = '$line[0]' and value = '$line[1]'";
-        }
-    }
-}
-
-foreach my $update (@updates) {
-    #print $::cgi->pre($update);
-    SendSQL($update);
-}
-
-print "OK, done.<P>\n",
-      $::cgi->a({-href=>"editcomponents.cgi"}, "Edit the owners some more."),
-      $::cgi->br,
-      $::cgi->a({-href=>"query.cgi"}, "Go back to the query page.");

mozilla/webtools/bugzilla/doeditmembers.cgi

@@ -1,78 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation. All Rights Reserved.
-# 
-# Contributor(s): Sam Ziegler <sam@ziegler.org>
-#				  Terry Weissman <terry@mozilla.org>
-#				  David Lawrence <dkl@redhat.com>
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-require "globals.pl";
-
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-if (!UserInGroup("editcomponents")) {
-    print "<H1>Sorry, you aren't a member of the 'editcomponents' group.</H1>\n";
-    print "And so, you aren't allowed to edit member data.\n";
-    exit;
-}
-
-PutHeader("Saving new \nmember data");
-
-foreach my $key (keys(%::FORM)) {
-    $::FORM{url_decode($key)} = $::FORM{$key};
-}
-
-foreach my $i (keys %::FORM) {
-	my $userid = "";
-	my $query = "";
-	if ($i =~ /^login_name/) {
-		$userid = $i;
-		$userid =~ s/^.*-//;
-		$query = "update profiles set login_name = " . SqlQuote($::FORM{$i}) . 
-				 " where userid = $userid";
-		print "Changing login_name for userid $userid to $::FORM{$i}.<BR>\n";
-		SendSQL($query);
-	}
-	if ($i =~ /^realname/) {
-		$userid = $i;
-		$userid  =~ s/^.*-//;
-        $query = "update profiles set realname = " . SqlQuote($::FORM{$i}) . 
-                 " where userid = $userid";
-		print "Changing realname for userid $userid to $::FORM{$i}.<BR>\n";
-        SendSQL($query);
-	}
-	if ($i =~ /^groupset/ ) {
-		$userid = $i;
-		$userid =~ s/^.*-//;
-        $query = "update profiles set groupset = " . SqlQuote($::FORM{$i}) . 
-                 " where userid = $userid";
-		print "Changing groupset for userid $userid to $::FORM{$i}.<BR>\n";
-        SendSQL($query);
-	}
-}
-
-print "OK, done.<p>\n";
-print "<a href=editmembers.cgi>Edit the members some more.</a><p>\n";
-
-PutFooter();

mozilla/webtools/bugzilla/doeditowners.cgi

@@ -1,68 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation. All Rights Reserved.
-# 
-# Contributor(s): Sam Ziegler <sam@ziegler.org>
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-if (!UserInGroup("editcomponents")) {
-    print "<H1>Sorry, you aren't a member of the 'editcomponents' group.</H1>\n";
-    print "And so, you aren't allowed to edit the owners.\n";
-    exit;
-}
-
-
-PutHeader("Saving new owners");
-
-SendSQL("select program, value, initialowner from components order by program, value");
-
-my @line;
-
-foreach my $key (keys(%::FORM)) {
-    $::FORM{url_decode($key)} = $::FORM{$key};
-}
-
-my @updates;
-my $curIndex = 0;
-
-while (@line = FetchSQLData()) {
-    my $curItem = "$line[0]_$line[1]";
-    if (exists $::FORM{$curItem}) {
-        $::FORM{$curItem} =~ s/\r\n/\n/;
-        if ($::FORM{$curItem} ne $line[2]) {
-            print "$line[0] : $line[1] is now owned by $::FORM{$curItem}.<BR>\n";
-            $updates[$curIndex++] = "update components set initialowner = '$::FORM{$curItem}' where program = '$line[0]' and value = '$line[1]'";
-        }
-    }
-}
-
-foreach my $update (@updates) {
-    SendSQL($update);
-}
-
-print "OK, done.<p>\n";
-print "<a href=editowners.cgi>Edit the owners some more.</a><p>\n";
-print "<a href=query.cgi>Go back to the query page.</a>\n";

mozilla/webtools/bugzilla/doeditparams.cgi

@@ -1,83 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-require "defparams.pl";
-
-# Shut up misguided -w warnings about "used only once":
-use vars %::param,
-    %::param_default,
-    @::param_list;
-
-
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-if (!UserInGroup("tweakparams")) {
-    print "<H1>Sorry, you aren't a member of the 'tweakparams' group.</H1>\n";
-    print "And so, you aren't allowed to edit the parameters.\n";
-    PutFooter();
-    exit;
-}
-
-
-PutHeader("Saving new parameters", undef, undef, undef, 1);
-
-foreach my $i (@::param_list) {
-#    print "Processing $i...<BR>\n";
-    if (exists $::FORM{"reset-$i"}) {
-        $::FORM{$i} = $::param_default{$i};
-    }
-    $::FORM{$i} =~ s/\r\n/\n/;     # Get rid of windows-style line endings.
-    if ($::FORM{$i} ne Param($i)) {
-        if (defined $::param_checker{$i}) {
-            my $ref = $::param_checker{$i};
-            my $ok = &$ref($::FORM{$i});
-            if ($ok ne "") {
-                print "New value for $i is invalid: $ok<p>\n";
-                print "Please hit <b>Back</b> and try again.\n";
-                PutFooter();
-                exit;
-            }
-        }
-        print "Changed $i.<br>\n";
-        $::param{$i} = $::FORM{$i}
-    }
-}
-
-
-WriteParams();
-
-unlink "data/versioncache";
-print "<PRE>";
-system("./syncshadowdb -v");
-print "</PRE>";
-
-print "OK, done.<p>\n";
-print "<a href=editparams.cgi>Edit the params some more.</a><p>\n";
-print "<a href=query.cgi>Go back to the query page.</a>\n";
-    
-PutFooter();

mozilla/webtools/bugzilla/doeditvotes.cgi

@@ -1,118 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-# 
-# The Original Code is the Bugzilla Bug Tracking System.
-# 
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are Copyright (C) 1998
-# Netscape Communications Corporation. All Rights Reserved.
-# 
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-ConnectToDatabase();
-GetVersionTable();
-
-my $who = DBNameToIdAndCheck($::COOKIE{'Bugzilla_login'});
-
-if ($who ne $::FORM{'who'}) {
-    PutHeader("Wrong login.");
-    print "The login info got confused.  If you want to adjust the votes\n";
-    print "for <tt>$::COOKIE{'Bugzilla_login'}</tt>, then please\n";
-    print "<a href=showvotes.cgi?user=$who>click here</a>.<hr>\n";
-    navigation_header();
-    exit();
-}
-
-my @buglist = grep {/^\d+$/} keys(%::FORM);
-
-if (0 == @buglist) {
-    PutHeader("Oops?");
-    print "Something got confused.  Please click <b>Back</b> and try again.";
-    navigation_header();
-    exit();
-}
-
-foreach my $id (@buglist) {
-    $::FORM{$id} = trim($::FORM{$id});
-    if ($::FORM{$id} !~ /\d+/ || $::FORM{$id} < 0) {
-        PutHeader("Numbers only, please");
-        print "Only use numeric values for your bug votes.\n";
-        print "Please click <b>Back</b> and try again.<hr>\n";
-        navigation_header();
-        exit();
-    }
-}
-
-SendSQL("select bug_id, product from bugs where bug_id = " .
-        join(" or bug_id = ", @buglist));
-
-my %prodcount;
-
-while (MoreSQLData()) {
-    my ($id, $prod) = (FetchSQLData());
-    if (!defined $prodcount{$prod}) {
-        $prodcount{$prod} = 0;
-    }
-    $prodcount{$prod} += $::FORM{$id};
-}
-
-foreach my $prod (keys(%prodcount)) {
-    if ($prodcount{$prod} > $::prodmaxvotes{$prod}) {
-        PutHeader("Don't overstuff!", "Illegal vote");
-        print "You may only use $::prodmaxvotes{$prod} votes for bugs in the\n";
-        print "<tt>$prod</tt> product, but you are using $prodcount{$prod}.\n";
-        print "Please click <b>Back</b> and try again.<hr>\n";
-        navigation_header();
-        exit();
-    }
-}
-
-my %affected;
-SendSQL("lock tables bugs write, votes write");
-SendSQL("select bug_id from votes where who = $who");
-while (MoreSQLData()) {
-    my $id = FetchOneColumn();
-    $affected{$id} = 1;
-}
-SendSQL("delete from votes where who = $who");
-foreach my $id (@buglist) {
-    if ($::FORM{$id} > 0) {
-        SendSQL("insert into votes (who, bug_id, count) values ($who, $id, $::FORM{$id})");
-    }
-    $affected{$id} = 1;
-}
-foreach my $id (keys %affected) {
-    SendSQL("select sum(count) from votes where bug_id = $id");
-    my $v = FetchOneColumn();
-    SendSQL("update bugs set votes = $v, delta_ts=delta_ts where bug_id = $id");
-}
-SendSQL("unlock tables");
-
-
-
-PutHeader("Voting tabulated", "Voting tabulated", $::COOKIE{'Bugzilla_login'});
-print "Your votes have been recorded.\n";
-print qq{<p><a href="showvotes.cgi?user=$who">Review your votes</a><hr>\n};
-navigation_header();
-exit();
-    
-

mozilla/webtools/bugzilla/editcomponents.cgi

@@ -1,843 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Holger
-# Schurig. Portions created by Holger Schurig are
-# Copyright (C) 1999 Holger Schurig. All
-# Rights Reserved.
-#
-# Contributor(s): Holger Schurig <holgerschurig@nikocity.de>
-#               Terry Weissman <terry@mozilla.org>
-#
-# Direct any questions on this source code to
-#
-# Holger Schurig <holgerschurig@nikocity.de>
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-require "globals.pl";
-
-# Shut up misguided -w warnings about "used only once".  For some reason,
-# "use vars" chokes on me when I try it here.
-
-sub sillyness {
-    my $zz;
-    $zz = $::buffer;
-}
-
-
-my $dobugcounts = (defined $::FORM{'dobugcounts'});
-
-
-
-# TestProduct:    just returns if the specified product does exists
-# CheckProduct:   same check, optionally  emit an error text
-# TestComponent:  just returns if the specified product/component combination exists
-# CheckComponent: same check, optionally emit an error text
-
-sub TestProduct ($)
-{
-    my $prod = shift;
-
-    # does the product exist?
-    SendSQL("SELECT product
-             FROM products
-             WHERE product = " . SqlQuote($prod));
-    return FetchOneColumn();
-}
-
-sub CheckProduct ($)
-{
-    my $prod = shift;
-
-    # do we have a product?
-    unless ($prod) {
-        print "<CENTER>Sorry, you haven't specified a product.</CENTER>\n";
-        PutTrailer();
-        exit;
-    }
-
-    unless (TestProduct $prod) {
-        print "<CENTER>Sorry, product '$prod' does not exist.</CENTER>\n";
-        PutTrailer();
-        exit;
-    }
-}
-
-sub TestComponent ($$)
-{
-    my ($prod,$comp) = @_;
-
-    # does the product exist?
-    SendSQL("SELECT program,value
-             FROM components
-             WHERE program = " . SqlQuote($prod) . " and value = " . SqlQuote($comp));
-    return FetchOneColumn();
-}
-
-sub CheckComponent ($$)
-{
-    my ($prod,$comp) = @_;
-
-    # do we have the component?
-    unless ($comp) {
-        print "<CENTER>Sorry, you haven't specified a component.</CENTER>\n";
-        PutTrailer();
-        exit;
-    }
-
-    CheckProduct($prod);
-
-    unless (TestComponent $prod,$comp) {
-        print "<CENTER>Sorry, component '$comp' for product '$prod' does not exist.</CENTER>\n";
-        PutTrailer();
-        exit;
-    }
-}
-
-
-#
-# Displays the form to edit component parameters
-#
-
-sub EmitFormElements ($$$$$)
-{
-    my ($product, $component, $initialowner, $initialqacontact, $description) = @_;
-
-    print "  <TH ALIGN=\"right\">Component:</TH>\n";
-    print "  <TD><INPUT SIZE=64 MAXLENGTH=255 NAME=\"component\" VALUE=\"" .
-        value_quote($component) . "\">\n";
-    print "      <INPUT TYPE=HIDDEN NAME=\"product\" VALUE=\"" .
-        value_quote($product) . "\"></TD>\n";
-
-    print "</TR><TR>\n";
-    print "  <TH ALIGN=\"right\">Description:</TH>\n";
-    print "  <TD><TEXTAREA ROWS=4 COLS=64 WRAP=VIRTUAL NAME=\"description\">" .
-        value_quote($description) . "</TEXTAREA></TD>\n";
-
-    print "</TR><TR>\n";
-    print "  <TH ALIGN=\"right\">Initial owner:</TH>\n";
-    print "  <TD><INPUT TYPE=TEXT SIZE=64 MAXLENGTH=255 NAME=\"initialowner\" VALUE=\"" .
-        value_quote($initialowner) . "\"></TD>\n";
-
-    if (Param('useqacontact')) {
-        print "</TR><TR>\n";
-        print "  <TH ALIGN=\"right\">Initial QA contact:</TH>\n";
-        print "  <TD><INPUT TYPE=TEXT SIZE=64 MAXLENGTH=255 NAME=\"initialqacontact\" VALUE=\"" .
-            value_quote($initialqacontact) . "\"></TD>\n";
-    }
-}
-
-
-#
-# Displays a text like "a.", "a or b.", "a, b or c.", "a, b, c or d."
-#
-
-sub PutTrailer (@)
-{
-    my (@links) = ("Back to the <A HREF=\"query.cgi\">query page</A>", @_);
-
-    my $count = $#links;
-    my $num = 0;
-    print "<P><CENTER>\n";
-#    if (!$dobugcounts) {
-#        print qq{<a href="editcomponents.cgi?dobugcounts=1&$::buffer">};
-#        print qq{Redisplay table with bug counts (slower)</a><p>\n};
-#    }
-    foreach (@links) {
-        print $_;
-        if ($num == $count) {
-            print ".\n";
-        }
-        elsif ($num == $count-1) {
-            print " or ";
-        }
-        else {
-            print ", ";
-        }
-        $num++;
-    }
-	print "</CENTER>\n";
-    PutFooter();
-}
-
-
-
-
-#
-# Preliminary checks:
-#
-
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-unless (UserInGroup("editcomponents")) {
-    PutHeader("Not allowed");
-    print "<CENTER>Sorry, you aren't a member of the 'editcomponents' group.\n";
-    print "And so, you aren't allowed to add, modify or delete components.</CENTER>\n";
-    PutTrailer();
-    exit;
-}
-
-
-#
-# often used variables
-#
-my $product   = trim($::FORM{product}   || '');
-my $component = trim($::FORM{component} || '');
-my $action    = trim($::FORM{action}    || '');
-my $localtrailer;
-if ($product) {
-    $localtrailer = "<A HREF=\"editcomponents.cgi?product=" . url_quote($product) . "\">edit</A> more components";
-} else {
-    $localtrailer = "<A HREF=\"editcomponents.cgi\">edit</A> more components";
-}
-
-
-
-#
-# product = '' -> Show nice list of products
-#
-
-unless ($product) {
-    PutHeader("Select product");
-
-#    if ($dobugcounts){
-#		if ($::driver eq 'mysql') {	
-#        	SendSQL("SELECT products.product, products.description, COUNT(bug_id)
-#            		FROM products LEFT JOIN bugs
-#               		ON products.product=bugs.product
-#             		GROUP BY products.product
-#             		ORDER BY products.product");
-#		} else {
-#			SendSQL("SELECT products.product, products.description, COUNT(bug_id)
-#                    FROM products, bugs
-#					WHERE products.product = bugs.product (+)
-#                    ORDER BY products.product");
-#		}
-#    } else {
-        SendSQL("SELECT products.product, products.description
-             	FROM products 
-             	ORDER BY products.product");
-#    }
-    print "<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0 ALIGN=center BGCOLOR=\"#ECECEC\">\n";
-	print "<TR BGCOLOR=\"#BFBFBF\">\n";
-    print "  <TH ALIGN=\"left\">Edit components of ...</TH>\n";
-    print "  <TH ALIGN=\"left\">Description</TH>\n";
-    if ($dobugcounts) {
-        print "  <TH ALIGN=\"left\">Bugs</TH>\n";
-    }
-    #print "  <TH ALIGN=\"left\">Edit</TH>\n";
-    print "</TR>";
-    while ( MoreSQLData() ) {
-        my ($product, $description, $bugs) = FetchSQLData();
-        $description ||= "<FONT COLOR=\"red\">missing</FONT>";
-        print "<TR>\n";
-        print "  <TD VALIGN=\"top\"><A HREF=\"editcomponents.cgi?product=", url_quote($product), "\"><B>$product</B></A></TD>\n";
-        print "  <TD VALIGN=\"top\">$description</TD>\n";
-        if ($dobugcounts) {
-            $bugs ||= "none";
-            print "  <TD VALIGN=\"top\">$bugs</TD>\n";
-        }
-        #print "  <TD VALIGN=\"top\"><A HREF=\"editproducts.cgi?action=edit&product=", url_quote($product), "\">Edit</A></TD>\n";
-    }
-    print "</TR></TABLE>\n";
-
-    PutTrailer();
-    exit;
-}
-
-
-
-#
-# action='' -> Show nice list of components
-#
-
-unless ($action) {
-    PutHeader("Select component", "Select component", $product);
-    CheckProduct($product);
-
-    if ($dobugcounts) {
-		if ($::driver eq 'mysql') {
-        	SendSQL("SELECT value, description, initialowner, initialqacontact, COUNT(bug_id)
-            		FROM components LEFT JOIN bugs
-               		ON components.program = bugs.product AND components.value = bugs.component
-             		WHERE components.program = " . SqlQuote($product) . "
-             		GROUP BY components.value");
-		} else {
-			SendSQL("SELECT value, description, initialowner, initialqacontact, COUNT(bug_id)
-                    FROM components, bugs 
-					WHERE components.program = bugs.product (+)
-					AND components.value = bugs.component (+)
-                    AND components.program = " . SqlQuote($product) .
-					" ORDER by bugs.bug_id");
-		}
-    } else {
-        SendSQL("SELECT value, description, initialowner, initialqacontact
-             FROM components 
-             WHERE program = " . SqlQuote($product) . "
-             ORDER BY value");
-    }        
-    print "<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0 ALIGN=center BGCOLOR=\"#ECECEC\">\n";
-	print "<TR BGCOLOR=\"#BFBFBF\">\n";
-    print "  <TH ALIGN=\"left\">Edit component ...</TH>\n";
-    print "  <TH ALIGN=\"left\">Description</TH>\n";
-    print "  <TH ALIGN=\"left\">Initial owner</TH>\n";
-    print "  <TH ALIGN=\"left\">Initial QA contact</TH>\n"
-        if Param('useqacontact');
-    print "  <TH ALIGN=\"left\">Bugs</TH>\n"
-        if $dobugcounts;
-    print "  <TH ALIGN=\"left\">Delete</TH>\n";
-    print "</TR>";
-    while ( MoreSQLData() ) {
-        my ($component,$desc,$initialowner,$initialqacontact, $bugs) = FetchSQLData();
-        $desc             ||= "<FONT COLOR=\"red\">missing</FONT>";
-        $initialowner     ||= "<FONT COLOR=\"red\">missing</FONT>";
-        $initialqacontact ||= "<FONT COLOR=\"red\">none</FONT>";
-        print "<TR>\n";
-        print "  <TD VALIGN=\"top\"><A HREF=\"editcomponents.cgi?product=", url_quote($product), "&component=", url_quote($component), "&action=edit\"><B>$component</B></A></TD>\n";
-        print "  <TD VALIGN=\"top\">$desc</TD>\n";
-        print "  <TD VALIGN=\"top\">$initialowner</TD>\n";
-        print "  <TD VALIGN=\"top\">$initialqacontact</TD>\n"
-                if Param('useqacontact');
-        if ($dobugcounts) {
-            $bugs ||= 'none';
-            print "  <TD VALIGN=\"top\">$bugs</TD>\n";
-        }
-        print "  <TD VALIGN=\"top\"><A HREF=\"editcomponents.cgi?product=", url_quote($product), "&component=", url_quote($component), "&action=del\"><B>Delete</B></A></TD>\n";
-        print "</TR>";
-    }
-    print "<TR>\n";
-    my $span = 4;
-    $span++ if Param('useqacontact');
-    $span++ if $dobugcounts;
-    print "  <TH VALIGN=\"top\" COLSPAN=$span><A HREF=\"editcomponents.cgi?product=", url_quote($product) . "&action=add\">";
-	print "Add a new component</A></TH>\n";
-    print "</TR></TABLE>\n";
-
-    PutTrailer();
-    exit;
-}
-
-
-$dobugcounts = 1;               # Stupid hack to force further PutTrailer()
-                                # calls to not offer a "bug count" option.
-
-
-#
-# action='add' -> present form for parameters for new component
-#
-# (next action will be 'new')
-#
-
-if ($action eq 'add') {
-    PutHeader("Add component", "Add component", $product);
-    CheckProduct($product);
-
-    #print "This page lets you add a new product to bugzilla.\n";
-
-    print "<FORM METHOD=POST ACTION=editcomponents.cgi>\n";
-    print "<TABLE BORDER=0 CELLPADDING=4 CELLSPACING=0 ALIGN=center><TR>\n";
-
-    EmitFormElements($product, '', '', '', '');
-
-    print "</TR></TABLE>\n";
-    print "<CENTER><INPUT TYPE=SUBMIT VALUE=\"Add\"></CENTER>\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"new\">\n";
-    print "</FORM>";
-
-    my $other = $localtrailer;
-    $other =~ s/more/other/;
-    PutTrailer($other);
-    exit;
-}
-
-
-
-#
-# action='new' -> add component entered in the 'action=add' screen
-#
-
-if ($action eq 'new') {
-    PutHeader("Adding new component", "Adding new component", $product);
-    CheckProduct($product);
-
-    # Cleanups and valididy checks
-
-    unless ($component) {
-        print "<CENTER>You must enter a name for the new component. Please press\n";
-        print "<b>Back</b> and try again.</CENTER>\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-    if (TestComponent($product,$component)) {
-        print "<CENTER>The component '$component' already exists. Please press\n";
-        print "<b>Back</b> and try again.</CENTER>\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-
-    my $description = trim($::FORM{description} || '');
-
-    if ($description eq '') {
-        print "<CENTER>You must enter a description for the component '$component'. Please press\n";
-        print "<b>Back</b> and try again.</CENTER>\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-
-    my $initialowner = trim($::FORM{initialowner} || '');
-
-    if ($initialowner eq '') {
-        print "<CENTER>You must enter an initial owner for the component '$component'. Please press\n";
-        print "<b>Back</b> and try again.</CENTER>\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-    #+++
-    #DBNameToIdAndCheck($initialowner, 0);
-
-    my $initialqacontact = trim($::FORM{initialqacontact} || '');
-
-    if (Param('useqacontact')) {
-        if ($initialqacontact eq '') {
-            print "<CENTER>You must enter an initial QA contact for the component '$component'. Please press\n";
-            print "<b>Back</b> and try again.</CENTER>\n";
-            PutTrailer($localtrailer);
-            exit;
-        }
-        #+++
-        #DBNameToIdAndCheck($initialqacontact, 0);
-    }
-
-    # Add the new component
-    SendSQL("INSERT INTO components ( " .
-          "program, value, description, initialowner, initialqacontact " .
-          " ) VALUES ( " .
-          SqlQuote($product) . "," .
-          SqlQuote($component) . "," .
-          SqlQuote($description) . "," .
-          SqlQuote($initialowner) . "," .
-          SqlQuote($initialqacontact) . ")");
-
-    # Make versioncache flush
-    unlink "data/versioncache";
-
-    print "<CENTER>OK, done.</CENTER><p>\n";
-    PutTrailer($localtrailer);
-    exit;
-}
-
-
-
-#
-# action='del' -> ask if user really wants to delete
-#
-# (next action would be 'delete')
-#
-
-if ($action eq 'del') {
-    PutHeader("Delete component", "Delete component", $product);
-    CheckComponent($product, $component);
-
-    # display some data about the component
-	if ($::driver eq 'mysql') {
-    	SendSQL("SELECT products.product, products.description,
-                products.milestoneurl, products.disallownew,
-                components.program, components.value, components.initialowner,
-                components.initialqacontact, components.description
-             	FROM products
-             	LEFT JOIN components on product=program
-             	WHERE product = " . SqlQuote($product) . "
-               	AND   value = " . SqlQuote($component) );
-	} else {
-       SendSQL("SELECT products.product, products.description,
-                products.milestoneurl, products.disallownew,
-                components.program, components.value, components.initialowner,
-                components.initialqacontact, components.description
-                FROM products
-				WHERE products.product = components.program (+)
-                AND product = " . SqlQuote($product) . "
-                AND value = " . SqlQuote($component) );
-	}
-
-    my ($product,$pdesc,$milestoneurl,$disallownew,
-        $dummy,$component,$initialowner,$initialqacontact,$cdesc) = FetchSQLData();
-
-    $pdesc            ||= "<FONT COLOR=\"red\">missing</FONT>";
-    $milestoneurl     ||= "<FONT COLOR=\"red\">missing</FONT>";
-    $disallownew        = $disallownew ? 'closed' : 'open';
-    $initialowner     ||= "<FONT COLOR=\"red\">missing</FONT>";
-    $initialqacontact ||= "<FONT COLOR=\"red\">missing</FONT>";
-    $cdesc            ||= "<FONT COLOR=\"red\">missing</FONT>";
-    
-    print "<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0 ALIGN=center BGCOLOR=\"#ECECEC\">\n";
-	print "<TR BGCOLOR=\"#BFBFBF\">\n";
-    print "  <TH VALIGN=\"top\" ALIGN=\"left\">Part</TH>\n";
-    print "  <TH VALIGN=\"top\" ALIGN=\"left\">Value</TH>\n";
-
-    print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Component:</TD>\n";
-    print "  <TD VALIGN=\"top\">$component</TD>";
-
-    print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Component description:</TD>\n";
-    print "  <TD VALIGN=\"top\">$cdesc</TD>";
-
-    print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Initial owner:</TD>\n";
-    print "  <TD VALIGN=\"top\">$initialowner</TD>";
-
-    if (Param('useqacontact')) {
-        print "</TR><TR>\n";
-        print "  <TD VALIGN=\"top\">Initial QA contact:</TD>\n";
-        print "  <TD VALIGN=\"top\">$initialqacontact</TD>";
-    }
-    SendSQL("SELECT count(bug_id)
-             FROM bugs
-             WHERE product=" . SqlQuote($product) . "
-                AND component=" . SqlQuote($component));
-
-    print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Component of product:</TD>\n";
-    print "  <TD VALIGN=\"top\">$product</TD>\n";
-
-    print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Description:</TD>\n";
-    print "  <TD VALIGN=\"top\">$pdesc</TD>\n";
-
-    if (Param('usetargetmilestone')) {
-         print "</TR><TR>\n";
-         print "  <TD VALIGN=\"top\">Milestone URL:</TD>\n";
-         print "  <TD VALIGN=\"top\"><A HREF=\"$milestoneurl\">$milestoneurl</A></TD>\n";
-    }
-
-    print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Closed for bugs:</TD>\n";
-    print "  <TD VALIGN=\"top\">$disallownew</TD>\n";
-
-    print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Bugs</TD>\n";
-    print "  <TD VALIGN=\"top\">";
-    my $bugs = FetchOneColumn();
-    print $bugs || 'none';
-
-
-    print "</TD>\n</TR></TABLE>";
-
-    print "<CENTER><H2>Confirmation</H2></CENTER>\n";
-
-    if ($bugs) {
-        if (!Param("allowbugdeletion")) {
-            print "<CENTER>Sorry, there are $bugs bugs outstanding for this component. 
-You must reassign those bugs to another component before you can delete this
-one.</CENTER>";
-            PutTrailer($localtrailer);
-            exit;
-        }
-        print "<TABLE BORDER=0 CELLPADDING=20 WIDTH=\"70%\" BGCOLOR=\"red\" ALIGN=center><TR><TD>\n",
-              "There are bugs entered for this component!  When you delete this ",
-              "component, <B><BLINK>all</BLINK></B> stored bugs will be deleted, too. ",
-              "You could not even see the bug history for this component anymore!\n",
-              "</TD></TR></TABLE>\n";
-    }
-
-    print "<P><CENTER>Do you really want to delete this component?</CENTER><P>\n";
-
-    print "<FORM METHOD=POST ACTION=editcomponents.cgi>\n";
-    print "<CENTER><INPUT TYPE=SUBMIT VALUE=\"Yes, delete\"></CENTER>\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"delete\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"product\" VALUE=\"" .
-        value_quote($product) . "\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"component\" VALUE=\"" .
-        value_quote($component) . "\">\n";
-    print "</FORM>";
-
-    PutTrailer($localtrailer);
-    exit;
-}
-
-
-
-#
-# action='delete' -> really delete the component
-#
-
-if ($action eq 'delete') {
-    PutHeader("Deleting component", "Deleting component", $product);
-    CheckComponent($product,$component);
-
-    # lock the tables before we start to change everything:
-	if ($::driver eq 'mysql') {
-    	SendSQL("LOCK TABLES attachments WRITE,
-                         bugs WRITE,
-                         bugs_activity WRITE,
-                         components WRITE,
-                         dependencies WRITE");
-	}
-
-    # According to MySQL doc I cannot do a DELETE x.* FROM x JOIN Y,
-    # so I have to iterate over bugs and delete all the indivial entries
-    # in bugs_activies and attachments.
-
-    if (Param("allowbugdeletion")) {
-        SendSQL("SELECT bug_id
-             	FROM bugs
-             	WHERE product = " . SqlQuote($product) . "
-               	AND component = " . SqlQuote($component));
-        while (MoreSQLData()) {
-            my $bugid = FetchOneColumn();
-
-            my $query =
-                $::db->query("DELETE FROM attachments WHERE bug_id = $bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM bugs_activity WHERE bug_id = $bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM dependencies WHERE blocked = $bugid")
-                or die "$::db_errstr";
-        }
-        print "<CENTER>Attachments, bug activity and dependencies deleted.</CENTER><BR>\n";
-
-
-        # Deleting the rest is easier:
-
-        SendSQL("DELETE FROM bugs
-             WHERE product=" . SqlQuote($product) . "
-               AND component=" . SqlQuote($component));
-        print "<CENTER>Bugs deleted.</CENTER><BR>\n";
-    }
-
-    SendSQL("DELETE FROM components
-             WHERE program=" . SqlQuote($product) . "
-               AND value=" . SqlQuote($component));
-    print "<CENTER>Components deleted.<CENTER><P>\n";
-    SendSQL("UNLOCK TABLES");
-
-    unlink "data/versioncache";
-    PutTrailer($localtrailer);
-    exit;
-}
-
-
-
-#
-# action='edit' -> present the edit component form
-#
-# (next action would be 'update')
-#
-
-if ($action eq 'edit') {
-    PutHeader("Edit component", "Edit component", $product);
-    CheckComponent($product,$component);
-
-    # get data of component
-	if ($::driver eq 'mysql') {
-    	SendSQL("SELECT products.product, products.description,
-                products.milestoneurl, products.disallownew,
-                components.program, components.value, components.initialowner,
-                components.initialqacontact, components.description
-        	    FROM products
-            	LEFT JOIN components on product = program
-             	WHERE products.product = " . SqlQuote($product) . "
-               	AND   components.value = " . SqlQuote($component) );
-	} else {
-       SendSQL("SELECT products.product, products.description,
-                products.milestoneurl, products.disallownew,
-                components.program, components.value, components.initialowner,
-                components.initialqacontact, components.description
-                FROM products, components
-                WHERE components.program (+) = products.product
-                AND products.product = " . SqlQuote($product) . "
-                AND components.value = " . SqlQuote($component) );
-	}
-
-    my ($product,$pdesc,$milestoneurl,$disallownew,
-        $dummy,$component,$initialowner,$initialqacontact,$cdesc) = FetchSQLData();
-
-    print "<FORM METHOD=POST ACTION=editcomponents.cgi>\n";
-    print "<TABLE BORDER=0 CELLPADDING=4 CELLSPACING=0 ALIGN=center><TR>\n";
-
-    #+++ display product/product description
-
-    EmitFormElements($product, $component, $initialowner, $initialqacontact, $cdesc);
-
-    print "</TR><TR>\n";
-    print "  <TH ALIGN=\"right\">Bugs:</TH>\n";
-    print "  <TD>";
-    SendSQL("SELECT count(bug_id)
-             FROM bugs
-             WHERE product = " . SqlQuote($product) .
-            " and component = " . SqlQuote($component));
-    my $bugs = '';
-    $bugs = FetchOneColumn() if MoreSQLData();
-    print $bugs || 'none';
-
-    print "</TD>\n</TR></TABLE>\n";
-
-    print "<INPUT TYPE=HIDDEN NAME=\"componentold\" VALUE=\"" .
-        value_quote($component) . "\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"descriptionold\" VALUE=\"" .
-        value_quote($cdesc) . "\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"initialownerold\" VALUE=\"" .
-        value_quote($initialowner) . "\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"initialqacontactold\" VALUE=\"" .
-        value_quote($initialqacontact) . "\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"update\">\n";
-    print "<CENTER><INPUT TYPE=SUBMIT VALUE=\"Update\"></CENTER>\n";
-
-    print "</FORM>";
-
-    my $other = $localtrailer;
-    $other =~ s/more/other/;
-    PutTrailer($other);
-    exit;
-}
-
-
-
-#
-# action='update' -> update the component
-#
-
-if ($action eq 'update') {
-    PutHeader("Update component", "Update component", $product);
-
-    my $componentold        = trim($::FORM{componentold}        || '');
-    my $description         = trim($::FORM{description}         || '');
-    my $descriptionold      = trim($::FORM{descriptionold}      || '');
-    my $initialowner        = trim($::FORM{initialowner}        || '');
-    my $initialownerold     = trim($::FORM{initialownerold}     || '');
-    my $initialqacontact    = trim($::FORM{initialqacontact}    || '');
-    my $initialqacontactold = trim($::FORM{initialqacontactold} || '');
-
-    CheckComponent($product,$componentold);
-
-    # Note that the order of this tests is important. If you change
-    # them, be sure to test for WHERE='$component' or WHERE='$componentold'
-
-	if ($::driver eq 'mysql') {
-    	SendSQL("LOCK TABLES bugs WRITE,
-         	                components WRITE");
-	}
-
-    if ($description ne $descriptionold) {
-        unless ($description) {
-            print "Sorry, I can't delete the description.";
-            PutTrailer($localtrailer);
-			if ($::driver eq 'mysql') {
-		    	SendSQL("UNLOCK TABLES");
-			}
-            exit;
-        }
-        SendSQL("UPDATE components
-                 SET description=" . SqlQuote($description) . "
-                 WHERE program=" . SqlQuote($product) . "
-                 AND value=" . SqlQuote($componentold));
-        print "<CENTER>Updated description.</CENTER><BR>\n";
-    }
-
-
-    if ($initialowner ne $initialownerold) {
-        unless ($initialowner) {
-            print "<CENTER>Sorry, I can't delete the initial owner.</CENTER>\n";
-            PutTrailer($localtrailer);
-	    	if ($::driver eq 'mysql') {
-				SendSQL("UNLOCK TABLES");
-			}
-            exit;
-        }
-        #+++
-        #DBNameToIdAndCheck($initialowner, 0);
-        SendSQL("UPDATE components
-                 SET initialowner = " . SqlQuote($initialowner) . "
-                 WHERE program = " . SqlQuote($product) . "
-                 AND value = " . SqlQuote($componentold));
-        print "<CENTER>Updated initial owner.</CENTER><BR>\n";
-    }
-
-    if (Param('useqacontact') && $initialqacontact ne $initialqacontactold) {
-        unless ($initialqacontact) {
-            print "<CENTER>Sorry, I can't delete the initial QA contact.</CENTER>\n";
-            PutTrailer($localtrailer);
-			if ($::driver eq 'mysql') {
-	    		SendSQL("UNLOCK TABLES");
-			}
-            exit;
-        }
-        #+++
-        #DBNameToIdAndCheck($initialqacontact, 0);
-        SendSQL("UPDATE components
-                 SET initialqacontact = " . SqlQuote($initialqacontact) . "
-                 WHERE program = " . SqlQuote($product) . "
-                 AND value = " . SqlQuote($componentold));
-        print "<CENTER>Updated initial QA contact.</CENTER><BR>\n";
-    }
-
-
-    if ($component ne $componentold) {
-        unless ($component) {
-            print "<CENTER>Sorry, I can't delete the product name.</CENTER>\n";
-            PutTrailer($localtrailer);
-			if ($::driver eq 'mysql') {
-			    SendSQL("UNLOCK TABLES");
-			}
-            exit;
-        }
-        if (TestComponent($product,$component)) {
-            print "<CENTER>Sorry, component name '$component' is already in use.</CENTER>\n";
-            PutTrailer($localtrailer);
-			if ($::driver eq 'mysql') {
-	    		SendSQL("UNLOCK TABLES");
-			}
-            exit;
-        }
-
-        SendSQL("UPDATE bugs
-                 SET component = " . SqlQuote($component) . "
-                 WHERE component = " . SqlQuote($componentold) . "
-                 AND product = " . SqlQuote($product));
-        SendSQL("UPDATE components
-                 SET value = " . SqlQuote($component) . "
-                 WHERE value = " . SqlQuote($componentold) . "
-                 AND program = " . SqlQuote($product));
-
-        unlink "data/versioncache";
-        print "<CENTER>Updated product name.</CENTER><BR>\n";
-    }
-	if ($::driver eq 'mysql') {
-    	SendSQL("UNLOCK TABLES");
-	}
-
-    PutTrailer($localtrailer);
-    exit;
-}
-
-
-
-#
-# No valid action found
-#
-
-PutHeader("Error");
-print "I don't have a clue what you want.<BR>\n";
-
-foreach ( sort keys %::FORM) {
-    print "$_: $::FORM{$_}<BR>\n";
-}

mozilla/webtools/bugzilla/editgroups.cgi

@@ -1,451 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public License
-# Version 1.0 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-#
-# Direct any questions on this source code to
-#
-# Holger Schurig <holgerschurig@nikocity.de>
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-require "globals.pl";
-
-# TestGroup:  just returns if the specified group does exists
-# CheckGroup: same check, optionally  emit an error text
-
-sub TestGroup {
-    my $group = shift;
-
-    # does the group exist?
-    SendSQL("SELECT name  
-             FROM groups 
-             WHERE name = " . SqlQuote($group));
-    return FetchOneColumn();
-}
-
-sub CheckGroup {
-    my $group = shift;
-
-    # do we have a group?
-    unless ($group) {
-        print "Sorry, you haven't specified a group.";
-        PutTrailer();
-        exit;
-    }
-
-    unless (TestGroup($group)) {
-        print "Sorry, group '$group' does not exist.";
-        PutTrailer();
-        exit;
-    }
-}
-
-
-#
-# Displays the form to edit a groups parameters
-#
-sub EmitFormElements {
-    my ($group, $description, $isbuggroup, $iscontract) = @_;
-	$isbuggroup = $isbuggroup ? " CHECKED " : "";
-	$iscontract = $iscontract ? " CHECKED " : "";
-
-	print qq{
-	<TH ALIGN="right">Group</TH>
-	<TD><INPUT SIZE=64 MAXLENGTH=64 NAME="group" VALUE="$group"></TD>
-<TR><TR>
-	<TH ALIGN="right">Description</TH>
-	<TD><TEXTAREA ROWS=4 COLS=64 WRAP=VIRTUAL NAME="description">$description</TEXTAREA></TD>
-<TR><TR>
-	<TH ALIGN="right">Is Bug Group</TH>
-	<TD><INPUT TYPE=CHECKBOX NAME="isbuggroup" VALUE="1" $isbuggroup></TD>
-</TR><TR>
-	<TH ALIGN=right>Is Contract Group</TH>
-	<TD><INPUT TYPE=CHECKBOX NAME="iscontract" VALUE="1" $iscontract></TD>
-};
-
-}
-
-
-#
-# Displays a text like "a.", "a or b.", "a, b or c.", "a, b, c or d."
-#
-sub PutTrailer {
-    my (@links) = ("Back to the <A HREF=\"query.cgi\">query page</A>", @_);
-
-    my $count = $#links;
-    my $num = 0;
-    print "<P><CENTER>\n";
-    foreach (@links) {
-        print $_;
-        if ($num == $count) {
-            print ".\n";
-        }
-        elsif ($num == $count-1) {
-            print " or ";
-        }
-        else {
-            print ", ";
-        }
-        $num++;
-    }
-	print "</CENTER>\n";
-}
-
-
-#
-# Preliminary checks:
-#
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-unless (UserInGroup("creategroups")) {
-    PutHeader("Not allowed");
-    print "Sorry, you aren't a member of the 'creategroups' group.\n";
-    print "And so, you aren't allowed to add, modify or delete groups.\n";
-    PutTrailer();
-    exit;
-}
-
-
-#
-# often used variables
-#
-my $group = trim($::FORM{'group'} || '');
-my $action  = trim($::FORM{'action'}  || '');
-my $localtrailer = "<A HREF=\"editgroups.cgi\">edit</A> more groups";
-
-
-#
-# action='' -> Show nice list of groups 
-#
-unless ($action) {
-    PutHeader("Select Group");
-
-    SendSQL("SELECT groupid, name, description, isbuggroup, contract
-             FROM groups
-             ORDER BY groupid");
-    print "<P>\n<TABLE ALIGN=center BORDER=1 CELLPADDING=4 CELLSPACING=0><TR BGCOLOR=\"#BFBFBF\">\n";
-    print "  <TH ALIGN=\"left\">Name</TH>\n";
-    print "  <TH ALIGN=\"left\">Description</TH>\n";
-    print "  <TH ALIGN=\"left\">Bug Group</TH>\n";
-	print "  <TH ALIGN=\"left\">Contract Group</TH>\n";
-    print "  <TH ALIGN=\"left\">Action</TH>\n";
-    print "</TR>";
-    while ( MoreSQLData() ) {
-        my ($groupid, $name, $description, $isbuggroup, $iscontract) = FetchSQLData();
-        $description ||= "<FONT COLOR=\"red\">missing</FONT>";
-        $isbuggroup = $isbuggroup ? '<FONT COLOR=green>Yes</FONT>' : '<FONT COLOR=red>No</FONT>';
-		$iscontract = $iscontract ? '<FONT COLOR=green>Yes</FONT>' : '<FONT COLOR=red>No</FONT>';
-
-        print "<TR BGCOLOR=\"#ECECEC\">\n";
-        print "  <TD ALIGN=\"left\"><A HREF=\"editgroups.cgi?action=edit&group=", url_quote($name), "\"><B>$name</B></A></TD>\n";
-        print "  <TD ALIGN=\"left\">$description</TD>\n";
-        print "  <TD ALIGN=\"left\">$isbuggroup</TD>\n";
-		print "  <TD ALIGN=\"left\">$iscontract</TD>\n";
-        print "  <TD ALIGN=\"left\"><A HREF=\"editgroups.cgi?action=del&group=", url_quote($name), "\">Delete</A></TD>\n";
-        print "</TR>";
-    }
-    print "<TR BGCOLOR=\"#ECECEC\">\n";
-    print "  <TH COLSPAN=5><A HREF=\"editgroups.cgi?action=add\">Add a new group</A></TH>\n";
-    print "</TR></TABLE>\n";
-
-    PutTrailer();
-    PutFooter();
-	exit;
-}
-
-
-#
-# action='add' -> present form for parameters for new group 
-#
-# (next action will be 'new')
-#
-if ($action eq 'add') {
-    PutHeader("Add Group");
-
-    #print "This page lets you add a new group to bugzilla.\n";
-
-    print "<FORM METHOD=POST ACTION=editgroups.cgi>\n";
-    print "<TABLE ALIGN=center BORDER=0 CELLPADDING=4 CELLSPACING=0><TR>\n";
-
-    EmitFormElements('', '', '', 0);
-
-    print "</TR>\n</TABLE>\n";
-    print "<CENTER><INPUT TYPE=SUBMIT VALUE=\"Add\"></CENTER>\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"new\">\n";
-    print "</FORM>";
-
-    my $other = $localtrailer;
-    $other =~ s/more/other/;
-    PutTrailer($other);
-	PutFooter();
-    exit;
-}
-
-
-#
-# action='new' -> add group entered in the 'action=add' screen
-#
-if ($action eq 'new') {
-    PutHeader("Adding New Group");
-
-    # Cleanups and valididy checks
-
-    unless ($group) {
-        print "You must enter a name for the new group. Please press\n";
-        print "<b>Back</b> and try again.\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-    if (TestGroup($group)) {
-        print "The group '$group' already exists. Please press\n";
-        print "<b>Back</b> and try again.\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-
-    my $description  = trim($::FORM{'description'}  || '');
-    my $isbuggroup = 0;
-    $isbuggroup = 1 if $::FORM{'isbuggroup'};
-	my $iscontract = 0;
-    $iscontract = 1 if $::FORM{'iscontract'};
-
-    # Add the new group.
-	if ($::driver eq 'mysql') {
-    	SendSQL("INSERT INTO groups ( " .
-          		"name, description, isbuggroup, contract" .
-          		" ) VALUES ( " .
-          		SqlQuote($group) . "," .
-          		SqlQuote($description) . "," .
-          		SqlQuote($isbuggroup) . ", " . 
-				SqlQuote($iscontract) . ")");
-	} else {
-		SendSQL("INSERT INTO groups ( " .
-          		"groupid, name, description, isbuggroup, contract" .
-          		" ) VALUES ( groups_seq.nextval, " .
-          		SqlQuote($group) . "," .
-          		SqlQuote($description) . "," .
-          		SqlQuote($isbuggroup) . ", " .
-				SqlQuote($iscontract) . ")");
-	}
-
-    print "OK, done.<p>\n";
-    PutTrailer($localtrailer);
-    exit;
-}
-
-
-#
-# action='del' -> ask if user really wants to delete
-#
-# (next action would be 'delete')
-#
-if ($action eq 'del') {
-    PutHeader("Delete Group");
-    CheckGroup($group);
-
-    # display some data about the group
-    SendSQL("SELECT groupid, name, description, isbuggroup, contract
-             FROM groups 
-             WHERE name = " . SqlQuote($group));
-    my ($groupid, $name, $description, $isbuggroup, $iscontract) = FetchSQLData();
-    $description ||= "<FONT COLOR=\"red\">description missing</FONT>";
-    $isbuggroup = $isbuggroup ? '<FONT COLOR=green>Yes</FONT>' : '<FONT COLOR=red>No</FONT>';
-	$iscontract = $iscontract ? '<FONT COLOR=green>Yes</FONT>' : '<FONT COLOR=red>No</FONT>';
-   
-	# Find out how many people are in this group
-	SendSQL("select count(userid) from user_group where groupid = $groupid");
-    my $members = FetchOneColumn();
-	$members = $members ? $members : 0;
-	 
-    print "<P>\n<TABLE ALIGN=center BORDER=1 CELLPADDING=4 CELLSPACING=0 BGCOLOR=\"#ECECEC\">\n";
-    print "<TR BGCOLOR=\"#BFBFBF\">\n";
-    print "  <TH VALIGN=\"top\" ALIGN=\"left\">Part</TH>\n";
-    print "  <TH VALIGN=\"top\" ALIGN=\"left\">Value</TH>\n";
-    print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Group</TD>\n";
-    print "  <TD VALIGN=\"top\">$name</TD>\n";
-    print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Description</TD>\n";
-    print "  <TD VALIGN=\"top\">$description</TD>\n";
-    print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Is Bug Group</TD>\n";
-    print "  <TD VALIGN=\"top\">$isbuggroup</TD>\n";
-	print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Is Contract Group</TD>\n";
-    print "  <TD VALIGN=\"top\">$iscontract</TD>\n";
-    print "</TR><TR>\n";
-    print "  <TD VALIGN=\"top\">Members</TD>\n";
-    print "  <TD VALIGN=\"top\">$members</TD>\n";
-    print "</TD>\n</TR></TABLE>";
-	
-	print "<P>\n<CENTER><B>Current members will be removed from the group.</B>\n";
-
-    print "<H2>Confirmation</H2>\n";
-    print "<P>Do you really want to delete this group?<P>\n";
-    print "<FORM METHOD=POST ACTION=editgroups.cgi>\n";
-    print "<INPUT TYPE=SUBMIT VALUE=\"Yes, delete\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"delete\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"group\" VALUE=\"$group\">\n";
-    print "</FORM>\n</CENTER>\n";
-
-    PutTrailer($localtrailer);
-	PutFooter();
-    exit;
-}
-
-
-#
-# action='delete' -> really delete the group
-#
-if ($action eq 'delete') {
-    PutHeader("Deleting Group");
-    CheckGroup($group);
-
-	SendSQL("select groupid from groups where name = " . SqlQuote($group));
-	my $groupid = FetchOneColumn();
-
-    SendSQL("DELETE FROM groups 
-             WHERE name = " . SqlQuote($group));
-    print "Group deleted.<BR>\n";
-
-	SendSQL("delete from user_group where groupid = $groupid");
-	print "Members removed.<BR>\n";
-
-    PutTrailer($localtrailer);
-    PutFooter();
-	exit;
-}
-
-
-
-#
-# action='edit' -> present the edit group 
-#
-# (next action would be 'update')
-#
-if ($action eq 'edit') {
-    PutHeader("Edit Group");
-    CheckGroup($group);
-
-    # get data of group 
-    SendSQL("SELECT groupid, name, description, isbuggroup, contract
-             FROM groups 
-             WHERE name = " . SqlQuote($group));
-    my ($groupid, $name, $description, $isbuggroup, $iscontract) = FetchSQLData();
-
-    print "<FORM METHOD=POST ACTION=editgroups.cgi>\n";
-    print "<TABLE ALIGN=center BORDER=0 CELLPADDING=4 CELLSPACING=0><TR>\n";
-
-    EmitFormElements($group, $description, $isbuggroup, $iscontract);
-    
-    print "</TR>\n";
-    print "</TABLE>\n";
-
-    print "<INPUT TYPE=HIDDEN NAME=\"nameold\" VALUE=\"$group\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"descriptionold\" VALUE=\"$description\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"isbuggroupold\" VALUE=\"$isbuggroup\">\n";
-	print "<INPUT TYPE=HIDDEN NAME=\"iscontractold\" VALUE=\"$iscontract\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"update\">\n";
-    print "<CENTER><INPUT TYPE=SUBMIT VALUE=\"Update\"></CENTER>\n";
-
-    print "</FORM>";
-
-    my $x = $localtrailer;
-    $x =~ s/more/other/;
-    PutTrailer($x);
-	PutFooter();
-    exit;
-}
-
-
-#
-# action='update' -> update the group 
-#
-if ($action eq 'update') {
-    PutHeader("Update Group");
-
-    my $nameold 		= trim($::FORM{'nameold'}      		|| '');
-    my $description     = trim($::FORM{'description'}     	|| '');
-    my $descriptionold  = trim($::FORM{'descriptionold'}  	|| '');
-    my $isbuggroup 		= trim($::FORM{'isbuggroup'}     	|| '');
-    my $isbuggroupold	= trim($::FORM{'isbuggroupold'}  	|| '');
-	my $iscontract		= trim($::FORM{'iscontract'}        || '');
-    my $iscontractold	= trim($::FORM{'iscontractold'}     || '');
-
-    CheckGroup($nameold);
-
-    if ($isbuggroup != $isbuggroupold) {
-        $isbuggroup ||= 0;
-        SendSQL("UPDATE groups 
-                 SET isbuggroup = $isbuggroup
-                 WHERE name = " . SqlQuote($nameold));
-        print "Updated bug group status.<BR>\n";
-    }
-
-	if ($iscontract != $iscontractold) {
-        $iscontract ||= 0;
-        SendSQL("UPDATE groups 
-                 SET contract = $iscontract
-                 WHERE name = " . SqlQuote($nameold));
-        print "Updated contract group status.<BR>\n";
-    }
-
-    if ($description ne $descriptionold) {
-        unless ($description) {
-            print "Sorry, I can't delete the description.";
-            PutTrailer($localtrailer);
-            exit;
-        }
-        SendSQL("UPDATE groups 
-                 SET description=" . SqlQuote($description) . "
-                 WHERE name =" . SqlQuote($nameold));
-        print "Updated description.<BR>\n";
-    }
-
-    if ($group ne $nameold) {
-        unless ($group) {
-            print "Sorry, I can't delete the group name.";
-            PutTrailer($localtrailer);
-            exit;
-        }
-        if (TestGroup($group)) {
-            print "Sorry, group name '$group' is already in use.";
-            PutTrailer($localtrailer);
-            exit;
-        }
-
-        SendSQL("UPDATE groups 
-                 SET name = " . SqlQuote($group) . "
-                 WHERE name = " . SqlQuote($nameold));
-        print "Updated group name.<BR>\n";
-    }
-
-    PutTrailer($localtrailer);
-    exit;
-}
-
-
-
-#
-# No valid action found
-#
-PutHeader("Error");
-print "I don't have a clue what you want.<BR>\n";
-
-foreach ( sort keys %::FORM) {
-    print "$_: $::FORM{$_}<BR>\n";
-}

mozilla/webtools/bugzilla/editkeywords.cgi

@@ -1,409 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Terry Weissman.
-# Portions created by Terry Weissman are
-# Copyright (C) 2000 Terry Weissman. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-
-my $localtrailer = "<A HREF=\"editkeywords.cgi\">edit</A> more keywords";
-
-
-#
-# Displays a text like "a.", "a or b.", "a, b or c.", "a, b, c or d."
-#
-
-sub PutTrailer (@)
-{
-    my (@links) = ("Back to the <A HREF=\"query.cgi\">query page</A>", @_);
-
-    my $count = $#links;
-    my $num = 0;
-    print "<P><CENTER>\n";
-    foreach (@links) {
-        print $_;
-        if ($num == $count) {
-            print ".\n";
-        }
-        elsif ($num == $count-1) {
-            print " or ";
-        }
-        else {
-            print ", ";
-        }
-        $num++;
-    }
-	print "</CENTER>\n";
-    PutFooter();
-}
-
-
-#
-# Displays the form to edit a keyword's parameters
-#
-
-sub EmitFormElements ($$$)
-{
-    my ($id, $name, $description) = @_;
-
-    $name = value_quote($name);
-    $description = value_quote($description);
-
-    print qq{<INPUT TYPE="HIDDEN" NAME=id VALUE=$id>};
-
-    print "  <TR><TH ALIGN=\"right\">Name:</TH>\n";
-    print "  <TD><INPUT SIZE=64 MAXLENGTH=64 NAME=\"name\" VALUE=\"$name\"></TD>\n";
-    print "</TR><TR>\n";
-
-    print "  <TH ALIGN=\"right\">Description:</TH>\n";
-    print "  <TD><TEXTAREA ROWS=4 COLS=64 WRAP=VIRTUAL NAME=\"description\">$description</TEXTAREA></TD>\n";
-    print "</TR>\n";
-
-}
-
-
-sub Validate ($$) {
-    my ($name, $description) = @_;
-    if ($name eq "") {
-        print "You must enter a non-blank name for the keyword. Please press\n";
-        print "<b>Back</b> and try again.\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-    if ($name =~ /[\s,]/) {
-        print "You may not use commas or whitespace in a keyword name.\n";
-        print "Please press <b>Back</b> and try again.\n";
-        PutTrailer($localtrailer);
-        exit;
-    }    
-    if ($description eq "") {
-        print "You must enter a non-blank description of the keyword.\n";
-        print "Please press <b>Back</b> and try again.\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-}
-
-
-#
-# Preliminary checks:
-#
-
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-unless (UserInGroup("editkeywords")) {
-    PutHeader("Not allowed");
-    print "Sorry, you aren't a member of the 'editkeywords' group.\n";
-    print "And so, you aren't allowed to add, modify or delete keywords.\n";
-    PutTrailer();
-    exit;
-}
-
-
-my $action  = trim($::FORM{action}  || '');
-
-
-if ($action eq "") {
-    PutHeader("Select keyword");
-    my $tableheader = qq{
-<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0 ALIGN=center>
-<TR BGCOLOR="#BFBFBF">
-<TH ALIGN="left">Edit keyword ...</TH>
-<TH ALIGN="left">Description</TH>
-<TH ALIGN="left">Bugs</TH>
-<TH ALIGN="left">Action</TH>
-</TR>
-};
-    print $tableheader;
-    my $line_count = 0;
-    my $max_table_size = 50;
-
-	if ($::driver eq 'mysql') {
-	    SendSQL("SELECT keyworddefs.id, keyworddefs.name, keyworddefs.description,
-                COUNT(keywords.bug_id), keywords.bug_id
-             	FROM keyworddefs LEFT JOIN keywords ON keyworddefs.id = keywords.keywordid
-             	GROUP BY keyworddefs.id
-             	ORDER BY keyworddefs.name");
-	} else {
-		SendSQL("SELECT keyworddefs.id, keyworddefs.name, keyworddefs.description,
-				COUNT(keywords.keywordid), keywords.bug_id
-                FROM keyworddefs, keywords
-                WHERE keyworddefs.id = keywords.keywordid (+)
-				GROUP BY keyworddefs.id, keyworddefs.name, 
-						 keyworddefs.description, keywords.bug_id
-                ORDER BY keyworddefs.name");
-	}
-
-    while (MoreSQLData()) {
-        my ($id, $name, $description, $bugs, $onebug) = FetchSQLData();
-        $description ||= "<FONT COLOR=\"red\">missing</FONT>";
-        $bugs ||= 'none';
-        if (!$onebug) {
-            # This is silly hackery for old versions of MySQL that seem to
-            # return a count() of 1 even if there are no matching.  So, we 
-            # ask for an actual bug number.  If it can't find any bugs that
-            # match the keyword, then we set the count to be zero, ignoring
-            # what it had responded.
-            $bugs = 'none';
-        }
-        if ($line_count == $max_table_size) {
-            print "</table>\n$tableheader";
-            $line_count = 0;
-        }
-        $line_count++;
-            
-        print qq{
-<TR BGCOLOR="#ECECEC">
-<TH ALIGN="left"><A HREF="editkeywords.cgi?action=edit&id=$id">$name</TH>
-<TD ALIGN="left">$description</TD>
-<TD ALIGN="left" ALIGN="right">$bugs</TD>
-<TH ALIGN="left"><A HREF="editkeywords.cgi?action=delete&id=$id">Delete</TH>
-</TR>
-};
-    }
-    print qq{
-<TR BGCOLOR="#ECECEC">
-<TH VALIGN="top" COLSPAN=4><A HREF="editkeywords.cgi?action=add">Add a new keyword</A></TH>
-</TR>
-</TABLE>
-};
-    PutTrailer();
-    exit;
-}
-    
-
-if ($action eq 'add') {
-    PutHeader("Add keyword");
-    print "<FORM METHOD=POST ACTION=editkeywords.cgi>\n";
-    print "<TABLE BORDER=0 CELLPADDING=4 CELLSPACING=0 ALIGN=center>\n";
-
-    EmitFormElements(-1, '', '');
-
-    print "</TABLE>\n<HR ALIGN=center WIDTH=800>\n";
-    print "<CENTER><INPUT TYPE=SUBMIT VALUE=\"Add\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"new\"></CENTER>\n";
-    print "</FORM>";
-
-    my $other = $localtrailer;
-    $other =~ s/more/other/;
-    PutTrailer($other);
-    exit;
-}
-
-#
-# action='new' -> add keyword entered in the 'action=add' screen
-#
-
-if ($action eq 'new') {
-    PutHeader("Adding new keyword");
-
-    # Cleanups and valididy checks
-
-    my $name = trim($::FORM{name} || '');
-    my $description  = trim($::FORM{description}  || '');
-
-    Validate($name, $description);
-    
-    SendSQL("SELECT id FROM keyworddefs WHERE name = " . SqlQuote($name));
-
-    if (FetchOneColumn()) {
-        print "<CENTER>The keyword '$name' already exists. Please press\n";
-        print "<b>Back</b> and try again.</CENTER>\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-
-
-    # Pick an unused number.  Be sure to recycle numbers that may have been
-    # deleted in the past.  This code is potentially slow, but it happens
-    # rarely enough, and there really aren't ever going to be that many
-    # keywords anyway.
-
-    SendSQL("SELECT id FROM keyworddefs ORDER BY id");
-
-    my $newid = 1;
-
-    while (MoreSQLData()) {
-        my $oldid = FetchOneColumn();
-        if ($oldid > $newid) {
-            last;
-        }
-        $newid = $oldid + 1;
-    }
-
-    # Add the new keyword.
-    SendSQL("INSERT INTO keyworddefs (id, name, description) VALUES ($newid, " .
-            SqlQuote($name) . "," .
-            SqlQuote($description) . ")");
-
-    # Make versioncache flush
-    unlink "data/versioncache";
-
-    print "<CENTER>OK, done.</CENTER><p>\n";
-    PutTrailer($localtrailer);
-    exit;
-}
-
-    
-
-#
-# action='edit' -> present the edit keywords from
-#
-# (next action would be 'update')
-#
-
-if ($action eq 'edit') {
-    PutHeader("Edit keyword");
-
-    my $id  = trim($::FORM{id} || 0);
-    # get data of keyword
-    SendSQL("SELECT name,description
-             FROM keyworddefs
-             WHERE id=$id");
-    my ($name, $description) = FetchSQLData();
-    if (!$name) {
-        print "<CENTER>Something screwy is going on.  Please try again.</CENTER>\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-    print "<FORM METHOD=POST ACTION=editkeywords.cgi>\n";
-    print "<TABLE  BORDER=0 CELLPADDING=4 CELLSPACING=0 ALIGN=center>\n";
-
-    EmitFormElements($id, $name, $description);
-    
-    print "<TR>\n";
-    print "  <TH ALIGN=\"right\">Bugs:</TH>\n";
-    print "  <TD>";
-    SendSQL("SELECT count(*)
-             FROM keywords
-             WHERE keywordid = $id");
-    my $bugs = '';
-    $bugs = FetchOneColumn() if MoreSQLData();
-    print $bugs || 'none';
-
-    print "</TD>\n</TR></TABLE>\n";
-
-    print "<CENTER><INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"update\">\n";
-    print "<INPUT TYPE=SUBMIT VALUE=\"Update\"></CENTER>\n";
-
-    print "</FORM>";
-
-    my $x = $localtrailer;
-    $x =~ s/more/other/;
-    PutTrailer($x);
-    exit;
-}
-
-
-#
-# action='update' -> update the keyword
-#
-
-if ($action eq 'update') {
-    PutHeader("Update keyword");
-
-    my $id = $::FORM{id};
-    my $name  = trim($::FORM{name} || '');
-    my $description  = trim($::FORM{description}  || '');
-
-    Validate($name, $description);
-
-    SendSQL("SELECT id FROM keyworddefs WHERE name = " . SqlQuote($name));
-
-    my $tmp = FetchOneColumn();
-
-    if ($tmp && $tmp != $id) {
-        print "The keyword '$name' already exists. Please press\n";
-        print "<b>Back</b> and try again.\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-
-    SendSQL("UPDATE keyworddefs SET name = " . SqlQuote($name) .
-            ", description = " . SqlQuote($description) .
-            " WHERE id = $id");
-
-    print "<CENTER>Keyword updated.</CENTER><BR>\n";
-
-    # Make versioncache flush
-    unlink "data/versioncache";
-
-    PutTrailer($localtrailer);
-    exit;
-}
-
-
-if ($action eq 'delete') {
-    PutHeader("Delete keyword");
-    my $id = $::FORM{id};
-
-    SendSQL("SELECT name FROM keyworddefs WHERE id=$id");
-    my $name = FetchOneColumn();
-
-    if (!$::FORM{reallydelete}) {
-
-        SendSQL("SELECT count(*)
-                 FROM keywords
-                 WHERE keywordid = $id");
-        
-        my $bugs = FetchOneColumn();
-        
-        if ($bugs) {
-            
-            
-            print qq{
-<CENTER>There are $bugs bugs which have this keyword set.  Are you <b>sure</b> you want
-to delete the <code>$name</code> keyword?
-
-<FORM METHOD=POST ACTION=editkeywords.cgi>
-<INPUT TYPE=HIDDEN NAME="id" VALUE="$id">
-<INPUT TYPE=HIDDEN NAME="action" VALUE="delete">
-<INPUT TYPE=HIDDEN NAME="reallydelete" VALUE="1">
-<INPUT TYPE=SUBMIT VALUE="Yes, really delete the keyword">
-</FORM></CENTER>
-};
-
-            PutTrailer($localtrailer);
-            exit;
-        }
-    }
-
-    SendSQL("DELETE FROM keywords WHERE keywordid = $id");
-    SendSQL("DELETE FROM keyworddefs WHERE id = $id");
-
-    print "<CENTER>Keyword $name deleted.</CENTER>\n";
-
-    # Make versioncache flush
-    unlink "data/versioncache";
-
-    PutTrailer($localtrailer);
-    exit;
-}
-
-PutHeader("Error");
-print "<CENTER>I don't have a clue what you want.</CENTER><BR>\n";
-
-foreach ( sort keys %::FORM) {
-    print "$_: $::FORM{$_}<BR>\n";
-}

mozilla/webtools/bugzilla/editmembers.cgi

@@ -1,437 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Terry Weissman <terry@mozilla.org>
-#                 David Lawrence <dkl@redhat.com>
-#    
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-require "globals.pl";
-
-# print "Content-type: text/html\n\n";
- 
-# subroutine: 	PutGroupForm
-# description: 	prints form for multiple choices
-# params: 		none
-# returns 		none
-
-sub PutGroupForm {
-	my $query = "select groupid, description from groups order by groupid";
-	SendSQL($query);
-    my %grouplist;
-    while (my @row = FetchSQLData()) {
-        $grouplist{$row[0]} = $row[1];
-    }
-
-	print qq{
-<P>
-<B>1. Select members above that you want effected.<BR>	
-2. Check which groups below you wish the members to be in.<BR>
-3. Click Update to commit the changes.</B><BR>
-<P>
-<TABLE ALIGN=center BORDER=1 CELLSPACING=0>
-<TR>
-	<TD ALIGN=center><INPUT TYPE=radio NAME=group_type VALUE=add CHECKED>Add to checked groups</TD>
-	<TD ALIGN=center><INPUT TYPE=radio NAME=group_type VALUE=remove>Remove from checked groups</TD>
-</TR>
-</TABLE>
-<P>
-};	
-	my $count = 0;
-	foreach my $i (keys %grouplist) {
-    	print qq{<INPUT TYPE=checkbox NAME=group-$i>&nbsp;$grouplist{$i}<br>};
-	}
-
-#    print "
-#<SCRIPT>
-#numelements = document.changeform.elements.length;
-#function SetCheckboxes(value) {
-#    for (var i=0 ; i<numelements ; i++) {
-#        item = document.changeform.elements\[i\];
-#        item.checked = value;
-#    }
-#}
-
-#document.write(\" <input type=button value=\\\"Uncheck All\\\" onclick=\\\"SetCheckboxes(false);\\\"> <input type=button value=\\\"Check All\\\" onclick=\\\"SetCheckboxes(true);\\\">\");
-#</SCRIPT>\n";
-
-	print qq{
-<P>
-<HR>
-<INPUT TYPE=hidden NAME=multiple VALUE=1>
-<CENTER><INPUT TYPE=submit NAME=update VALUE=" Update! "></CENTER>
-</FORM>
-};
-
-}
-
-
-# subroutine: 	UpdateGroups 
-# description: 	updates member(s) group permissions
-# params: 		none
-# returns: 		none
-
-sub UpdateGroups {
-	if (defined($::FORM{'multiple'}) && $::FORM{'multiple'} eq '1') {
-		foreach my $user (grep(/^user-.*$/, keys %::FORM)) {
-			$user =~ s/^user-//g;
-			foreach my $i (grep (/^group-.*$/, keys %::FORM)) {
-				$i =~ s/^group-//g;
-				SendSQL("select userid from user_group where userid = $user and groupid = $i");
-				my $result = FetchOneColumn();
-				if (!$result && $::FORM{'group_type'} eq 'add') {
-            		SendSQL("insert into user_group values ($user, $i)");
-				} elsif ($result && $::FORM{'group_type'} eq 'remove') {
-					SendSQL("delete from user_group where userid = $user and groupid = $i");
-				} 
-        	}
-		}
-	} else {
-		SendSQL("delete from user_group where userid = " . $::FORM{'userid'});
-		foreach my $i (grep (/^group-.*$/, keys %::FORM)) {
-			$i =~ s/^group-//g;
-			SendSQL("insert into user_group values (" .
-			$::FORM{'userid'} . ", $i)");
-		}
-	}
-	return 1;
-}
-
-
-# subroutine: 	SortPopup
-# description: 	generate popup for sorting results list by group
-# params:		none
-# returns:		$popup = string containing html to generate group sort popup (scalar)
-
-sub SortPopup {
-	my $popup = "";
-	my $query = "select groupid, name from groups order by groupid";
-	SendSQL($query);
-	my %groups;
-	while (my @row = FetchSQLData()) {
-		$groups{$row[1]} = $row[0];
-	}
-
-	$popup .= qq{
-<FORM METHOD=get ACTION=editmembers.cgi>
-<B>Sort by group</B>
-<SELECT NAME=sort>
-<OPTION VALUE="all">All
-};
-
-	my @sorted_ids = sort keys %groups;
-	foreach my $group (@sorted_ids) {
-		my $selected = $::FORM{'sort'} eq $groups{$group} ? " SELECTED" : "";
-		$popup .= "<OPTION VALUE=\"$groups{$group}\" $selected>$group";
-	}
-
-	$popup .= qq{
-</SELECT>
-<INPUT TYPE=submit NAME= do_sort VALUE="Sort">
-<INPUT TYPE=hidden NAME=login_name VALUE="$::FORM{'login_name'}">
-<INPUT TYPE=hidden NAME=real_name VALUE="$::FORM{'real_name'}">
-<INPUT TYPE=hidden NAME=multiple VALUE="$::FORM{'multiple'}">
-</FORM>
-};
-	return $popup;
-}
-
-
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-if (!UserInGroup("editgroupmembers")) {
-	PutHeader("Not Allowed");
-    PutError("Sorry, you aren't a member of the 'editgroupmembers' group.<BR>" .
-    		 "And so, you aren't allowed to edit the members.");
-}
-
-PutHeader("Edit Members");
-
-if ($::FORM{'submit'} || $::FORM{'sort'}) {
-	my $sort_popup = SortPopup();
-	print "<CENTER><H2>Results for search on ";
-	if ($::FORM{'login_name'}) {
-		print "$::FORM{'login_name'} ";
-	}
-	if ($::FORM{'login_name'} && $::FORM{'realname'}) {
-		print " and ";
-	}
-	if ($::FORM{'realname'}) {
-		print "$::FORM{'realname'} ";
-	}
-	print "</H2></CENTER>\n"; 
-
-	# User didnt enter anything 
-	if (!$::FORM{'login_name'} && !$::FORM{'realname'}) {
-        PutError("<P>Illegal values - Back up and try again.");
-    }
-
-	# Form the Query
-	my $query = "";
-	if (defined($::FORM{'sort'}) && $::FORM{'sort'} ne 'all' && $::FORM{'sort'} ne '') {
-		$query = "select profiles.userid, profiles.login_name, profiles.realname " .
-					"from profiles, user_group " . 
-					"where user_group.userid = profiles.userid and " .
-					"user_group.groupid = $::FORM{'sort'} and ";
-	} else {
-		$query = "select profiles.userid, profiles.login_name, profiles.realname " .
-                    "from profiles where ";
-	}
-
-	if ($::FORM{'login_name'}) {
-		$query .= " profiles.login_name like \'%$::FORM{'login_name'}%\'";
-	}
-	if ($::FORM{'login_name'} && $::FORM{'realname'}) {
-		$query .= " or ";
-	}
-	if ($::FORM{'realname'}) {
-		$query .= " profiles.realname like \'%$::FORM{'realname'}%\'";
-	}
-	$query .= " order by profiles.userid";
-	SendSQL($query);
-	my @row = ();
-
-	# Print the results
- 	print qq{
-<CENTER>$sort_popup</CENTER>
-<FORM NAME=changeform METHOD=get ACTION=editmembers.cgi>
-<TABLE BORDER=1 CELLSPACING=0 CELLPADDING=4 ALIGN=center>
-<TR BGCOLOR="#BFBFBF">
-};
-
-	if ($::FORM{'multiple'}) {
-		print "<TH ALIGN=left>Select</TH>\n";
-	}
-
-	print qq{
-	<TH ALIGN=left>User ID</TH>
-	<TH ALIGN=left>Email Address</TH>
-	<TH ALIGN=left>Real Name</TH>
-</TR>
-};
-	my $count = 0;
-	while (@row = FetchSQLData()) {
-		print qq{
-<TR BGCOLOR="#ECECEC">
-};
-
-		if ($::FORM{'multiple'}) {
-			print "<TD ALIGN=center><INPUT TYPE=checkbox NAME=\"user-$row[0]\"></TD>\n";
-		}
-
-		print qq{
-	<TD ALIGN=center><A HREF="editmembers.cgi?\&userid=$row[0]">$row[0]</A>&nbsp;</TD>
-	<TD ALIGN=left>$row[1]</TD>
-};
-		# For some reason netscape was choking when this value was NULL
-		if (!$row[2]) {
-			$row[2] = "&nbsp;";
-		}
-		print qq{    
-	<TD ALIGN=left>$row[2]</TD>
-</TR>
-};
-
-	}
-
-	print qq{</TABLE>\n};
-
-	if ($::FORM{'multiple'}) {
-		print "<P><TABLE ALIGN=center>\n<TR>\n<TD ALIGN=left>\n";
-		PutGroupForm();
-		print "</TD>\n</TR>\n</TABLE>\n";
-	}
-	
-	print qq{
-<P>
-<CENTER>
-<A HREF="editmembers.cgi?submit=1&login_name=$::FORM{'login_name'}&realname=$::FORM{'realname'}&multiple=1&sort=$::FORM{'sort'}">
-[Edit multiple members at once]</A> &nbsp;
-<A HREF="editmembers.cgi">[Find another member]</A>
-</CENTER>
-};
-	
-	PutFooter();
-	exit;
-}
-
-# single member selected so display information for changing
-if ($::FORM{'userid'}) {
-	# we made changes to a single member
-	if ($::FORM{'update'}) {
-		if ($::FORM{'password'} ne "" && $::FORM{'retype'} ne "") {
-			if ($::FORM{'password'} ne $::FORM{'retype'}) {
-				print qq{
-<FONT SIZE=+1 COLOR=red>Sorry.</FONT><B>The passwords you entered were not the same.
-Please click BACK and correct the error.</B>
-};				
-				exit;
-			}
-			my $password = $::FORM{'password'};
-			my $encrypted = crypt($password, substr($password, 0, 2));
-			SendSQL("update profiles set password = " . SqlQuote($password) .
-					", cryptpassword = " . SqlQuote($encrypted) . 
-					" where login_name = " . SqlQuote($::FORM{'login_name'}));
-			MailPassword($::FORM{'login_name'}, $password, 1);	
-			print "<CENTER><B>Password changed and member notified.</B></CENTER><BR>\n";
-		}
-
-		SendSQL("update profiles set login_name = " . SqlQuote($::FORM{'login_name'}) .
-				" where userid = " . $::FORM{'userid'});
-		print "<CENTER><B>Login name updated.</B></CENTER><BR>\n";
-
-		SendSQL("update profiles set realname = " . SqlQuote($::FORM{'realname'}) .
-                " where userid = " . $::FORM{'userid'});
-		print "<CENTER><B>Real name updated.</B></CENTER><BR>\n";
-
-		if (UpdateGroups()) {
-			print "<CENTER><B>Group membership updated.</B></CENTER><P>\n";
-		}
-	}
-	
-	SendSQL("select login_name, realname from profiles where userid = " . $::FORM{'userid'});
-	my @user_info = FetchSQLData();	
-
-	SendSQL("select groupid, description from groups order by groupid");
-	my %grouplist;
-	my @row;
-	while (@row = FetchSQLData()) {
-		$grouplist{$row[0]} = $row[1];
-	}
-
-	SendSQL("select groupid from user_group where userid = " . $::FORM{'userid'});
-	my @groupbelong;
-	while (@row = FetchSQLData()) {
-		push (@groupbelong, $row[0]);
-	}
-	
-	print qq{
-<CENTER><H1>Information for <FONT COLOR=blue>$user_info[0]</FONT></H1></CENTER>
-<P>	
-<FORM NAME=changeform METHOD=post ACTION=editmembers.cgi>
-<TABLE ALIGN=center CELLSPACING=0 CELLPADDING=4>
-<TR>
-	<TD ALIGN=right><B>User ID#: </B></TD>
-	<TD ALIGN=left><B><FONT COLOR=blue>$::FORM{'userid'}</FONT></B></TD>
-</TR><TR>
-	<TD ALIGN=right><B>Email Address: </B></TD>
-	<TD ALIGN=left><INPUT TYPE=text SIZE=40 MAXLENGTH=60 NAME=login_name VALUE="$user_info[0]"></TD>
-</TR><TR>
-	<TD ALIGN=right><B>Real Name: </B></TD>
-	<TD ALIGN=left><INPUT TYPE=text SIZE=40 MAXLENGTH=60 NAME=realname VALUE="$user_info[1]"></TD>
-</TR><TR>
-	<TD ALIGN=right><B>New Password (8 chars.): </B></TD>
-	<TD ALIGN=left><INPUT TYPE=password NAME=password></TD>
-</TR><TR>
-	<TD ALIGN=right><B>Retype New Password (8 chars.): </TD>
-	<TD ALIGN=left><INPUT TYPE=password NAME=retype></TD>
-</TR>
-</TABLE>
-<CENTER><B><FONT SIZE=+1 COLOR=red>Note:</FONT> If the current password is changed, it will be automatically
-mailed out to the member.</B></CENTER>
-<P>
-<HR WIDTH=800>	
-<TABLE ALIGN=center CELLSPACING=0 CELLPADDING=4>
-<TR>
-	<TH>Check which groups you wish this member to be in.</TH>
-</TR><TR>
-	<TD ALIGN=left>
-	<INPUT TYPE=HIDDEN NAME=userid VALUE="$::FORM{'userid'}">
-};	
-	my $count = 0;
-	foreach my $i (keys %grouplist) {
-    	my $c;
-    	if (lsearch(\@groupbelong, $i) >= 0) {
-        	$c = 'CHECKED';
-    	} else {
-        	$c = '';
-    	}
-    	print qq{
-	<INPUT TYPE=checkbox NAME=group-$i $c> $grouplist{$i}<br>
-};
-	}
-
-    print "
-<P>
-<SCRIPT>
-numelements = document.changeform.elements.length;
-function SetCheckboxes(value) {
-    for (var i=0 ; i<numelements ; i++) {
-        item = document.changeform.elements\[i\];
-        item.checked = value;
-    }
-}
-document.write(\" <input type=button value=\\\"Uncheck All\\\" onclick=\\\"SetCheckboxes(false);\\\"> <input type=button value=\\\"Check All\\\" onclick=\\\"SetCheckboxes(true);\\\">\");
-</SCRIPT>\n";
-
-	print qq{
-	</TD>
-</TR>
-</TABLE>
-<P>
-<CENTER>
-<HR WIDTH=800>
-<INPUT TYPE=submit NAME=update VALUE=" Update! ">
-</FORM>
-<A HREF="editmembers.cgi">[Edit another member]</A>
-</CENTER>
-
-};
-
-	PutFooter();
-	exit;
-}
-
-# we made group changes to multiple members
-if ($::FORM{'update'} && $::FORM{'multiple'} eq '1') {
-	if (UpdateGroups()) {
-		print "<CENTER><B>Member group permissions successfully updated.</B></CENTER>\n";
-		exit;
-	} else {
-		print "<CENTER><B>Member group updated unsuccessful!</B></CENTER>\n";
-		exit;
-	}
-}
-
-print qq{
-<FORM <METHOD=post ACTION=editmembers.cgi>
-<TABLE ALIGN=center>
-<TR>
-	<TD COLSPAN=2><U><B>Enter email address or partial real name of member you want to edit</B></U></TD>
-</TR><TR>
-	<TD ALIGN=right><B>Email Address: </B></TD>
-	<TD ALIGN=left><INPUT TYPE=text SIZE=30 MAXLENGTH=40 NAME=login_name></TD>
-</TR><TR>
-	<TD ALIGN=right><B>Full Name: </B></TD>
-	<TD ALIGN=left><INPUT TYPE=text SIZE=30 MAXLENGTH=40 NAME=realname></TD>
-</TR><TR>
-	<TD COLSPAN=2 ALIGN=center><INPUT TYPE=submit NAME=submit VALUE=Find></TD>
-</TR>
-</TABLE>
-</FORM>
-};
-
-PutFooter();
-exit;

mozilla/webtools/bugzilla/editmilestones.cgi

@@ -1,568 +0,0 @@
-#!/usr/bonsaitools/bin/perl -w
-# -*- Mode: perl; indent-tabs-mode: nil -*-
-
-#
-# This is a script to edit the target milestones. It is largely a copy of
-# the editversions.cgi script, since the two fields were set up in a
-# very similar fashion.
-#
-# (basically replace each occurance of 'milestone' with 'version', and
-# you'll have the original script)
-#
-# Matt Masson <matthew@zeroknowledge.com>
-#
-
-
-use diagnostics;
-use strict;
-
-require "CGI.pl";
-require "globals.pl";
-
-
-
-
-# TestProduct:  just returns if the specified product does exists
-# CheckProduct: same check, optionally  emit an error text
-# TestMilestone:  just returns if the specified product/version combination exists
-# CheckMilestone: same check, optionally emit an error text
-
-sub TestProduct ($)
-{
-    my $prod = shift;
-
-    # does the product exist?
-    SendSQL("SELECT product
-             FROM products
-             WHERE product=" . SqlQuote($prod));
-    return FetchOneColumn();
-}
-
-sub CheckProduct ($)
-{
-    my $prod = shift;
-
-    # do we have a product?
-    unless ($prod) {
-        print "Sorry, you haven't specified a product.";
-        PutTrailer();
-        exit;
-    }
-
-    unless (TestProduct $prod) {
-        print "Sorry, product '$prod' does not exist.";
-        PutTrailer();
-        exit;
-    }
-}
-
-sub TestMilestone ($$)
-{
-    my ($prod,$mile) = @_;
-
-    # does the product exist?
-    SendSQL("SELECT product,value
-             FROM milestones
-             WHERE product=" . SqlQuote($prod) . " and value=" . SqlQuote($mile));
-    return FetchOneColumn();
-}
-
-sub CheckMilestone ($$)
-{
-    my ($prod,$mile) = @_;
-
-    # do we have the milestone?
-    unless ($mile) {
-        print "Sorry, you haven't specified a milestone.";
-        PutTrailer();
-        exit;
-    }
-
-    CheckProduct($prod);
-
-    unless (TestMilestone $prod,$mile) {
-        print "Sorry, milestone '$mile' for product '$prod' does not exist.";
-        PutTrailer();
-        exit;
-    }
-}
-
-
-#
-# Displays the form to edit a milestone
-#
-
-sub EmitFormElements ($$$)
-{
-    my ($product, $milestone, $sortkey) = @_;
-
-    print "  <TH ALIGN=\"right\">Milestone:</TH>\n";
-    print "  <TD><INPUT SIZE=64 MAXLENGTH=64 NAME=\"milestone\" VALUE=\"" .
-        value_quote($milestone) . "\">\n";
-    print "</TR><TR>\n";
-    print "  <TH ALIGN=\"right\">Sortkey:</TH>\n";
-    print "  <TD><INPUT SIZE=64 MAXLENGTH=64 NAME=\"sortkey\" VALUE=\"" .
-        value_quote($sortkey) . "\">\n";
-    print "      <INPUT TYPE=HIDDEN NAME=\"product\" VALUE=\"" .
-        value_quote($product) . "\"></TD>\n";
-}
-
-
-#
-# Displays a text like "a.", "a or b.", "a, b or c.", "a, b, c or d."
-#
-
-sub PutTrailer (@)
-{
-    my (@links) = ("Back to the <A HREF=\"query.cgi\">query page</A>", @_);
-
-    my $count = $#links;
-    my $num = 0;
-    print "<P>\n";
-    foreach (@links) {
-        print $_;
-        if ($num == $count) {
-            print ".\n";
-        }
-        elsif ($num == $count-1) {
-            print " or ";
-        }
-        else {
-            print ", ";
-        }
-        $num++;
-    }
-    PutFooter();
-}
-
-
-
-
-
-
-
-#
-# Preliminary checks:
-#
-
-confirm_login();
-
-print "Content-type: text/html\n\n";
-
-unless (UserInGroup("editcomponents")) {
-    PutHeader("Not allowed");
-    print "Sorry, you aren't a member of the 'editcomponents' group.\n";
-    print "And so, you aren't allowed to add, modify or delete milestones.\n";
-    PutTrailer();
-    exit;
-}
-
-
-#
-# often used variables
-#
-my $product = trim($::FORM{product} || '');
-my $milestone = trim($::FORM{milestone} || '');
-my $sortkey = trim($::FORM{sortkey} || '0');
-my $action  = trim($::FORM{action}  || '');
-my $localtrailer;
-if ($milestone) {
-    $localtrailer = "<A HREF=\"editmilestones.cgi?product=" . url_quote($product) . "\">edit</A> more milestones";
-} else {
-    $localtrailer = "<A HREF=\"editmilestones.cgi\">edit</A> more milestones";
-}
-
-
-
-#
-# product = '' -> Show nice list of milestones
-#
-
-unless ($product) {
-    PutHeader("Select product");
-
-    SendSQL("SELECT products.product,products.description,'xyzzy'
-             FROM products 
-             GROUP BY products.product
-             ORDER BY products.product");
-    print "<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0><TR BGCOLOR=\"#6666FF\">\n";
-    print "  <TH ALIGN=\"left\">Edit milestones of ...</TH>\n";
-    print "  <TH ALIGN=\"left\">Description</TH>\n";
-    print "  <TH ALIGN=\"left\">Bugs</TH>\n";
-    print "</TR>";
-    while ( MoreSQLData() ) {
-        my ($product, $description, $bugs) = FetchSQLData();
-        $description ||= "<FONT COLOR=\"red\">missing</FONT>";
-        $bugs ||= "none";
-        print "<TR>\n";
-        print "  <TD VALIGN=\"top\"><A HREF=\"editmilestones.cgi?product=", url_quote($product), "\"><B>$product</B></A></TD>\n";
-        print "  <TD VALIGN=\"top\">$description</TD>\n";
-        print "  <TD VALIGN=\"top\">$bugs</TD>\n";
-    }
-    print "</TR></TABLE>\n";
-
-    PutTrailer();
-    exit;
-}
-
-
-
-#
-# action='' -> Show nice list of milestones
-#
-
-unless ($action) {
-    PutHeader("Select milestone");
-    CheckProduct($product);
-
-    SendSQL("SELECT value,sortkey
-             FROM milestones
-             WHERE product=" . SqlQuote($product) . "
-             ORDER BY sortkey,value");
-
-    print "<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0><TR BGCOLOR=\"#6666FF\">\n";
-    print "  <TH ALIGN=\"left\">Edit milestone ...</TH>\n";
-    #print "  <TH ALIGN=\"left\">Bugs</TH>\n";
-    print "  <TH ALIGN=\"left\">Sortkey</TH>\n";
-    print "  <TH ALIGN=\"left\">Action</TH>\n";
-    print "</TR>";
-    while ( MoreSQLData() ) {
-        my ($milestone,$sortkey,$bugs) = FetchSQLData();
-        $bugs ||= 'none';
-        print "<TR>\n";
-        print "  <TD VALIGN=\"top\"><A HREF=\"editmilestones.cgi?product=", url_quote($product), "&milestone=", url_quote($milestone), "&action=edit\"><B>$milestone</B></A></TD>\n";
-        #print "  <TD VALIGN=\"top\">$bugs</TD>\n";
-        print "  <TD VALIGN=\"top\" ALIGN=\"right\">$sortkey</TD>\n";
-        print "  <TD VALIGN=\"top\"><A HREF=\"editmilestones.cgi?product=", url_quote($product), "&milestone=", url_quote($milestone), "&action=del\"><B>Delete</B></A></TD>\n";
-        print "</TR>";
-    }
-    print "<TR>\n";
-    print "  <TD VALIGN=\"top\" COLSPAN=\"2\">Add a new milestone</TD>\n";
-    print "  <TD VALIGN=\"top\" ALIGN=\"middle\"><A HREF=\"editmilestones.cgi?product=", url_quote($product) . "&action=add\">Add</A></TD>\n";
-    print "</TR></TABLE>\n";
-
-    PutTrailer();
-    exit;
-}
-
-
-
-
-#
-# action='add' -> present form for parameters for new milestone
-#
-# (next action will be 'new')
-#
-
-if ($action eq 'add') {
-    PutHeader("Add milestone");
-    CheckProduct($product);
-
-    #print "This page lets you add a new milestone to a $::bugzilla_name tracked product.\n";
-
-    print "<FORM METHOD=POST ACTION=editmilestones.cgi>\n";
-    print "<TABLE BORDER=0 CELLPADDING=4 CELLSPACING=0><TR>\n";
-
-    EmitFormElements($product, $milestone, 0);
-
-    print "</TABLE>\n<HR>\n";
-    print "<INPUT TYPE=SUBMIT VALUE=\"Add\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"new\">\n";
-    print "</FORM>";
-
-    my $other = $localtrailer;
-    $other =~ s/more/other/;
-    PutTrailer($other);
-    exit;
-}
-
-
-
-#
-# action='new' -> add milestone entered in the 'action=add' screen
-#
-
-if ($action eq 'new') {
-    PutHeader("Adding new milestone");
-    CheckProduct($product);
-
-    # Cleanups and valididy checks
-
-    unless ($milestone) {
-        print "You must enter a text for the new milestone. Please press\n";
-        print "<b>Back</b> and try again.\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-    if (TestMilestone($product,$milestone)) {
-        print "The milestone '$milestone' already exists. Please press\n";
-        print "<b>Back</b> and try again.\n";
-        PutTrailer($localtrailer);
-        exit;
-    }
-
-    # Add the new milestone
-    SendSQL("INSERT INTO milestones ( " .
-          "value, product, sortkey" .
-          " ) VALUES ( " .
-          SqlQuote($milestone) . "," .
-          SqlQuote($product) . ", $sortkey)");
-
-    # Make versioncache flush
-    unlink "data/versioncache";
-
-    print "OK, done.<p>\n";
-    PutTrailer($localtrailer);
-    exit;
-}
-
-
-
-
-#
-# action='del' -> ask if user really wants to delete
-#
-# (next action would be 'delete')
-#
-
-if ($action eq 'del') {
-    PutHeader("Delete milestone");
-    CheckMilestone($product, $milestone);
-
-    SendSQL("SELECT count(bug_id),product,target_milestone
-             FROM bugs
-             GROUP BY product,target_milestone
-             HAVING product=" . SqlQuote($product) . "
-                AND target_milestone=" . SqlQuote($milestone));
-    my $bugs = FetchOneColumn();
-
-    SendSQL("SELECT defaultmilestone FROM products " .
-            "WHERE product=" . SqlQuote($product));
-    my $defaultmilestone = FetchOneColumn();
-
-    print "<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0>\n";
-    print "<TR BGCOLOR=\"#6666FF\">\n";
-    print "  <TH VALIGN=\"top\" ALIGN=\"left\">Part</TH>\n";
-    print "  <TH VALIGN=\"top\" ALIGN=\"left\">Value</TH>\n";
-
-    print "</TR><TR>\n";
-    print "  <TH ALIGN=\"left\" VALIGN=\"top\">Product:</TH>\n";
-    print "  <TD VALIGN=\"top\">$product</TD>\n";
-    print "</TR><TR>\n";
-    print "  <TH ALIGN=\"left\" VALIGN=\"top\">Milestone:</TH>\n";
-    print "  <TD VALIGN=\"top\">$milestone</TD>\n";
-    print "</TR><TR>\n";
-    print "  <TH ALIGN=\"left\" VALIGN=\"top\">Bugs:</TH>\n";
-    print "  <TD VALIGN=\"top\">", $bugs || 'none' , "</TD>\n";
-    print "</TR></TABLE>\n";
-
-    print "<H2>Confirmation</H2>\n";
-
-    if ($bugs) {
-        if (!Param("allowbugdeletion")) {
-            print "Sorry, there are $bugs bugs outstanding for this milestone.
-You must reassign those bugs to another milestone before you can delete this
-one.";
-            PutTrailer($localtrailer);
-            exit;
-        }
-        print "<TABLE BORDER=0 CELLPADDING=20 WIDTH=\"70%\" BGCOLOR=\"red\"><TR><TD>\n",
-              "There are bugs entered for this milestone!  When you delete this ",
-              "milestone, <B><BLINK>all</BLINK></B> stored bugs will be deleted, too. ",
-              "You could not even see the bug history for this milestone anymore!\n",
-              "</TD></TR></TABLE>\n";
-    }
-
-    if ($defaultmilestone eq $milestone) {
-        print "Sorry; this is the default milestone for this product, and " .
-            "so it can not be deleted.";
-        PutTrailer($localtrailer);
-        exit;
-    }
-
-    print "<P>Do you really want to delete this milestone?<P>\n";
-    print "<FORM METHOD=POST ACTION=editmilestones.cgi>\n";
-    print "<INPUT TYPE=SUBMIT VALUE=\"Yes, delete\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"delete\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"product\" VALUE=\"" .
-        value_quote($product) . "\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"milestone\" VALUE=\"" .
-        value_quote($milestone) . "\">\n";
-    print "</FORM>";
-
-    PutTrailer($localtrailer);
-    exit;
-}
-
-
-
-#
-# action='delete' -> really delete the milestone
-#
-
-if ($action eq 'delete') {
-    PutHeader("Deleting milestone");
-    CheckMilestone($product,$milestone);
-
-    # lock the tables before we start to change everything:
-
-    SendSQL("LOCK TABLES attachments WRITE,
-                         bugs WRITE,
-                         bugs_activity WRITE,
-                         milestones WRITE,
-                         dependencies WRITE");
-
-    # According to MySQL doc I cannot do a DELETE x.* FROM x JOIN Y,
-    # so I have to iterate over bugs and delete all the indivial entries
-    # in bugs_activies and attachments.
-
-    if (Param("allowbugdeletion")) {
-
-        SendSQL("SELECT bug_id
-             FROM bugs
-             WHERE product=" . SqlQuote($product) . "
-               AND target_milestone=" . SqlQuote($milestone));
-        while (MoreSQLData()) {
-            my $bugid = FetchOneColumn();
-
-            my $query =
-                $::db->query("DELETE FROM attachments WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM bugs_activity WHERE bug_id=$bugid")
-                or die "$::db_errstr";
-            $query =
-                $::db->query("DELETE FROM dependencies WHERE blocked=$bugid")
-                or die "$::db_errstr";
-        }
-        print "Attachments, bug activity and dependencies deleted.<BR>\n";
-
-
-        # Deleting the rest is easier:
-
-        SendSQL("DELETE FROM bugs
-             WHERE product=" . SqlQuote($product) . "
-               AND target_milestone=" . SqlQuote($milestone));
-        print "Bugs deleted.<BR>\n";
-    }
-
-    SendSQL("DELETE FROM milestones
-             WHERE product=" . SqlQuote($product) . "
-               AND value=" . SqlQuote($milestone));
-    print "Milestone deleted.<P>\n";
-    SendSQL("UNLOCK TABLES");
-
-    unlink "data/versioncache";
-    PutTrailer($localtrailer);
-    exit;
-}
-
-
-
-#
-# action='edit' -> present the edit milestone form
-#
-# (next action would be 'update')
-#
-
-if ($action eq 'edit') {
-    PutHeader("Edit milestone");
-    CheckMilestone($product,$milestone);
-
-    SendSQL("SELECT sortkey FROM milestones WHERE product=" .
-            SqlQuote($product) . " AND value = " . SqlQuote($milestone));
-    my $sortkey = FetchOneColumn();
-
-    print "<FORM METHOD=POST ACTION=editmilestones.cgi>\n";
-    print "<TABLE BORDER=0 CELLPADDING=4 CELLSPACING=0><TR>\n";
-
-    EmitFormElements($product, $milestone, $sortkey);
-
-    print "</TR></TABLE>\n";
-
-    print "<INPUT TYPE=HIDDEN NAME=\"milestoneold\" VALUE=\"" .
-        value_quote($milestone) . "\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"sortkeyold\" VALUE=\"" .
-        value_quote($sortkey) . "\">\n";
-    print "<INPUT TYPE=HIDDEN NAME=\"action\" VALUE=\"update\">\n";
-    print "<INPUT TYPE=SUBMIT VALUE=\"Update\">\n";
-
-    print "</FORM>";
-
-    my $other = $localtrailer;
-    $other =~ s/more/other/;
-    PutTrailer($other);
-    exit;
-}
-
-
-
-#
-# action='update' -> update the milestone
-#
-
-if ($action eq 'update') {
-    PutHeader("Update milestone");
-
-    my $milestoneold = trim($::FORM{milestoneold} || '');
-    my $sortkeyold = trim($::FORM{sortkeyold} || '0');
-
-    CheckMilestone($product,$milestoneold);
-
-    SendSQL("LOCK TABLES bugs WRITE,
-                         milestones WRITE,
-                         products WRITE");
-
-    if ($milestone ne $milestoneold) {
-        unless ($milestone) {
-            print "Sorry, I can't delete the milestone text.";
-            PutTrailer($localtrailer);
-	    SendSQL("UNLOCK TABLES");
-            exit;
-        }
-        if (TestMilestone($product,$milestone)) {
-            print "Sorry, milestone '$milestone' is already in use.";
-            PutTrailer($localtrailer);
-	    SendSQL("UNLOCK TABLES");
-            exit;
-        }
-        SendSQL("UPDATE bugs
-                 SET target_milestone=" . SqlQuote($milestone) . "
-                 WHERE target_milestone=" . SqlQuote($milestoneold) . "
-                   AND product=" . SqlQuote($product));
-        SendSQL("UPDATE milestones
-                 SET value=" . SqlQuote($milestone) . "
-                 WHERE product=" . SqlQuote($product) . "
-                   AND value=" . SqlQuote($milestoneold));
-        SendSQL("UPDATE products " .
-                "SET defaultmilestone = " . SqlQuote($milestone) .
-                "WHERE product = " . SqlQuote($product) .
-                "  AND defaultmilestone = " . SqlQuote($milestoneold));
-        unlink "data/versioncache";
-        print "Updated milestone.<BR>\n";
-    }
-    if ($sortkey != $sortkeyold) {
-        SendSQL("UPDATE milestones SET sortkey=$sortkey
-                 WHERE product=" . SqlQuote($product) . "
-                   AND value=" . SqlQuote($milestoneold));
-        unlink "data/versioncache";
-        print "Updated sortkey.<BR>\n";
-    }
-    SendSQL("UNLOCK TABLES");
-
-    PutTrailer($localtrailer);
-    exit;
-}
-
-
-
-#
-# No valid action found
-#
-
-PutHeader("Error");
-print "I don't have a clue what you want.<BR>\n";
-
-foreach ( sort keys %::FORM) {
-    print "$_: $::FORM{$_}<BR>\n";
-}