Merged from trunk

diff --cc src/DiskIO/Blocking/BlockingFile.cc
Simple merge

diff --cc src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
Simple merge

diff --cc src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
index 6cb8f45331d18288dc1492ca5cc7198fecc6807a,4ee13011a011b40f5d596a005f5bcd5b9c9a978e..173c276a21caaf210ad40fb3af1e9e611847b38e
--- 1/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
--- 2/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
@@@ -33,9 -33,7 +33,8 @@@
   * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
   */
  
- 
  #include "squid.h"
 +#include "disk.h"
  #include "DiskThreadsDiskFile.h"
  #include "DiskIO/IORequestor.h"
  #include "DiskIO/ReadRequest.h"

diff --cc src/DiskIO/IpcIo/IpcIoFile.cc
Simple merge

diff --cc src/DiskIO/Mmapped/MmappedFile.cc
Simple merge

diff --cc src/ExternalACL.h
Simple merge

diff --cc src/HttpHdrCc.cc
Simple merge

diff --cc src/HttpHdrContRange.cc
Simple merge

diff --cc src/HttpHdrSc.cc
Simple merge

diff --cc src/HttpHeader.cc
Simple merge

diff --cc src/HttpHeader.h
index eab50bdc4bea0a7e27bd17770a8297d88b6e4b3f,53e884bc6422c2d436ad6c7adff0a28009b7e677..9f4c5f5618a03287729a494178fbee1fd982a553
--- 1/src/HttpHeader.h
--- 2/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@@ -293,11 -290,10 +290,10 @@@ private
      HttpHeaderEntry *findLastEntry(http_hdr_type id) const;
  };
  
- 
  extern int httpHeaderParseQuotedString(const char *start, const int len, String *val);
 -SQUIDCEXTERN int httpHeaderHasByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator);
 -SQUIDCEXTERN void httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask * denied_mask);
 -SQUIDCEXTERN void httpHeaderCalcMask(HttpHeaderMask * mask, http_hdr_type http_hdr_type_enums[], size_t count);
 +extern int httpHeaderHasByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator);
 +extern void httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask * denied_mask);
 +extern void httpHeaderCalcMask(HttpHeaderMask * mask, http_hdr_type http_hdr_type_enums[], size_t count);
  
  inline bool
  HttpHeader::chunked() const

diff --cc src/MemBuf.cc
Simple merge

diff --cc src/Server.cc
Simple merge

diff --cc src/String.cc
Simple merge

diff --cc src/SwapDir.cc
Simple merge

diff --cc src/acl/DestinationDomain.cc
Simple merge

diff --cc src/acl/DomainData.cc
Simple merge

diff --cc src/acl/Gadgets.cc
index cd9aa8035c84ca8e449c361c9f3f42a2ef152bc9,3733f9a9ee6ee37620167f5b9fcf0f56202f2eff..f78e369e8c5a458f67e100e4d552b8566db37dc9
--- 1/src/acl/Gadgets.cc
--- 2/src/acl/Gadgets.cc
+++ b/src/acl/Gadgets.cc
@@@ -47,10 -47,8 +47,9 @@@
  #include "errorpage.h"
  #include "globals.h"
  #include "HttpRequest.h"
 +#include "Mem.h"
  #include "protos.h"
  
- 
  /* does name lookup, returns page_id */
  err_type
  aclGetDenyInfoPage(acl_deny_info_list ** head, const char *name, int redirect_allowed)

diff --cc src/acl/Ip.cc
Simple merge

diff --cc src/acl/SourceDomain.cc
Simple merge

diff --cc src/adaptation/ecap/MessageRep.cc
Simple merge

diff --cc src/adaptation/icap/ModXact.cc
Simple merge

diff --cc src/adaptation/icap/OptXact.cc
Simple merge

diff --cc src/adaptation/icap/Xaction.cc
Simple merge

diff --cc src/auth/basic/auth_basic.cc
Simple merge

diff --cc src/auth/digest/auth_digest.cc
index 721987be58ea16bcb1bacafdd63239a47257d262,c7713e84c50a6a6cca14f5e1d1ec811b47b2f41a..d98b804e4195cf21ed05a3b50e3a764392d681e1
--- 1/src/auth/digest/auth_digest.cc
--- 2/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@@ -36,9 -36,7 +36,8 @@@
   * They DO NOT perform access control or auditing.
   * See acl.c for access control and client_side.c for auditing */
  
