X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F24_global_action.dpatch;h=4b90453a7ac0d6b4952bad27f9d30577e749720f;hb=0e2be80c3229e207936c707d42630914eef3caaa;hp=e50ababc6e789b24742848a10ad974ab1c84afaf;hpb=47e9a13bb048883664b6e03d5ce325f36b68783c;p=privoxy.git

diff --git a/debian/patches/24_global_action.dpatch b/debian/patches/24_global_action.dpatch
index e50ababc..4b90453a 100755
--- a/debian/patches/24_global_action.dpatch
+++ b/debian/patches/24_global_action.dpatch
@@ -21,163 +21,44 @@ diff -urNad privoxy~/GNUmakefile.in privoxy/GNUmakefile.in
 diff -urNad privoxy~/config privoxy/config
 --- privoxy~/config
 +++ privoxy/config
-@@ -335,6 +335,7 @@
- #      without at least one actions file.
+@@ -361,6 +361,7 @@
+ #      to allow previously forbidden characters.
+ #
+ actionsfile standard.action  # Internal purpose, recommended
++actionsfile global.action    # Global default setting for all sites
+ actionsfile default.action   # Main actions file
+ actionsfile user.action      # User customizations
  #
- actionsfile standard  # Internal purpose, recommended
-+actionsfile global    # Global default setting for all sites
- actionsfile default   # Main actions file
- actionsfile user      # User customizations
- 
 diff -urNad privoxy~/default.action.master privoxy/default.action.master
 --- privoxy~/default.action.master
 +++ privoxy/default.action.master
-@@ -530,75 +530,6 @@
- #
+@@ -552,16 +552,6 @@
  allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
  
--#############################################################################
+ #############################################################################
 -# Defaults
 -#############################################################################
 -{ \
---add-header \
---block \
---content-type-overwrite \
---crunch-client-header \
---crunch-if-none-match \
---crunch-outgoing-cookies \
---crunch-incoming-cookies \
---crunch-server-header \
---deanimate-gifs \
---downgrade-http-version \
---fast-redirects \
---filter{js-annoyances} \
---filter{js-events} \
---filter{html-annoyances} \
---filter{content-cookies} \
---filter{refresh-tags} \
---filter{unsolicited-popups} \
---filter{all-popups} \
---filter{img-reorder} \
---filter{banners-by-size} \
---filter{banners-by-link} \
---filter{webbugs} \
---filter{tiny-textforms} \
---filter{jumping-windows} \
---filter{frameset-borders} \
---filter{demoronizer} \
---filter{shockwave-flash} \
---filter{quicktime-kioskmode} \
---filter{fun} \
---filter{crude-parental} \
---filter{ie-exploits} \
---filter{site-specifics} \
---filter{google} \
---filter{yahoo} \
---filter{msn} \
---filter{blogspot} \
---filter{xml-to-html} \
---filter{html-to-xml} \
---filter{no-ping} \
---filter{hide-tor-exit-notation} \
---filter-client-headers \
---filter-server-headers \
---force-text-mode \
---handle-as-empty-document \
---handle-as-image \
---hide-accept-language \
---hide-content-disposition \
---hide-if-modified-since \
 -+hide-forwarded-for-headers \
 -+hide-from-header{block} \
---hide-referrer \
---hide-user-agent \
---inspect-jpegs \
---kill-popups \
---limit-connect \
---prevent-compression \
---overwrite-last-modified \
---redirect \
---send-vanilla-wafer \
---send-wafer \
---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,69 @@
+@@ -0,0 +1,9 @@
 +#############################################################################
 +# Defaults
 +#############################################################################
 +{ \
-+-add-header \
-+-block \
-+-content-type-overwrite \
-+-crunch-client-header \
-+-crunch-if-none-match \
-+-crunch-outgoing-cookies \
-+-crunch-incoming-cookies \
-+-crunch-server-header \
-+-deanimate-gifs \
-+-downgrade-http-version \
-+-fast-redirects \
-+-filter{js-annoyances} \
-+-filter{js-events} \
-+-filter{html-annoyances} \
-+-filter{content-cookies} \
-+-filter{refresh-tags} \
-+-filter{unsolicited-popups} \
-+-filter{all-popups} \
-+-filter{img-reorder} \
-+-filter{banners-by-size} \
-+-filter{banners-by-link} \
-+-filter{webbugs} \
-+-filter{tiny-textforms} \
-+-filter{jumping-windows} \
-+-filter{frameset-borders} \
-+-filter{demoronizer} \
-+-filter{shockwave-flash} \
-+-filter{quicktime-kioskmode} \
-+-filter{fun} \
-+-filter{crude-parental} \
-+-filter{ie-exploits} \
-+-filter{site-specifics} \
-+-filter{google} \
-+-filter{yahoo} \
-+-filter{msn} \
-+-filter{blogspot} \
-+-filter{xml-to-html} \
-+-filter{html-to-xml} \
-+-filter{no-ping} \
-+-filter{hide-tor-exit-notation} \
-+-filter-client-headers \
-+-filter-server-headers \
-+-force-text-mode \
-+-handle-as-empty-document \
-+-handle-as-image \
-+-hide-accept-language \
-+-hide-content-disposition \
-+-hide-if-modified-since \
 ++hide-forwarded-for-headers \
 ++hide-from-header{block} \
-+-hide-referrer \
-+-hide-user-agent \
-+-inspect-jpegs \
-+-kill-popups \
-+-limit-connect \
-+-prevent-compression \
-+-overwrite-last-modified \
-+-redirect \
-+-send-vanilla-wafer \
-+-send-wafer \
-+-session-cookies-only \
 ++set-image-blocker{pattern} \
-+-treat-forbidden-connects-like-blocks \
 +}
 +/ # Match all URLs