From: hno <>
Date: Wed, 16 Jul 2003 13:21:22 +0000 (+0000)
Subject: Fix merge conflict in TCP_DENIED_REPLY
X-Git-Tag: SQUID_3_0_PRE1~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2cf9bea7f60757e4b503a44242e0f9ab1d5ef1c;p=thirdparty%2Fsquid.git

Fix merge conflict in TCP_DENIED_REPLY
---

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 66d5eb988c..ad849d0dbb 100644
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.cc,v 1.60 2003/07/15 20:45:45 wessels Exp $
+ * $Id: client_side_reply.cc,v 1.61 2003/07/16 07:21:22 hno Exp $
  *
  * DEBUG: section 88    Client-side Reply Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -1883,7 +1883,7 @@ clientReplyContext::processReplyAccessResult(bool accessAllowed)
         removeClientStoreReference(&sc, http);
         startError(err);
         httpReplyDestroy(rep);
-        http->log_type = LOG_TCP_DENIED_REPLY;
+        http->logType = LOG_TCP_DENIED_REPLY;
         return;
     }