From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 27 Feb 2009 15:34:07 +0000 (-0700)
Subject: Merged from trunk.
X-Git-Tag: SQUID_3_2_0_1~1154^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37900bb9e64ce5377ab889ea4bc2914dc2fd06b6;p=thirdparty%2Fsquid.git

Merged from trunk.
---

37900bb9e64ce5377ab889ea4bc2914dc2fd06b6
diff --cc src/adaptation/icap/ModXact.cc
index c45b898da7,6dbb850410..7038f7c3d7
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@@ -8,14 -8,14 +8,14 @@@
  #include "HttpRequest.h"
  #include "HttpReply.h"
  #include "adaptation/Initiator.h"
- #include "ICAPServiceRep.h"
- #include "ICAPLauncher.h"
- #include "ICAPModXact.h"
- #include "ICAPClient.h"
+ #include "adaptation/icap/ServiceRep.h"
+ #include "adaptation/icap/Launcher.h"
+ #include "adaptation/icap/ModXact.h"
+ #include "adaptation/icap/Client.h"
  #include "ChunkedCodingParser.h"
  #include "TextException.h"
 -#include "AuthUserRequest.h"
 +#include "auth/UserRequest.h"
- #include "ICAPConfig.h"
+ #include "adaptation/icap/Config.h"
  #include "SquidTime.h"
  
  // flow and terminology: