Merge from trunk

[thirdparty/squid.git] / src / acl / FilledChecklist.cc

diff --git a/src/acl/FilledChecklist.cc b/src/acl/FilledChecklist.cc
index 523873c53059335b2fc747f79f82e4e083c5e998..6db77825b628ed6bca6efb1b9ac542698e68a004 100644 (file)
--- a/src/acl/FilledChecklist.cc
+++ b/src/acl/FilledChecklist.cc
@@ -1,4 +1,4 @@
-#include "squid.h"
+#include "squid-old.h"
 #include "HttpRequest.h"
 #include "HttpReply.h"
 #include "client_side.h"
@@ -24,8 +24,11 @@ ACLFilledChecklist::checkCallback(allow_t answer)
     if (auth_user_request != NULL) {
         /* the filled_checklist lock */
         auth_user_request = NULL;
-        /* it might have been connection based */
-        if (conn()) {
+        // It might have been connection based
+        // In the case of sslBump we need to preserve authentication info
+        // XXX: need to re-evaluate this. ACL tests should not be playing with
+        // XXX: wider scoped TCP connection state, even if the helper lookup is stuck.
+        if (conn() && !conn()->switchedToHttps()) {
             conn()->auth_user_request = NULL;
         }
     }