From: Fabian Keil <fk@fabiankeil.de> Date: Sun, 5 Nov 2006 17:22:23 +0000 (+0000) Subject: Don't let "reloadframe" trigger the "adframe" block. Fixes BR 1064466. X-Git-Tag: v_3_0_6~20 X-Git-Url: http://www.privoxy.org/gitweb/%22https:/@default-cgi@/faq/static/@default-cgi@show-url-info?a=commitdiff_plain;h=51964e4458b3106a08cdd9e98fb77067ba3617d1;p=privoxy.git Don't let "reloadframe" trigger the "adframe" block. Fixes BR 1064466. Disable referrer blocking for schneegans.de/sv/?url=referer. Redirect privoxy.org/config to config.privoxy.org. Fixes BR 1474657. --- diff --git a/default.action.master b/default.action.master index 43b4d363..9ac3b2a3 100644 --- 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.39 2006/10/24 10:53:55 hal9 Exp $ +# $Id: default.action.master,v 1.40 2006/11/05 16:46:06 hal9 Exp $ # # Requires : This version requires Privoxy v3.0.4 or later due to # syntax changes. @@ -662,7 +662,7 @@ countr*. /.*ads(new)?/ /(.*/)?(ad|all|nn|db|promo(tion)?)?[-_]?banner /(.*/)?(publicite|werbung|reklaa?m|annonse|maino(kset|nta|s)?/) -/.*(count|track|compteur|adframe|adse?rve?|banner)(er|run)?(\?|\.(pl|cgi|exe|dll|asp|php|cpt)) +/.*(count|track|compteur|(?<!relo)adframe|adse?rve?|banner)(er|run)?(\?|\.(pl|cgi|exe|dll|asp|php|cpt)) /(.*/)?clicktrack ############################################################################# @@ -1216,7 +1216,7 @@ cels.org/.*track .rubberslug.com .freebsd.org .fsf.org -,gnu.org +.gnu.org #MASTER# REMARKS: SF tracker 09/15/06 adiumx.com #MASTER# UNBLOCK-REFERRER: http://google.com 10/01/06 @@ -1560,6 +1560,8 @@ validator.w3.org/check\?uri=referer .petitiononline.com/mod_perl/signed.cgi #MASTER# REMARKS: Tracker bug report 1107806 09/26/06 .telia.se +#MASTER# REMARKS: XML validator that actually works. +schneegans.de/sv/\?url=referer #---------------------------------------------------------------------------- # These animated gifs are either useful or nice: @@ -1696,4 +1698,13 @@ blogs.msdn.com #} #www.versiontracker.com/ +#MASTER# REMARKS: If Privoxy is disabled, requests for config.privoxy.org/ +#MASTER# REMARKS: reach privoxy.org and are redirected to privoxy.org/config. +#MASTER# REMARKS: The instructions tell the user to reload the page with +#MASTER# REMARKS: Privoxy enabled to reach the configuration webinterface, +#MASTER# REMARKS: to make this work we have to intercept the request and revert +#MASTER# REMARKS: the redirection. +{+redirect{http://config.privoxy.org/}} +.privoxy.org/config + #MASTER# set vi:nowrap