- 
  #include "squid.h"
 +#include "cache_cf.h"
  #include "rfc2617.h"
  #include "auth/digest/auth_digest.h"
  #include "auth/digest/Scheme.h"

diff --cc src/auth/negotiate/UserRequest.cc
Simple merge

diff --cc src/auth/negotiate/auth_negotiate.cc
Simple merge

diff --cc src/auth/ntlm/auth_ntlm.cc
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side.h
Simple merge

diff --cc src/client_side_reply.cc
Simple merge

diff --cc src/client_side_request.cc
Simple merge

diff --cc src/client_side_request.h
Simple merge

diff --cc src/comm.cc
Simple merge

diff --cc src/comm/ModPoll.cc
Simple merge

diff --cc src/disk.cc
Simple merge

diff --cc src/dns_internal.cc
Simple merge

diff --cc src/errorpage.cc
Simple merge

diff --cc src/esi/Esi.cc
Simple merge

diff --cc src/esi/Include.cc
Simple merge

diff --cc src/esi/VarState.cc
Simple merge

diff --cc src/external_acl.cc
Simple merge

diff --cc src/fd.cc
Simple merge

diff --cc src/format/Format.cc
Simple merge

diff --cc src/forward.cc
Simple merge

diff --cc src/fqdncache.cc
Simple merge

diff --cc src/fs/coss/store_dir_coss.cc
Simple merge

diff --cc src/fs/rock/RockSwapDir.cc
Simple merge

diff --cc src/fs/ufs/UFSSwapDir.cc
Simple merge

diff --cc src/ftp.cc
Simple merge

diff --cc src/gopher.cc
Simple merge

diff --cc src/helper.cc
Simple merge

diff --cc src/htcp.cc
Simple merge

diff --cc src/http.cc
Simple merge

diff --cc src/icmp/IcmpSquid.cc
Simple merge

diff --cc src/icmp/net_db.cc
Simple merge

diff --cc src/icp_v2.cc
Simple merge

diff --cc src/ipc/StoreMap.cc
index 8f5c116e7e0ac25096c20263d9e12724679b682f,846d96c5dc8d123a642ea528f0b61bf84a425fca..1a97436ac4418bc0cf152e19bc54b639f3ca7d5a
--- 1/src/ipc/StoreMap.cc
--- 2/src/ipc/StoreMap.cc
+++ b/src/ipc/StoreMap.cc
@@@ -5,10 -5,8 +5,9 @@@
   */
  
  #include "squid.h"
- 
  #include "protos.h"
  #include "Store.h"
 +#include "store_key_md5.h"
  #include "ipc/StoreMap.h"
  
  Ipc::StoreMap::Owner *

diff --cc src/ipcache.cc
Simple merge

diff --cc src/log/ModTcp.cc
Simple merge

diff --cc src/log/ModUdp.cc
Simple merge

diff --cc src/log/access_log.cc
Simple merge

diff --cc src/mem.cc
Simple merge

diff --cc src/mime.cc
Simple merge

diff --cc src/neighbors.cc
Simple merge

diff --cc src/peer_digest.cc
Simple merge

diff --cc src/peer_select.cc
Simple merge

diff --cc src/peer_userhash.cc
Simple merge

diff --cc src/snmp_agent.cc
Simple merge

diff --cc src/ssl/ServerBump.cc
Simple merge

diff --cc src/ssl/support.cc
Simple merge

diff --cc src/stat.cc
Simple merge

diff --cc src/store.cc
Simple merge

diff --cc src/store_digest.cc
Simple merge

diff --cc src/store_dir.cc
Simple merge

diff --cc src/test_cache_digest.cc
Simple merge

diff --cc src/tests/testEvent.cc
Simple merge

diff --cc src/tests/testHttpRequest.cc
Simple merge

diff --cc src/tools.cc
Simple merge

diff --cc src/tunnel.cc
Simple merge

diff --cc src/ufsdump.cc
Simple merge

diff --cc src/urn.cc
Simple merge

diff --cc src/wccp2.cc
Simple merge