Merging async-call branch changes to HEAD:

        ConnStateData is not a RefCountable class any more and cbdata
        used instead (I just forgot to commit these files)

diff --git a/src/redirect.cc b/src/redirect.cc
index 4f0105c06151d319e8c0eb1b284ccc4a5926c990..b8880f15d58d4c902b02094d04ca7a802f019be6 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: redirect.cc,v 1.124 2008/01/20 08:54:28 amosjeffries Exp $
+ * $Id: redirect.cc,v 1.125 2008/02/12 23:58:47 rousskov Exp $
  *
  * DEBUG: section 61    Redirector
  * AUTHOR: Duane Wessels
@@ -113,7 +113,7 @@ redirectStats(StoreEntry * sentry)
 void
 redirectStart(ClientHttpRequest * http, RH * handler, void *data)
 {
-    ConnStateData::Pointer conn = http->getConn();
+    ConnStateData * conn = http->getConn();
     redirectStateData *r = NULL;
     const char *fqdn;
     char buf[8192];

diff --git a/src/stat.cc b/src/stat.cc
index 8ed6fb3594189c13f676868bae455ca366a0928c..c1277e29684877c1b4cdc7f7c1537fe259d77b12 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: stat.cc,v 1.413 2008/01/07 15:45:57 hno Exp $
+ * $Id: stat.cc,v 1.414 2008/02/12 23:58:47 rousskov Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -1651,8 +1651,8 @@ statClientRequests(StoreEntry * s)
         const char *p = NULL;
         http = static_cast<ClientHttpRequest *>(i->data);
         assert(http);
-        ConnStateData::Pointer conn = http->getConn();
-        storeAppendPrintf(s, "Connection: %p\n", conn.getRaw());
+        ConnStateData * conn = http->getConn();
+        storeAppendPrintf(s, "Connection: %p\n", conn);
 
         if (conn != NULL) {
             fd = conn->fd;
@@ -1685,9 +1685,9 @@ statClientRequests(StoreEntry * s)
 #endif
 
         storeAppendPrintf(s, "start %ld.%06d (%f seconds ago)\n",
-                          (long int) http->start.tv_sec,
-                          (int) http->start.tv_usec,
-                          tvSubDsec(http->start, current_time));
+                          (long int) http->start_time.tv_sec,
+                          (int) http->start_time.tv_usec,
+                          tvSubDsec(http->start_time, current_time));
 
         if (http->request->auth_user_request)
             p = http->request->auth_user_request->username();