Do not try to drain a socket when there is no data waiting

[privoxy.git] / debian / patches / 25_standard_medium.dpatch

diff --git a/debian/patches/25_standard_medium.dpatch b/debian/patches/25_standard_medium.dpatch
index 57240d1..be10f09 100755 (executable)
--- a/debian/patches/25_standard_medium.dpatch
+++ b/debian/patches/25_standard_medium.dpatch
@@ -7,64 +7,23 @@
 ## DP: doesn't change too much.
 
 @DPATCH@
-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 \
+diff -urNad '--exclude=CVS' '--exclude=.svn' privoxy~/match-all.action privoxy/match-all.action
+--- privoxy~/match-all.action
++++ privoxy/match-all.action
+@@ -10,7 +10,16 @@
+ +change-x-forwarded-for{block} \
+ +client-header-tagger{css-requests} \
+ +client-header-tagger{image-requests} \
 ++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-client-headers \
- -filter-server-headers \
-@@ -44,17 +44,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