Merge conflict, http->log_type -> http->logType

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 64f51d82566690fcdc3d5a39394dbfd257c1e77c..39ff5b288a4cf5221971dc7d46830f6a971a50ad 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.25 2002/11/15 13:26:59 hno Exp $
+ * $Id: client_side_reply.cc,v 1.26 2002/11/15 14:18:30 hno Exp $
  *
  * DEBUG: section 88    Client-side Reply Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -1257,7 +1257,7 @@ clientBuildReplyHeader(clientReplyContext *context, HttpReply * rep)
                squid_curtime - http->entry->timestamp);
     }
     /* Filter unproxyable authentication types */
-    if (http->log_type != LOG_TCP_DENIED &&
+    if (http->logType != LOG_TCP_DENIED &&
        (httpHeaderHas(hdr, HDR_WWW_AUTHENTICATE) || httpHeaderHas(hdr, HDR_PROXY_AUTHENTICATE))) {
        HttpHeaderPos pos = HttpHeaderInitPos;
        HttpHeaderEntry *e;