X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=user.action;h=4d93a804eec5d181df3f2ee6622270103b9c176b;hp=65dacd74b05b08b8fcc9ad56622f3c46d9cbae44;hb=66b1e23830d60ea98b0ba2ac5644ef24a45f9c55;hpb=173db7c670935dd7c9320c99f9ee514de1efd86f

diff --git a/user.action b/user.action
index 65dacd74..4d93a804 100644
--- a/user.action
+++ b/user.action
@@ -1,11 +1,9 @@
 ######################################################################
 # 
-#  File        :  $Source: /cvsroot/ijbswa/current/user.action,v $
+#  File        :  user.action
 # 
-#  $Id: user.action,v 1.7 2006/10/04 00:37:05 hal9 Exp $
-#
 #  Purpose     :  User-maintained actions file, see
-#                 http://www.privoxy.org/user-manual/actions-file.html
+#                 https://www.privoxy.org/user-manual/actions-file.html
 #
 ######################################################################
 
@@ -14,7 +12,7 @@
 # safe from updates to default.action.) Later defined actions always
 # take precedence, so anything defined here should have the last word.
 
-# See http://www.privoxy.org/user-manual/actions-file.html, or the 
+# See https://www.privoxy.org/user-manual/actions-file.html, or the
 # comments in default.action, for an explanation of what an "action" is
 # and what each action does.
 
@@ -49,14 +47,14 @@
 +crunch-all-cookies = +crunch-incoming-cookies +crunch-outgoing-cookies
 -crunch-all-cookies = -crunch-incoming-cookies -crunch-outgoing-cookies
  allow-all-cookies  = -crunch-all-cookies -session-cookies-only -filter{content-cookies}
- allow-popups       = -filter{all-popups} -kill-popups -filter{unsolicited-popups}
+ allow-popups       = -filter{all-popups} -filter{unsolicited-popups}
 +block-as-image     = +block{Blocked image request.} +handle-as-image
 -block-as-image     = -block
 
 # These aliases define combinations of actions
 # that are useful for certain types of sites:
 #
-fragile     = -block -crunch-all-cookies -filter -fast-redirects -hide-referer -kill-popups -prevent-compression
+fragile     = -block -crunch-all-cookies -filter -fast-redirects -hide-referer -prevent-compression
 shop        = -crunch-all-cookies allow-popups
 
 # Your favourite blend of filters:
@@ -92,7 +90,7 @@ allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
 # windows, but you have chosen to kill popups uncoditionally by default.
 # This will allow it for your-example-bank.com:
 #
-{ -filter{all-popups} -kill-popups }
+{ -filter{all-popups} }
 .banking.example.com
 
 # Some hosts and some file types you may not want to filter for
@@ -166,4 +164,41 @@ www.example.com/nasty-ads/sponsor.gif
 { +set-image-blocker{blank} }
 #/
 
-## set vi:nowrap tw=72
+# Enable the following section (not the regression-test directives)
+# to rewrite and redirect click-tracking URLs on news.google.com.
+# Disabling JavaScript should work as well and probably works more reliably.
+#
+# Redirected URL = http://news.google.com/news/url?ct2=us%2F0_0_s_1_1_a&sa=t&usg=AFQjCNHJWPc7ffoSXPSqBRz55jDA0KgxOQ&cid=8797762374160&url=http%3A%2F%2Fonline.wsj.com%2Farticle%2FSB10001424052970204485304576640791304008536.html&ei=YcqeTsymCIjxggf8uQE&rt=HOMEPAGE&vm=STANDARD&bvm=section&did=-6537064229385238098
+# Redirect Destination = http://online.wsj.com/article/SB10001424052970204485304576640791304008536.html
+# Ignore = Yes
+#
+#{+fast-redirects{check-decoded-url}}
+#news.google.com/news/url.*&url=http.*&
+
+# Enable the following section (not the regression-test directives)
+# to block various Facebook "like" and similar tracking URLs.  At the
+# time this section was added it was reported to not break Facebook
+# itself but this may have changed by the time you read this. This URL
+# list is probably incomplete and if you don't have an account anyway,
+# you may prefer to block the whole domain.
+#
+# Blocked URL = http://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Ffacebook.com%2Farstechnica&width=300&colorscheme=light&show_faces=false&stream=false&header=false&height=62&border_color=%23FFFFFF
+# Ignore = Yes
+# Blocked URL = http://www.facebook.com/plugins/activity.php?site=arstechnica.com&width=300&height=370&header=false&colorscheme=light&recommendations=false&border_color=%23FFFFFF
+# Ignore = Yes
+# Blocked URL = http://www.facebook.com/plugins/fan.php?api_key=368513495882&connections=10&height=250&id=8304333127&locale=en_US&sdk=joey&stream=false&width=377
+# Ignore = Yes
+# Blocked URL = http://www.facebook.com/plugins/like.php?api_key=368513495882&channel_url=http%3A%2F%2Fstatic.ak.fbcdn.net%2Fconnect%2Fxd_proxy.php%3Fversion%3D3%23cb%3Df13997452c%26origin%3Dhttp%253A%252F%252Fonline.wsj.com%252Ff1b037e354%26relation%3Dparent.parent%26transport%3Dpostmessage&extended_social_context=false&href=http%3A%2F%2Fonline.wsj.com%2Farticle%2FSB10001424052970204485304576640791304008536.html&layout=button_count&locale=en_US&node_type=link&ref=wsj_share_FB&sdk=joey&send=false&show_faces=false&width=90
+# Ignore = Yes
+#
+#{+block{Facebook "like" and similar tracking URLs.}}
+#www.facebook.com/(extern|plugins)/(login_status|like(box)?|activity|fan)\.php
+
+######### Examples for SSL actions #########
+# Following section enables TLS/SSL filtering for all sites defined by pattern and requested by HTTPS.
+# {+https-inspection}
+# privoxy.org
+
+# Following section turns off certificate verification for all sites defined by pattern.
+# {+ignore-certificate-errors}
+# privoxy.org