From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 28 Aug 2012 13:12:34 +0000 (+0200)
Subject: Merged from trunk
X-Git-Tag: sourceformat-review-1~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5c6a331316f7bbb93662c366500c2aaf498f4c5;p=thirdparty%2Fsquid.git

Merged from trunk
---

e5c6a331316f7bbb93662c366500c2aaf498f4c5
diff --cc src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
index 6cb8f45331,4ee13011a0..173c276a21
--- a/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/HttpHeader.h
index eab50bdc4b,53e884bc64..9f4c5f5618
--- a/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/acl/Gadgets.cc
index cd9aa8035c,3733f9a9ee..f78e369e8c
--- a/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/auth/digest/auth_digest.cc
index 721987be58,c7713e84c5..d98b804e41
--- a/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/ipc/StoreMap.cc
index 8f5c116e7e,846d96c5dc..1a97436ac4
--- a/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 *