From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Mon, 28 May 2012 13:44:26 +0000 (+0300)
Subject: Resolve latest merge from trunk(r12137) issues
X-Git-Tag: BumpSslServerFirst.take08~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68715527ffbb6609937c0c03f37ae901628b38cd;p=thirdparty%2Fsquid.git

Resolve latest merge from trunk(r12137) issues

During the latest merge from trunk a part of the "Intelligent handling of
CONNECT denials" patch code removed
---

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 7b06ae352a..26a74e2668 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -813,26 +813,19 @@ ClientRequestContext::clientAccessCheckDone(const allow_t &answer)
                 page_id = ERR_ACCESS_DENIED;
         }
 
-        clientStreamNode *node = (clientStreamNode *)http->client_stream.tail->prev->data;
-        clientReplyContext *repContext = dynamic_cast<clientReplyContext *>(node->data.getRaw());
-        assert (repContext);
         Ip::Address tmpnoaddr;
         tmpnoaddr.SetNoAddr();
-        repContext->setReplyToError(page_id, status,
-                                    http->request->method, NULL,
-                                    http->getConn() != NULL ? http->getConn()->clientConnection->remote : tmpnoaddr,
-                                    http->request,
-                                    NULL,
-#if USE_AUTH
-                                    http->getConn() != NULL && http->getConn()->auth_user_request != NULL ?
-                                    http->getConn()->auth_user_request : http->request->auth_user_request);
-#else
-                                    NULL);
-#endif
-        http->getConn()->flags.readMore = true; // resume any pipeline reads.
-        node = (clientStreamNode *)http->client_stream.tail->data;
-        clientStreamRead(node, http, node->readBuffer);
-        return;
+        error = clientBuildError(page_id, status, 
+                                 NULL,
+                                 http->getConn() != NULL ? http->getConn()->clientConnection->remote : tmpnoaddr,
+                                 http->request
+            );
+
+        error->auth_user_request = 
+            http->getConn() != NULL && http->getConn()->auth_user_request != NULL ?
+            http->getConn()->auth_user_request : http->request->auth_user_request;
+
+        readNextRequest = true;
     }
 
     /* ACCESS_ALLOWED continues here ... */