From: rousskov <>
Date: Wed, 13 Feb 2008 06:52:28 +0000 (+0000)
Subject: Merging async-call branch changes to HEAD:
X-Git-Tag: BASIC_TPROXY4~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bd63d11f9354babd3a61a222852b3c66c0a648c;p=thirdparty%2Fsquid.git

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 920f2d6413..0e8041f7cc 100644
--- 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);