C++ merge bugfixes. Thanks Guido!

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index d3816761775d4b8232d699772868cbae9fa266f7..d587cf62f41e2282a0f5f9d010eda7f062d2be37 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpHeader.cc,v 1.97 2004/09/24 22:24:33 hno Exp $
+ * $Id: HttpHeader.cc,v 1.98 2004/09/26 16:38:01 hno Exp $
  *
  * DEBUG: section 55    HTTP Header
  * AUTHOR: Alex Rousskov
@@ -1477,7 +1477,7 @@ httpHeaderNameById(int id)
 
     assert(id >= 0 && id < HDR_ENUM_END);
 
-    return strBuf(Headers[id].name);
+    return Headers[id].name.buf();
 }
 
 int

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 0dfedd3bb98782620a556387a8775a9dac453251..d8127063a2eff5cb11c5b1d1f525006dce9c16ea 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.71 2004/09/25 15:54:12 hno Exp $
+ * $Id: client_side_reply.cc,v 1.72 2004/09/26 16:38:01 hno Exp $
  *
  * DEBUG: section 88    Client-side Reply Routines
  * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c)
@@ -750,7 +750,7 @@ clientReplyContext::cacheHit(StoreIOBuffer result)
          */
 
         if (e->store_status != STORE_OK)
-            http->log_type = LOG_TCP_MISS;
+            http->logType = LOG_TCP_MISS;
         else if (e->mem_status == IN_MEMORY)
             http->logType = LOG_TCP_MEM_HIT;
         else if (Config.onoff.offline)