Add changes from 3.0.6-2, 3.0.6-3 and several unreleased changes

[privoxy.git] / debian / patches / 24_global_action.dpatch

diff --git a/debian/patches/24_global_action.dpatch b/debian/patches/24_global_action.dpatch
index 708dfa6..bbf87ad 100755 (executable)
--- a/debian/patches/24_global_action.dpatch
+++ b/debian/patches/24_global_action.dpatch
@@ -32,16 +32,16 @@ diff -urNad privoxy~/config privoxy/config
 diff -urNad privoxy~/default.action.master privoxy/default.action.master
 --- privoxy~/default.action.master
 +++ privoxy/default.action.master
-@@ -505,67 +505,6 @@
- #
+@@ -537,74 +537,6 @@
  allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
  
--#############################################################################
+ #############################################################################
 -# Defaults
 -#############################################################################
 -{ \
 --add-header \
 --block \
+--client-header-filter{hide-tor-exit-notation} \
 --content-type-overwrite \
 --crunch-client-header \
 --crunch-if-none-match \
@@ -72,8 +72,11 @@ diff -urNad privoxy~/default.action.master privoxy/default.action.master
 --filter{crude-parental} \
 --filter{ie-exploits} \
 --filter{site-specifics} \
---filter-client-headers \
---filter-server-headers \
+--filter{google} \
+--filter{yahoo} \
+--filter{msn} \
+--filter{blogspot} \
+--filter{no-ping} \
 --force-text-mode \
 --handle-as-empty-document \
 --handle-as-image \
@@ -92,24 +95,29 @@ diff -urNad privoxy~/default.action.master privoxy/default.action.master
 --redirect \
 --send-vanilla-wafer \
 --send-wafer \
+--server-header-filter{xml-to-html} \
+--server-header-filter{html-to-xml} \
 --session-cookies-only \
 -+set-image-blocker{pattern} \
 --treat-forbidden-connects-like-blocks \
 -}
 -/ # Match all URLs
- 
- #############################################################################
+-
+-#############################################################################
  # These extensions belong to images:
+ #############################################################################
+ {+handle-as-image -filter}
 diff -urNad privoxy~/global.action privoxy/global.action
 --- privoxy~/global.action
 +++ privoxy/global.action
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,67 @@
 +#############################################################################
 +# Defaults
 +#############################################################################
 +{ \
 +-add-header \
 +-block \
++-client-header-filter{hide-tor-exit-notation} \
 +-content-type-overwrite \
 +-crunch-client-header \
 +-crunch-if-none-match \
@@ -140,8 +148,11 @@ diff -urNad privoxy~/global.action privoxy/global.action
 +-filter{crude-parental} \
 +-filter{ie-exploits} \
 +-filter{site-specifics} \
-+-filter-client-headers \
-+-filter-server-headers \
++-filter{google} \
++-filter{yahoo} \
++-filter{msn} \
++-filter{blogspot} \
++-filter{no-ping} \
 +-force-text-mode \
 +-handle-as-empty-document \
 +-handle-as-image \
@@ -160,6 +171,8 @@ diff -urNad privoxy~/global.action privoxy/global.action
 +-redirect \
 +-send-vanilla-wafer \
 +-send-wafer \
++-server-header-filter{xml-to-html} \
++-server-header-filter{html-to-xml} \
 +-session-cookies-only \
 ++set-image-blocker{pattern} \
 +-treat-forbidden-connects-like-blocks \