Bug 2537: ZPH support fails to build in FreeBSD

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 51da08b729a9d8ff44809e634a9cbcfe8c88ea85..9e8105cbab36d27f3e0038ab156c1d06693964c2 100644 (file)
--- 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 87dabbe8feb53bfd723d5b197e3b44537a5f2a81..71b876d2a55066f4d37f3e3663fb063ce32cd2ac 100644 (file)
--- 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.