Fix merge conflict in TCP_DENIED_REPLY

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 66d5eb988cb8336b2d9f4556180783a16b72a7a3..ad849d0dbbe6d06927423011516e1f02c4a2a9bf 100644 (file)
--- 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;
     }