X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.action;h=788b8ff62a5757e347dcbe17e6e8ccff9304308e;hb=022897470d9c9aa1fa959c9a36272a88cbba1852;hp=b2c85ef5fc7dd279a7c9af5a0577f07804ed5e7a;hpb=472006f94cd350ff6e734c156cbbb93dab86d864;p=privoxy.git

diff --git a/default.action b/default.action
index b2c85ef5..788b8ff6 100644
--- a/default.action
+++ b/default.action
@@ -1,8 +1,8 @@
 ######################################################################
 # 
-#  File        :  $Source: /cvsroot/ijbswa/current/basic.action,v $
+#  File        :  $Source: /cvsroot/ijbswa/current/default.action,v $
 # 
-#  $Id: basic.action,v 1.3 2002/03/26 22:29:54 swa Exp $
+#  $Id: default.action,v 1.11 2002/04/02 08:51:51 oes Exp $
 #
 #  Purpose     :  Default actions file, see
 #                 http://www.privoxy.org/faq/questions.html#CONFIGFILES
@@ -19,15 +19,17 @@
 #  
 #  * Use the support forum to get help:
 #    http://sourceforge.net/tracker/?group_id=11118&atid=211118
-#  * Submit bugs only thru our bug forum:
+#  * Submit feedback for this actions file only through our
+#    actions file feedback script: http://www.privoxy.org/actions
+#  * Submit bugs only through our bug forum:
 #    http://sourceforge.net/tracker/?group_id=11118&atid=111118 
 #    Make sure that the bug has not already been submitted. Please try
-#    to verify that it is a Junkbuster bug, and not a browser or site
+#    to verify that it is a Privoxy bug, and not a browser or site
 #    bug first. If you are using your own custom configuration, please
 #    try the stock configs to see if the problem is a configuration
 #    related bug. And if not using the latest development snapshot,
 #    please try the latest one. Or even better, CVS sources.
-#  * Submit feature requests only thru our feature request forum:
+#  * Submit feature requests only through our feature request forum:
 #    http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse
 #      
 # For any other issues, feel free to use the mailing lists:
@@ -119,7 +121,7 @@
 # regular expressions wouldn't fit here, but (FIXME) someone should paste
 # a concise intro to the regex language here.
 # 
-# If Junkbuster was compiled with pcre support (default), Perl compatible
+# If Privoxy was compiled with pcre support (default), Perl compatible
 # regular expressions are used. See the pcre/docs/ direcory or man perlre
 # (also available on http://www.perldoc.com/perl5.6/pod/perlre.html) for
 # details.
@@ -189,7 +191,7 @@
 # +downgrade
 #    Downgrade HTTP/1.1 client requests to HTTP/1.0 and downgrade the
 #    responses as well. Use this action for servers that use HTTP/1.1
-#    protocol features that Junkbuster currently can't handle yet.
+#    protocol features that Privoxy currently can't handle yet.
 #
 # +fast-redirects
 #    Many sites, like yahoo.com, don't just link to other sites.
@@ -210,7 +212,7 @@
 #    The +fast-redirects option enables interception of these requests
 #    by junkbuster, who will cut off all but the last valid URL in the
 #    request and send a local redirect back to your browser without
-#    contacting the remote site.
+#    contacting the intermediate sites.
 #
 # +filter{name}
 #    Filter the website through one or more regular expression filters.
@@ -289,7 +291,7 @@
 #   its connections to the cliant and to the remote proxy.
 #   This can be a big security hole, since CONNECT-enabled proxies can
 #   be abused as TCP relays very easily.
-#   By default, i.e. in the absence of a +limit-connect action, Junkbuster
+#   By default, i.e. in the absence of a +limit-connect action, Privoxy
 #   will only allow CONNECT requests to port 443, which is the standard port
 #   for https.
 #   If you want to allow CONNECT for more ports than that, or want to forbid
@@ -375,7 +377,7 @@ shop        = -filter -no-cookies -no-cookies-keep
 # Your favourite blend of filters:
 #
 myfilters   = +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}\
-              +filter{webbugs} +filter{nimda} +filter{banners-by-size}
+              +filter{webbugs} +filter{nimda} +filter{banners-by-size} #+filter{fun}
 
 #... etc.  Customize to your heart's content.
 
@@ -390,7 +392,6 @@ myfilters   = +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}
 +fast-redirects \
 myfilters \
 +no-compression \
-+no-cookies-keep \
 +hide-forwarded \
 +hide-from{block} \
 +hide-referer{forge} \
@@ -416,6 +417,14 @@ myfilters \
 privacy.net
 
 
+#############################################################################
+# Needed for automatic feedback evaluation; Please don't delete!
+#############################################################################
+{+add-header{X-Actions-File-Version: 1.0} -filter -no-popups}
+.privoxy.org/actions
+.oesterhelt.org/actions
+
+
 #############################################################################
 # Test for new GIF deanimation feature.
 # Just try http://www.oesterhelt.org/deanimate-demo with and without it.
@@ -430,7 +439,6 @@ www.oesterhelt.org/deanimate-demo
 # FIXME: Now cookies are allowed by default, do any of these sites
 # need persistent cookies?
 #############################################################################
-
 #{-no-cookies}
 #.javasoft.com
 #.sun.com
@@ -483,11 +491,11 @@ edit.europe.yahoo.com
 .nytimes.com
 
 #############################################################################
-# Please don't re_filter code!
+# Please don't re_filter or modify code!
 #############################################################################
-{-filter}
+{-filter -no-popups}
 .sourceforge.net
-
+.sf.net
 
 #############################################################################
 # Imagelist: