X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fpatches%2F25_standard_medium.dpatch;h=70e51b415a5e0410e0f1d3238b84797b046d2984;hb=b96d9243b1252c7dc423957782894a99cd4448f4;hp=83db74854ca9ff71b63c80abcc5cefbc7bce8047;hpb=47e9a13bb048883664b6e03d5ce325f36b68783c;p=privoxy.git

diff --git a/debian/patches/25_standard_medium.dpatch b/debian/patches/25_standard_medium.dpatch
index 83db7485..70e51b41 100755
--- a/debian/patches/25_standard_medium.dpatch
+++ b/debian/patches/25_standard_medium.dpatch
@@ -10,61 +10,21 @@
 diff -urNad privoxy~/global.action privoxy/global.action
 --- privoxy~/global.action
 +++ privoxy/global.action
-@@ -10,29 +10,29 @@
- -crunch-outgoing-cookies \
- -crunch-incoming-cookies \
- -crunch-server-header \
---deanimate-gifs \
+@@ -2,8 +2,17 @@
+ # Defaults
+ #############################################################################
+ { \
 ++deanimate-gifs{last} \
- -downgrade-http-version \
- -fast-redirects \
- -filter{js-annoyances} \
- -filter{js-events} \
- -filter{html-annoyances} \
- -filter{content-cookies} \
---filter{refresh-tags} \
 ++filter{refresh-tags} \
- -filter{unsolicited-popups} \
- -filter{all-popups} \
---filter{img-reorder} \
---filter{banners-by-size} \
 ++filter{img-reorder} \
 ++filter{banners-by-size} \
- -filter{banners-by-link} \
---filter{webbugs} \
 ++filter{webbugs} \
- -filter{tiny-textforms} \
---filter{jumping-windows} \
 ++filter{jumping-windows} \
- -filter{frameset-borders} \
- -filter{demoronizer} \
- -filter{shockwave-flash} \
- -filter{quicktime-kioskmode} \
- -filter{fun} \
- -filter{crude-parental} \
---filter{ie-exploits} \
 ++filter{ie-exploits} \
- -filter{site-specifics} \
- -filter{google} \
- -filter{yahoo} \
-@@ -52,17 +52,17 @@
- -hide-if-modified-since \
  +hide-forwarded-for-headers \
  +hide-from-header{block} \
---hide-referrer \
-++hide-referrer{forge} \
- -hide-user-agent \
- -inspect-jpegs \
- -kill-popups \
- -limit-connect \
---prevent-compression \
-++prevent-compression \
- -overwrite-last-modified \
- -redirect \
- -send-vanilla-wafer \
- -send-wafer \
---session-cookies-only \
+++hide-referrer{conditional-block} \
 ++session-cookies-only \
  +set-image-blocker{pattern} \
- -treat-forbidden-connects-like-blocks \
  }
+ / # Match all URLs