From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 24 Dec 2008 06:39:17 +0000 (+1300)
Subject: Bug 2537: ZPH support fails to build in FreeBSD
X-Git-Tag: SQUID_3_2_0_1~1289^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2201bec64ebdae17b5076358cd866f17c96d0045;p=thirdparty%2Fsquid.git

Bug 2537: ZPH support fails to build in FreeBSD
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 51da08b729..9e8105cbab 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1280,11 +1280,12 @@ DOC_START
 	parent-hit=0xFF		Value to mark hits from parent peers.
 
 
+	NOTE: 'miss' preserve feature is only possible on Linux at this time.
+
 	For the following to work correctly, you will need to patch your
 	linux kernel with the TOS preserving ZPH patch.
 	The kernel patch can be downloaded from http://zph.bratcheda.org
 
-
 	disable-preserve-miss
 		If set, any HTTP response towards clients will
 		have the TOS value of the response comming from the
diff --git a/src/forward.cc b/src/forward.cc
index 87dabbe8fe..71b876d2a5 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -965,7 +965,9 @@ FwdState::dispatch()
 
     netdbPingSite(request->GetHost());
 
-#if USE_ZPH_QOS
+#if USE_ZPH_QOS && _SQUID_LINUX_
+    /* Bug 2537: This part of ZPH only applies to patched Linux kernels. */
+
     /* Retrieves remote server TOS value, and stores it as part of the
      * original client request FD object. It is later used to forward
      * remote server's TOS in the response to the client in case of a MISS.