Merged from trunk

diff --cc src/HttpHeader.h
Simple merge

diff --cc src/HttpHeaderTools.cc
Simple merge

diff --cc src/HttpHeaderTools.h
Simple merge

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

diff --cc src/cache_manager.cc
index 39fa19917d77117a1450bf8e6775adb375f0b1f8,dbb961b7cc7080970ee6e2a0bb81ce9dfef2520e..5322d2ae85c30e66e8223e0f99b4d26bce2d2224
--- 1/src/cache_manager.cc
--- 2/src/cache_manager.cc
+++ b/src/cache_manager.cc
@@@ -47,9 -47,8 +47,9 @@@
  #include "mgr/Forwarder.h"
  #include "mgr/FunAction.h"
  #include "mgr/QueryParams.h"
- #include "protos.h" /* rotate_logs() */
+ #include "protos.h"
  #include "tools.h"
 +#include "SquidConfig.h"
  #include "SquidTime.h"
  #include "Store.h"
  #include "wordlist.h"

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side_reply.cc
Simple merge

diff --cc src/neighbors.cc
Simple merge

diff --cc src/ssl/support.cc
index fc25588c9f62b4dff9db746ce712b59766a4e4d1,aaaa63a5c99f4ad21980943176340c96fb7cc6d3..8cc8b634750f9bb42f4b872b789259b7e02e5eb8
--- 1/src/ssl/support.cc
--- 2/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@@ -39,9 -39,9 +39,10 @@@
  #if USE_SSL
  
  #include "acl/FilledChecklist.h"
+ #include "anyp/PortCfg.h"
  #include "fde.h"
  #include "globals.h"
 +#include "SquidConfig.h"
  #include "ssl/ErrorDetail.h"
  #include "ssl/support.h"
  #include "ssl/gadgets.h"

diff --cc src/store_rebuild.h
index ae8947a6d3e9f0eee36779718ae5042b2d784bb9,64998dbcdbe13a4a36daf31d2b04a15e9da806af..601b06c3736f6f2428defa7f6f4c63c586ad7dc6
--- 1/src/store_rebuild.h
--- 2/src/store_rebuild.h
+++ b/src/store_rebuild.h
@@@ -50,12 -37,10 +50,10 @@@ extern void storeRebuildComplete(StoreR
  extern void storeRebuildProgress(int sd_index, int total, int sofar);
  
  /// loads entry from disk; fills supplied memory buffer on success
 -extern bool storeRebuildLoadEntry(int fd, int diskIndex, MemBuf &buf, struct _store_rebuild_data &counts);
 +extern bool storeRebuildLoadEntry(int fd, int diskIndex, MemBuf &buf, StoreRebuildData &counts);
  /// parses entry buffer and validates entry metadata; fills e on success
 -extern bool storeRebuildParseEntry(MemBuf &buf, StoreEntry &e, cache_key *key, struct _store_rebuild_data &counts, uint64_t expectedSize);
 +extern bool storeRebuildParseEntry(MemBuf &buf, StoreEntry &e, cache_key *key, StoreRebuildData &counts, uint64_t expectedSize);
  /// checks whether the loaded entry should be kept; updates counters
 -extern bool storeRebuildKeepEntry(const StoreEntry &e, const cache_key *key, struct _store_rebuild_data &counts);
 +extern bool storeRebuildKeepEntry(const StoreEntry &e, const cache_key *key, StoreRebuildData &counts);
  
- 
- 
  #endif /* SQUID_STORE_REBUILD_H_ */