From: Amos Jeffries Date: Wed, 24 Dec 2008 07:34:20 +0000 (+1300) Subject: Release Notes update for ZPH polish. pt2 X-Git-Tag: SQUID_3_2_0_1~1287 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8143f893867cfb5b6e594d6863298d54800677a;p=thirdparty%2Fsquid.git Release Notes update for ZPH polish. pt2 --- diff --git a/doc/release-notes/release-3.1.html b/doc/release-notes/release-3.1.html index 109c41da84..a59649ba06 100644 --- a/doc/release-notes/release-3.1.html +++ b/doc/release-notes/release-3.1.html @@ -915,55 +915,45 @@ DEFAULT: None bypassed.

-
zph_preserve_miss_tos
+
qos_flows local-hit= sibling-hit= parent-hit=

-        If set to on (default), any HTTP response towards clients will
-        have the TOS value of the response comming from the remote
-        server masked with the value of zph_preserve_miss_tos_mask.
-        For this 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
-        
-
-

+ Allows you to select a TOS/DSCP value to mark outgoing + connections with, based on where the reply was sourced. -
zph_preserve_miss_tos_mask
-

-

-        Allows you to mask certain bits in the TOS received from the
-        remote server, before copying the value to the TOS send towards
-        clients.
-        Default: 0xFF (255) (TOS from server is not changed).
-        
-
-

+ TOS values really only have local significance - so you should + know what you're specifying. For more information, see RFC2474, + RFC2475, and RFC3260. -
zph_tos_local
-

-

-        Allows you to select a TOS/Diffserv value to mark local hits. Read above
-        (tcp_outgoing_tos) for details/requirements about TOS.
-        Default: 0 (disabled).
-        
-
-

+ The TOS/DSCP byte must be exactly that - octet value 0x00-0xFF. + Note that in practice often only values up to 0x3F are usable + as the two highest bits have been redefined for use by ECN + (RFC3168). -
zph_tos_parent
-

-

-        Set this to off if you want only sibling hits to be marked.
-        If set to on (default), parent hits are being marked too.
-        
-
-

+ This setting is configured by setting the source TOS values: -
zph_tos_peer
-

-

-        Allows you to select a TOS/Diffserv value to mark peer hits. Read above
-        (tcp_outgoing_tos) for details/requirements about TOS.
-        Default: 0 (disabled).
+        local-hit=0xFF          Value to mark local cache hits.
+
+        sibling-hit=0xFF        Value to mark hits from sibling peers.
+
+        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
+                remote server masked with the value of miss-mask.
+        miss-mask=0xFF
+                Allows you to mask certain bits in the TOS received from the
+                remote server, before copying the value to the TOS sent
+                towards clients.
+                Default: 0xFF (TOS from server is not changed).

@@ -1402,7 +1392,7 @@ The helper will now compile and work with dns_nameservers on more variants of Li

Replaced by url_rewrite_bypass

zph_local
-

Replaced by zph_tos_local

+

Replaced by qos_flows local-hit=

zph_mode

Obsolete.

@@ -1411,10 +1401,10 @@ The helper will now compile and work with dns_nameservers on more variants of Li

Obsolete.

zph_parent
-

Replaced by zph_tos_peer and zph_tos_parent

+

Replaced by qos_flows parent-hit=

zph_sibling
-

Replaced by zph_tos_peer

+

Replaced by qos_flows sibling-hit=

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml index 6da0ebbc51..fd9e3cefa4 100644 --- a/doc/release-notes/release-3.1.sgml +++ b/doc/release-notes/release-3.1.sgml @@ -734,42 +734,44 @@ NOCOMMENT_START See also: sslproxy_flags and DONT_VERIFY_PEER. - zph_preserve_miss_tos + qos_flows local-hit= sibling-hit= parent-hit= - If set to on (default), any HTTP response towards clients will - have the TOS value of the response comming from the remote - server masked with the value of zph_preserve_miss_tos_mask. - For this 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 - + Allows you to select a TOS/DSCP value to mark outgoing + connections with, based on where the reply was sourced. - zph_preserve_miss_tos_mask - - Allows you to mask certain bits in the TOS received from the - remote server, before copying the value to the TOS send towards - clients. - Default: 0xFF (255) (TOS from server is not changed). - + TOS values really only have local significance - so you should + know what you're specifying. For more information, see RFC2474, + RFC2475, and RFC3260. - zph_tos_local - - Allows you to select a TOS/Diffserv value to mark local hits. Read above - (tcp_outgoing_tos) for details/requirements about TOS. - Default: 0 (disabled). - + The TOS/DSCP byte must be exactly that - octet value 0x00-0xFF. + Note that in practice often only values up to 0x3F are usable + as the two highest bits have been redefined for use by ECN + (RFC3168). - zph_tos_parent - - Set this to off if you want only sibling hits to be marked. - If set to on (default), parent hits are being marked too. - + This setting is configured by setting the source TOS values: - zph_tos_peer - - Allows you to select a TOS/Diffserv value to mark peer hits. Read above - (tcp_outgoing_tos) for details/requirements about TOS. - Default: 0 (disabled). + local-hit=0xFF Value to mark local cache hits. + + sibling-hit=0xFF Value to mark hits from sibling peers. + + 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 + remote server masked with the value of miss-mask. + miss-mask=0xFF + Allows you to mask certain bits in the TOS received from the + remote server, before copying the value to the TOS sent + towards clients. + Default: 0xFF (TOS from server is not changed). @@ -1167,7 +1169,7 @@ This section gives an account of those changes in three categories:

Replaced by url_rewrite_bypass zph_local -

Replaced by zph_tos_local +

Replaced by qos_flows local-hit= zph_mode

Obsolete. @@ -1176,10 +1178,10 @@ This section gives an account of those changes in three categories:

Obsolete. zph_parent -

Replaced by zph_tos_peer and zph_tos_parent +

Replaced by qos_flows parent-hit= zph_sibling -

Replaced by zph_tos_peer +

Replaced by qos_flows sibling-hit=