X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=actionsfile;h=ead634e6e1c508c08863dd8fcaf837112b876c8c;hp=1b952ef8aca19ac680809ceb94a9338090e43178;hb=3462ac7d32648f95ca8beb336b057a8191f756d5;hpb=4c155b45c7b59f94ef9f1ec03acc301e63197898

diff --git a/actionsfile b/actionsfile
index 1b952ef8..ead634e6 100755
--- a/actionsfile
+++ b/actionsfile
@@ -3,7 +3,7 @@
 #
 # For information, see http://ijbswa.sourceforge.net/
 #
-# $Id: actionsfile,v 1.5 2001/07/26 21:09:18 oes Exp $
+# $Id: actionsfile,v 1.8 2001/10/14 23:18:19 jongfoster Exp $
 #
 #############################################################################
 # Syntax
@@ -228,6 +228,25 @@
 #    has the advantage of the icon being beeing cached by the browser,
 #    which will speed up the display.  
 #
+#
+# +limit-connect{portlist}
+#   The CONNECT methods exists in HTTP to allow access to secure websites
+#   (https:// URLs) through proxies. It works very simply: The proxy
+#   connects to the server on the specified port, and then short-circuits
+#   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
+#   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
+#   CONNECT altogether, you can specify a comma separated list of ports and port
+#   ranges (the latter using dashes, with the minimum defaulting to 0 and max to 65K):
+#
+#   +limit-connect{443} # This is the default and need no be specified.
+#   +limit-connect{80,443} # Ports 80 and 443 are OK.
+#   +limit-connect{-3, 7, 20-100, 500-} # Port less than 3, 7, 20 to 100, and above 500 are OK.
+#
 # +no-compression
 #    Prevent the website from compressing the data. Some websites do
 #    that, which is a problem for junkbuster, since +filter, +no-popup
@@ -291,11 +310,6 @@ shop        = -no-cookies -filter -fast-redirects
 +imageblock = +block +image
 +filter-all = +filter +no-compression
 
-#For people who don't like to type too much:  ;-)
-c0 = +no-cookies
-c1 = -no-cookies
-c2 = -no-cookies-set +no-cookies-read
-c3 = +no-cookies-set -no-cookies-read
 #... etc.  Customize to your heart's content.
 
 #############################################################################
@@ -338,17 +352,20 @@ privacy.net
 .sun.com
 .yahoo.com
 .msdn.microsoft.com
-
-# Alternative way of saying the same thing
-{-no-cookies-set -no-cookies-read}
 .sourceforge.net
 .sf.net
+www.nexgo.de
+.myrealbox.com
+mail.uni.de
+e-tools.freenet.de
+office.freenet.de
 
 # These sites are very complex and require
 # minimal interference.
 {fragile}
 .office.microsoft.com
 .windowsupdate.microsoft.com
+.deutsche-bank-24.de
 
 # Shopping sites - still want to block ads.
 {shop}
@@ -365,11 +382,27 @@ privacy.net
 {-fast-redirects}
 www.ukc.ac.uk/cgi-bin/wac\.cgi\?
 login.yahoo.com
+edit.europe.yahoo.com
+.translate.google.com
+images.google.com
+.altavista.com/.*(like|url|link):http
+.altavista.com/trans.*urltext=http
+.speedfind.de
 
 # Please don't re_filter code!
 {-filter}
 .cvs.sourceforge.net
 
+# Hal reported that fast-redirects break this site
+{-no-cookies -fast-redirects}
+.nytimes.com
+
+# Test for new GIF deanimation feature.
+# Just try http://www.oesterhelt.org/deanimate-demo with and without it.
+#
+{+deanimate-gifs{last}}
+www.oesterhelt.org/deanimate-demo
+
 #############################################################################
 # Imagelist:
 #############################################################################
@@ -398,13 +431,17 @@ www.carbuyer.com/cgi-carbuyer/getimage.cgi
 *.fxweb.com/v2-trackrun\.cgi
 195.63.104.61
 195.63.104.222
-213.165.64.3[89]
-213.165.64.4[1-4]
+213.165.64.3[4-9]
+213.165.64.4[0-4]
 194.221.183.22[1-7]
-a196.g.akamai.net/7/196/2670/000[12]/images.gmx.net/i4/images/.*/
-/cgi-bin/ivw/CP/CGI
+a196.g.akamai.net/7/196/2670/000[1-3]/images\.gmx\.net/.*images/.*/.*/
+/cgi-bin/ivw/CP/
 151.189.8.213/Adimg
 151.189.8.193/Media
+.smartclicks.com/.*/smart(img|banner|host|bar|site)
+.linkexchange.com/.*/showl(ogo|e)
+MoneyBanner.de
+pixel.intares.net/cgi-bin/janus
 
 #############################################################################
 # Blocklist:
@@ -1257,6 +1294,7 @@ www.fair-ist-mehr.de/cgi-bin/bt.pl
 rstrip.namezero.com
 62.26.220.2
 .doubleclick.net
+.adserver.yahoo.com
 
 #############################################################################
 {-block}
@@ -1379,10 +1417,4 @@ www.nexgo.de/.*/bg_banner.jpg
 
 prdownloads.sourceforge.net
 
-# New GIF deanimation feature. Just try http://www.oesterhelt.org/deanimate-demo
-# with and without it.
-#
-{+deanimate-gifs{last}}
-www.oesterhelt.org/deanimate-demo
-
 # End of file