- Make the logfp assertion more strict. As of 1.63, the "||" could

[privoxy.git] / default.action.master

diff --git a/default.action.master b/default.action.master
index fcd3e84..2e17536 100644 (file)
--- a/default.action.master
+++ b/default.action.master
@@ -9,7 +9,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 # 
-#  $Id: default.action.master,v 1.103 2007/12/13 00:38:01 hal9 Exp $
+#  $Id: default.action.master,v 1.107 2008/01/20 13:19:58 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.7 or later due to 
 #                 syntax changes.
@@ -313,6 +313,12 @@
 #    Declares a document as plain text, even if the "Content-Type:" isn't detected 
 #    as such. 
 #
+# +forward-override{forward .}
+# +forward-override{forward 127.0.0.1:8123}
+# +forward-override{forward-socks4a 127.0.0.1:9050 .}
+# +forward-override{forward-socks4a 127.0.0.1:9050 proxy.example.org:8000}
+#   This action overrules the forward directives in the configuration file. 
+#
 # +handle-as-empty-document
 #   This action alone doesn't do anything noticeable. It just marks URLs. If
 #   the block action also applies, the presence or absence of this mark
@@ -331,7 +337,7 @@
 #   prefer to view inside the browser, for example.
 #
 # +hide-forwarded-for-headers
-#   Block any existing X-Forwarded-for header, and do not add a new one.
+#   Block any existing X-Forwarded-for header.
 #
 # +hide-from-header{block}
 # +hide-from-header{spam@sittingduck.xqq}
@@ -1379,6 +1385,10 @@ switch.atdmt.com/action/
 #MASTER# UNBLOCK-REFERRER: redirect from http://go.microsoft.com/fwlink?linkid=51093
 #MASTER# REMARKS: Actionsfile feedback item #1757121 2007-07-19
 .microsoft.com/.*/adschema/
+#MASTER# UNBLOCK-REFERRER: http://upload.wikimedia.org/wikipedia/en/a/ad/Picturecarnegie.jpg
+.wikimedia.org/
+#MASTER# UNBLOCK-REFERRER: http://en.wikipedia.org/wiki/Advertisement
+.wikipedia.org/
 
 #############################################################################
 # Site-specific special rules:
@@ -1534,6 +1544,8 @@ del.icio.us/
 access.adobe.com/access/getStatus.do\?jobid=&srcPdfUrl=
 #MASTER# PROBLEM-URL: http://view.samurajdata.se/ps.php?url=http%3A%2F%2Fcups.cs.cmu.edu%2Fsoups%2F2007%2Fproceedings%2Fp41_clark.pdf&submit=View%21
 view.samurajdata.se/ps\.php\?url=
+#MASTER# PROBLEM-URL: http://www.blogger.com/navbar.g?targetBlogID=8919860543765866292&blogName=Kickin%27+the+Darkness&publishMode=PUBLISH_MODE_HOSTED&navbarType=BLUE&layoutType=LAYOUTS&homepageUrl=http%3A%2F%2Fblog.kickin-the-darkness.com%2F&searchRoot=http%3A%2F%2Fblog.kickin-the-darkness.com%2Fsearch
+.blogger.com/navbar\.g
 
 #----------------------------------------------------------------------------
 # No filtering for sourcecode or other automatically parsed content