Ditch previously missed 'Bookmarklets' section in the templates

[privoxy.git] / default.action.master

diff --git a/default.action.master b/default.action.master
index 9c82aee..64c4dd4 100644 (file)
--- a/default.action.master
+++ b/default.action.master
@@ -11,7 +11,7 @@
 #
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 #
-#  $Id: default.action.master,v 1.308 2014/07/14 13:01:28 fabiankeil Exp $
+#  $Id: default.action.master,v 1.314 2014/11/28 14:13:22 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
@@ -30,7 +30,7 @@
 # http://www.privoxy.org/user-manual/contact.html
 #
 # The current development version of this file is located:
-# http://ijbswa.cvs.sourceforge.net/*checkout*/ijbswa/current/default.action.master
+# http://ijbswa.cvs.sourceforge.net/viewvc/ijbswa/current/default.action.master
 #
 #############################################################################
 # Syntax
@@ -392,6 +392,17 @@
 #    +limit-connect{-}                     # All ports are OK
 #    +limit-connect{,}                     # No HTTPS/SSL traffic is allowed
 #
+# +limit-cookie-lifetime{lifetime in minutes}
+#
+#    This action reduces the lifetime of HTTP cookies coming from the
+#    server to the specified number of minutes, starting from the time
+#    the cookie passes Privoxy.
+#
+#    Cookies with a lifetime below the limit are not modified.
+#    The lifetime of session cookies is set to the specified limit.
+#    The effect of this action depends on the server.
+#     If the parameter is "0", this action behaves like session-cookies-only.
+#
 # +overwrite-last-modified{block}
 # +overwrite-last-modified{reset-to-request-time}
 # +overwrite-last-modified{randomize}
@@ -677,6 +688,8 @@ metrics.torproject.org/
 linuxcounter.net/
 # URL = http://adinablafasel.example.org/
 adina*.
+# URL = http://adelelimedesign.deviantart.com/
+adele*.
 
 #############################################################################
 # Generic block patterns by path:
@@ -1404,8 +1417,6 @@ www.xml.eshop.msn.com/tracksponsorimpression.asp
 content.ipro.com
 #MASTER# BLOCK-REFERRER: http://www.weatherbug.com/default.asp 10/05/06
 .247realmedia.com
-#MASTER# BLOCK-REFERRER: http://www.samachar.com/ 10/05/06
-.sify.com
 #MASTER# BLOCK-REFERRER: http://www.nbc4.com/news/2672416/detail.html 10/06/06
 .searchignite.com
 #MASTER# BLOCK-REFERRER: http://www.sdtimes.com/ 10/07/06
@@ -2083,6 +2094,8 @@ webcache.googleusercontent.com/
 .facebook.com/plugins/like.php
 # URL = http://creativecommons.org/choose/zero/confirm?license-class=zero&name=...&actor_href=http%3A%2F%2Fexample.org%2F&work_title=...&work_jurisdiction=DE&confirm=confirm&understand=confirm&lang=de&field1=weiter
 creativecommons.org/
+# URL = http://ixquick-proxy.com/do/spg/proxy?ah=&c=hnf&rid=LHLOLMSTPRKK&proxiedformtype=&q=%22lord+lucan%22&sp=19f738b4691d795804a6bc60c5b2c766&ts=MTQxMjg5NTcxNw%3D%3D&u=https%3A%2F%2Fen.wikipedia.org%2Fwiki%2FJohn_Bingham%2C_7th_Earl_of_Lucan&rpos=1&l=english_uk&cat=web&zst=1412895717.21&znt=1412895717.2125&rl=NONE&hlq=https%3A%2F%2Fstartpage.com%2Fdo%2Fsearch&mtppabp=1&mtppcat=web&mtppcmd=process_search&mtppenginecount=1&mtppflag_ac=0&mtpplanguage=english_uk&udata=e9a958f0a1bae930ec8f60fdef42ceb3&/file.gz
+ixquick-proxy.com/
 
 {+redirect{s@.*url=@http://@} -block}
 # Sticky Actions = +redirect -block
@@ -2248,6 +2261,8 @@ javabog.dk/ijk/
 .dgb-tagungszentren.de/
 # URL = http://creativecommons.org/licenses/
 creativecommons.org/
+# URL = http://kggp.de/Blogosphere/blog/2014/11/07/frankfurtmain-hessen-polizeibeamter-muss-sich-vor-gericht-verantworten/
+kggp.de/
 
 {-filter{banners-by-link}}
 # Sticky Actions = -filter{banners-by-link}