--------------------- PatchSet 628 Date: 2003/02/22 15:34:16 Author: apbarrett Branch: follow_xff Tag: (none) Log: Minor fallout from recent merge from HEAD: Our check for delay_pool_used_indirect_client, which was previously in delay_pools.cc, now belongs in src/DelayId.cc2:DelayId::DelayClient(). Members: src/DelayId.cc:1.4.2.1->1.4.2.2 Index: squid3/src/DelayId.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/DelayId.cc,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -r1.4.2.1 -r1.4.2.2 --- squid3/src/DelayId.cc 22 Feb 2003 14:24:35 -0000 1.4.2.1 +++ squid3/src/DelayId.cc 22 Feb 2003 15:34:16 -0000 1.4.2.2 @@ -1,6 +1,6 @@ /* - * $Id: DelayId.cc,v 1.4.2.1 2003/02/22 14:24:35 apbarrett Exp $ + * $Id: DelayId.cc,v 1.4.2.2 2003/02/22 15:34:16 apbarrett Exp $ * * DEBUG: section 77 Delay Pools * AUTHOR: Robert Collins @@ -116,6 +116,11 @@ } ACLChecklist ch; ++#if FOLLOW_X_FORWARDED_FOR ++ if (Config.onoff.delay_pool_uses_indirect_client) { ++ ch.src_addr = r->indirect_client_addr; ++ } else ++#endif /* FOLLOW_X_FORWARDED_FOR */ ch.src_addr = r->client_addr; ch.my_addr = r->my_addr; ch.my_port = r->my_port;