[squid-users] follow_xff-2.5.patch and 2.5 stable5

Hi,
I noticed that the
http://devel.squid-cache.org/follow_xff/follow_xff-2.5.patch
doesnt apply cleanly on squid-2.5.STABLE5. (it has no problem on STABLE4)

It fails on src/structs.h.
----------------------------------------------------------------------
File to patch: src/structs.h
patching file src/structs.h
Hunk #1 FAILED at 592.
Hunk #2 succeeded at 620 (offset 2 lines).
Hunk #3 succeeded at 1617 (offset 5 lines).
Hunk #4 succeeded at 1665 (offset 2 lines).
Hunk #5 succeeded at 1681 (offset 5 lines).
1 out of 5 hunks FAILED -- saving rejects to file src/structs.h.rej
----------------------------------------------------------------------

and this is the structs.h.rej

***************
*** 592,597 ****
         int vary_ignore_expire;
         int pipeline_prefetch;
         int request_entities;
       } onoff;
       acl *aclList;
       struct {
--- 592,602 ----
         int vary_ignore_expire;
         int pipeline_prefetch;
         int request_entities;
+ #if FOLLOW_X_FORWARDED_FOR
+ int acl_uses_indirect_client;
+ int delay_pool_uses_indirect_client;
+ int log_uses_indirect_client;
+ #endif /* FOLLOW_X_FORWARDED_FOR */
       } onoff;
       acl *aclList;
       struct {
------------------------------------------------------------------------

Anyone on the list uses this patch on 2.5 stable5? if so, how did you do
it?
This patch is great specially for example Dansguadian users who needs
the x_forwarder_for feature for squid's ACL, delay_pools and logging.

thanks and best regards,
Kenneth Oncinian
Received on Thu May 20 2004 - 21:39:16 MDT