Renamed squid.h to squid-old.h and config.h to squid.h

[thirdparty/squid.git] / src / DelayId.cc

diff --git a/src/DelayId.cc b/src/DelayId.cc
index 8337f37a5941ba6b40ce375c1241145a436f1c08..66f52ca4d6f3cbd1bd2bbc04955af7625c731953 100644 (file)
--- a/src/DelayId.cc
+++ b/src/DelayId.cc
@@ -37,14 +37,14 @@
  * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "config.h"
+#include "squid.h"
 
 /* MS Visual Studio Projects are monolithic, so we need the following
  * #if to exclude the delay pools code from compile process when not needed.
  */
-#if DELAY_POOLS
+#if USE_DELAY_POOLS
 
-#include "squid.h"
+#include "squid-old.h"
 #include "DelayId.h"
 #include "client_side_request.h"
 #include "acl/FilledChecklist.h"
@@ -126,12 +126,14 @@ DelayId::DelayClient(ClientHttpRequest * http)
         if (http->getConn() != NULL)
             ch.conn(http->getConn());
 
-        if (DelayPools::delay_data[pool].theComposite().getRaw() && ch.fastCheck()) {
+        if (DelayPools::delay_data[pool].theComposite().getRaw() && ch.fastCheck() == ACCESS_ALLOWED) {
 
             DelayId result (pool + 1);
             CompositePoolNode::CompositeSelectionDetails details;
             details.src_addr = ch.src_addr;
+#if USE_AUTH
             details.user = r->auth_user_request;
+#endif
             details.tag = r->tag;
             result.compositePosition(DelayPools::delay_data[pool].theComposite()->id(details));
             return result;
@@ -196,4 +198,4 @@ DelayId::delayRead(DeferredRead const &aRead)
 
 }
 
-#endif /* DELAY_POOLS */
+#endif /* USE_DELAY_POOLS */