From 79d31490c51cb7202b15ee1b20b2edba0722d715 Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de" <cbiesinger%web.de>
Date: Wed, 15 Sep 2004 21:09:46 +0000
Subject: [PATCH] Bug 259570 Remove caps dependency from network/build. Also,
 make nsHttpDigestAuth's destructor nonvirtual. r+sr=darin

---
 netwerk/build/Makefile.in                      | 1 -
 netwerk/protocol/http/src/nsHttpDigestAuth.cpp | 4 ++++
 netwerk/protocol/http/src/nsHttpDigestAuth.h   | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in
index e437eb2b98ad..bb5e2be6f286 100644
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -65,7 +65,6 @@ REQUIRES	= xpcom \
 		  intl \
 		  uconv \
 		  unicharutil \
-		  caps \
 		  $(ZLIB_REQUIRES) \
 		  $(NULL)
 
diff --git a/netwerk/protocol/http/src/nsHttpDigestAuth.cpp b/netwerk/protocol/http/src/nsHttpDigestAuth.cpp
index ad05ac1e6eaf..214cbf90bad4 100644
--- a/netwerk/protocol/http/src/nsHttpDigestAuth.cpp
+++ b/netwerk/protocol/http/src/nsHttpDigestAuth.cpp
@@ -44,6 +44,7 @@
 #include "nsHttpDigestAuth.h"
 #include "nsIHttpChannel.h"
 #include "nsIServiceManager.h"
+#include "nsISignatureVerifier.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIURI.h"
@@ -74,6 +75,9 @@ nsHttpDigestAuth::nsHttpDigestAuth()
 #endif
 }
 
+nsHttpDigestAuth::~nsHttpDigestAuth()
+{}
+
 //-----------------------------------------------------------------------------
 // nsHttpDigestAuth::nsISupports
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/src/nsHttpDigestAuth.h b/netwerk/protocol/http/src/nsHttpDigestAuth.h
index 2104226f7d0b..b2cc6688844f 100644
--- a/netwerk/protocol/http/src/nsHttpDigestAuth.h
+++ b/netwerk/protocol/http/src/nsHttpDigestAuth.h
@@ -43,7 +43,6 @@
 #define nsDigestAuth_h__
 
 #include "nsIHttpAuthenticator.h"
-#include "nsISignatureVerifier.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
 
@@ -57,6 +56,8 @@
 #define EXPANDED_DIGEST_LENGTH 32
 #define NONCE_COUNT_LENGTH 8
 
+class nsISignatureVerifier;
+
 //-----------------------------------------------------------------------------
 // nsHttpDigestAuth
 //-----------------------------------------------------------------------------
@@ -68,7 +69,7 @@ class nsHttpDigestAuth : public nsIHttpAuthenticator
     NS_DECL_NSIHTTPAUTHENTICATOR
 
     nsHttpDigestAuth();
-    virtual ~nsHttpDigestAuth() {}
+    ~nsHttpDigestAuth();
 
   protected:
     nsresult ExpandToHex(const char * digest, char * result);