Merged from trunk

diff --cc configure.in
index 38444d4e15319bacf5bffb5dc7370398a88c36f6,788ddcce736b106f252ce52df880d8ce7f805ef3..0bb5b51a4acdb35dbe6c52e9a825036bf9beb376
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1423,13 -1423,14 +1423,13 @@@ AC_ARG_ENABLE(follow-x-forwarded-for
                   HTTP header to try to find the IP address of the
                   original or indirect client when a request has
                   been forwarded through other proxies.]), [
 -  SQUID_YESNO([$enableval],[unrecognized argument to --enable-follow-x-forwarded-for: $enableval])
 -  squid_opt_follow_xff=$enableval
 +  SQUID_YESNO([$enableval],
 +    [unrecognized argument to --enable-follow-x-forwarded-for: $enableval])
  ])
 -AC_MSG_NOTICE([Support for X-Forwarded-For enabled: $squid_opt_follow_xff])
 -SQUID_DEFINE_BOOL(FOLLOW_X_FORWARDED_FOR,$squid_opt_follow_xff,
 +AC_MSG_NOTICE([Support for X-Forwarded-For enabled: ${enable_follow_x_forwarded_for:=yes}])
- SQUID_DEFINE_BOOL([FOLLOW_X_FORWARDED_FOR],$enable_follow_x_forwarded_for,
++SQUID_DEFINE_BOOL(FOLLOW_X_FORWARDED_FOR,$enable_follow_x_forwarded_for,
    [Enable following X-Forwarded-For headers])
  
 -squid_opt_use_ident="yes"
  AC_ARG_ENABLE(ident-lookups,
    AS_HELP_STRING([--disable-ident-lookups],
                   [Remove code that supports performing Ident (RFC 931) lookups.]), [

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/globals.h
Simple merge

diff --cc src/htcp.cc
index c6975e509cd41e457b1a6046639e95ba1c3ca562,fd17a3270b9448279e781b17624c3649c49e3471..763ed5114b07cdce49c5cf57f264cda10e378797
--- 1/src/htcp.cc
--- 2/src/htcp.cc
+++ b/src/htcp.cc
@@@ -225,7 -243,9 +243,9 @@@ enum 
      RR_RESPONSE
  };
  
 -static u_int32_t msg_id_counter = 0;
+ static void htcpIncomingConnectionOpened(int fd, int errNo);
 +static uint32_t msg_id_counter = 0;
+ 
  static int htcpInSocket = -1;
  static int htcpOutSocket = -1;
  #define N_QUERIED_KEYS 8192

diff --cc src/icp_v2.cc
Simple merge

diff --cc src/structs.h
Simple merge