From: hno <>
Date: Fri, 20 Jun 2003 01:56:11 +0000 (+0000)
Subject: Merge conflict
X-Git-Tag: SQUID_3_0_PRE1~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88d7e7f4df3fbb8c648a283286e7f35233c4562d;p=thirdparty%2Fsquid.git

Merge conflict
---

diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index 71382805b6..93b61fc123 100644
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_digest.cc,v 1.23 2003/06/19 18:57:00 hno Exp $
+ * $Id: auth_digest.cc,v 1.24 2003/06/19 19:56:11 hno Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR: Robert Collins
@@ -760,7 +760,7 @@ digest_request_h::direction()
 
     case Failed:
 
-        if (digest_request->flags.nonce_stale)
+        if (flags.nonce_stale)
             /* nonce is stale, send new challenge */
             return 1;