Merging async-call branch changes to HEAD:

        ClientHttpRequest::getConn now returns a ConnStateData *
        pointer not ConnStateData::Pointer

diff --git a/src/ESIInclude.cc b/src/ESIInclude.cc
index 920f2d6413b104ed2868238657c4187ea4910bbb..0e8041f7cc4b4e410b964391b20e037ea9fc4e1f 100644 (file)
--- a/src/ESIInclude.cc
+++ b/src/ESIInclude.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESIInclude.cc,v 1.16 2008/01/22 22:49:34 rousskov Exp $
+ * $Id: ESIInclude.cc,v 1.17 2008/02/12 23:52:28 rousskov Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -89,7 +89,7 @@ esiBufferRecipient (clientStreamNode *node, ClientHttpRequest *http, HttpReply *
      * assert for now. */
     assert (cbdataReferenceValid (node));
     assert (node->node.next == NULL);
-    assert (http->getConn().getRaw() == NULL);
+    assert (http->getConn() == NULL);
 
     ESIStreamContext::Pointer esiStream = dynamic_cast<ESIStreamContext *>(node->data.getRaw());
     assert (esiStream.getRaw() != NULL);