From 2a54f6932e62a48ca46b2fd0b5d721108c2506b9 Mon Sep 17 00:00:00 2001 From: hal9 Date: Tue, 3 Oct 2006 11:12:18 +0000 Subject: [PATCH] More updates primarily for the six new filters. --- default.action.master | 32 +++++++++++++++++++++------ doc/source/privoxy-man-page.sgml | 37 ++++++++++++++++++++------------ privoxy.1 | 34 ++++++++++++++++++----------- standard.action | 20 ++++++++++++++++- 4 files changed, 90 insertions(+), 33 deletions(-) diff --git a/default.action.master b/default.action.master index bb5ac023..e84f644e 100644 --- a/default.action.master +++ b/default.action.master @@ -7,13 +7,15 @@ # # File : $Source: /cvsroot/ijbswa/current/default.action.master,v $ # -# $Id: default.action.master,v 1.31 2006/10/02 03:41:30 hal9 Exp $ +# $Id: default.action.master,v 1.32 2006/10/02 13:49:49 hal9 Exp $ # # Requires : This version requires Privoxy v3.0.4 or later due to # syntax changes. # # Purpose : Default actions file, see -# http://www.privoxy.org/user-manual/actions-file.html +# http://www.privoxy.org/user-manual/actions-file.html. +# Local exceptions and additions are better placed in +# user.action. This file is subject to periodic updating. # # Copyright : Written by and Copyright (C) 2001 - 2006 the # Privoxy team. http://www.privoxy.org/ @@ -249,8 +251,14 @@ # contacting the intermediate sites. NOTE: Syntax change as of v.3.0.4. # # +filter{name} -# Filter the website through one or more regular expression filters. -# Repeat for multiple filters. +# All files of text-based type, most notably HTML and JavaScript, to which +# this action applies, can be filtered on-the-fly through the specified +# regular expression based substitutions. (Note: plain text documents are +# exempted from filtering, because web servers often use the text/plain +# MIME type for all files whose type they don't know.) By default, +# filtering works only on the raw document content itself (that which can +# be seen with View Source), not the headers. Repeat for multiple filters. +# Use with caution: filters can be very intrusive. # # Filters predefined in the supplied default.action include: # @@ -274,7 +282,13 @@ # fun: Text replacements for subversive browsing fun! # crude-parental: Kill all web pages that contain the words "sex" or "warez" # ie-exploits: Disable some known Internet Explorer bug exploits -# site-specifics Cure for site-specific problems. Don't apply generally! +# site-specifics: Cure for site-specific problems. Don't apply generally! +# google: Removes text ads and other Google specific improvements +# yahoo: Removes text ads and other Yahoo specific improvements +# msn: Removes text ads and other MSN specific improvements +# blogspot: Cleans up Blogspot blogs +# html-to-xml: Header filter to change the Content-Type from html to xml +# xml-to-html: Header filter to change the Content-Type from xml to html # # +filter-client-headers # By default, filters only apply to the document content itself. This will @@ -459,7 +473,7 @@ ############################################################################# {{settings}} ############################################################################# -for-privoxy-version=3.0.5 +for-privoxy-version=3.0.6 ############################################################################# # Aliases @@ -544,6 +558,12 @@ allow-ads = -block -filter{banners-by-size} -filter{banners-by-link} -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-client-headers \ -filter-server-headers \ -force-text-mode \ diff --git a/doc/source/privoxy-man-page.sgml b/doc/source/privoxy-man-page.sgml index b77e9565..9a293c2e 100644 --- a/doc/source/privoxy-man-page.sgml +++ b/doc/source/privoxy-man-page.sgml @@ -5,7 +5,7 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: privoxy-man-page.sgml,v 2.8 2006/09/06 03:04:46 hal9 Exp $ + $Id: privoxy-man-page.sgml,v 2.9 2006/09/22 01:27:55 hal9 Exp $ Copyright (C) 2001-2006 Privoxy Developers http://privoxy.org See LICENSE. @@ -42,8 +42,8 @@ - - + + @@ -297,8 +297,8 @@ +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{tiny-textforms} \ @@ -311,6 +311,12 @@ -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-client-headers \ -filter-server-headers \ -force-text-mode \ @@ -338,29 +344,32 @@ / # '/' Match *all* URL patterns - # Block, and treat these URL patterns as if they were 'images'. - # We would expect these to be ads. - { +block-as-image } - .ad.doubleclick.net - .a[0-9].yimg.com/(?:(?!/i/).)*$ - ad.*.doubleclick.net - # Block all URLs that match these patterns { +block } - ad*. + ad. + ad[sv]. .*ads. banner?. /.*count(er)?\.(pl|cgi|exe|dll|asp|php[34]?) .hitbox.com media./.*(ads|banner) + # Block, and treat these URL patterns as if they were 'images'. + # We would expect these to be ads. + { +block-as-image } + .ad.doubleclick.net + .a[0-9].yimg.com/(?:(?!/i/).)*$ + ad.*.doubleclick.net + # Make exceptions for these harmless ones that would be # caught by our +block patterns just above. { -block } adsl. + adobe. advice. .*downloads. - + # uploads or downloads + /.*loads diff --git a/privoxy.1 b/privoxy.1 index 706e90c8..f8c4a7dd 100644 --- a/privoxy.1 +++ b/privoxy.1 @@ -3,7 +3,7 @@ .\" .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng . -.TH "PRIVOXY" "1" "21 September 2006" "Privoxy 3.0.5 BETA" "" +.TH "PRIVOXY" "1" "03 October 2006" "Privoxy 3.0.6 UNRELEASED" "" .SH NAME privoxy \- Privacy Enhancing Proxy .SH SYNOPSIS @@ -161,8 +161,8 @@ configuration might look like: +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{tiny-textforms} \\ @@ -175,6 +175,12 @@ configuration might look like: -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-client-headers \\ -filter-server-headers \\ -force-text-mode \\ @@ -202,28 +208,32 @@ configuration might look like: / # '/' Match *all* URL patterns - # Block, and treat these URL patterns as if they were 'images'. - # We would expect these to be ads. - { +block-as-image } - .ad.doubleclick.net - .a[0-9].yimg.com/(?:(?!/i/).)*$ - ad.*.doubleclick.net - # Block all URLs that match these patterns { +block } - ad*. + ad. + ad[sv]. .*ads. banner?. /.*count(er)?\\.(pl|cgi|exe|dll|asp|php[34]?) .hitbox.com media./.*(ads|banner) + # Block, and treat these URL patterns as if they were 'images'. + # We would expect these to be ads. + { +block-as-image } + .ad.doubleclick.net + .a[0-9].yimg.com/(?:(?!/i/).)*$ + ad.*.doubleclick.net + # Make exceptions for these harmless ones that would be # caught by our +block patterns just above. { -block } adsl. + adobe. advice. .*downloads. + # uploads or downloads + /.*loads .fi .PP Then for a \fIuser.action\fR, we would put local, @@ -288,7 +298,7 @@ config file changes by \fBSIGHUP\fR -- it will detect them automatically. .SH "NOTES" .PP -This is a BETA version of \fBPrivoxy\fR. Not +This is a UNRELEASED version of \fBPrivoxy\fR. Not all features are well tested. .PP Please see the \fIUser Manual\fR on how to contact the diff --git a/standard.action b/standard.action index 2d3c0efd..1d99daa3 100644 --- a/standard.action +++ b/standard.action @@ -2,7 +2,7 @@ # # File : $Source: /cvsroot/ijbswa/current/standard.action,v $ # -# $Id: standard.action,v 1.14 2006/09/20 11:01:05 hal9 Exp $ +# $Id: standard.action,v 1.15 2006/09/22 11:06:22 hal9 Exp $ # # Purpose : Provide prefedined sets of actions, see # http://www.privoxy.org/user-manual/actions-file.html @@ -60,6 +60,12 @@ -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-client-headers \ -filter-server-headers \ -force-text-mode \ @@ -123,6 +129,12 @@ standard.Cautious -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-client-headers \ -filter-server-headers \ -force-text-mode \ @@ -193,6 +205,12 @@ standard.Medium -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-client-headers \ -filter-server-headers \ -force-text-mode \ -- 2.39.2