X-Git-Url: http://www.privoxy.org/gitweb/06member.jpg?a=blobdiff_plain;f=default.filter;h=db81aecab29e782916ed5552a258c252256ede80;hb=d67a19d323fd9d27b4ae723435b045abb400fa61;hp=7f37eb0ab33ddf2f5f6b6d073a25fe7e3164c6d4;hpb=f3ea9cdda9262225ba746cc6a4ab8483d8e8fe9a;p=privoxy.git

diff --git a/default.filter b/default.filter
index 7f37eb0a..db81aeca 100644
--- a/default.filter
+++ b/default.filter
@@ -2,11 +2,11 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.filter,v $
 # 
-#  $Id: default.filter,v 1.53 2007/12/23 15:48:12 fabiankeil Exp $
+#  $Id: default.filter,v 1.60 2008/04/26 10:36:41 fabiankeil Exp $
 #
 #  Purpose     :  Rules to process the content of web pages
 # 
-#  Copyright   :  Written by and Copyright (C) 2001 - 2007 the
+#  Copyright   :  Written by and Copyright (C) 2001-2008 the
 #                 Privoxy team. http://www.privoxy.org/
 #
 # We value your feedback. However, to provide you with the best support,
@@ -293,7 +293,7 @@ s@<a\s+href\s*=\s*(['"]?)([^>\1\s]*?(?:\
   adclick                             # See www.dn.se \
 | advert                              # see dict.leo.org \
 | atwola\.com/(?:link|redir)          # see www.cnn.com \
-| /jump/                              # redirs for doublecklick.net ads \
+| doubleclick\.net/jump/              # redirs for doublecklick.net ads \
 | counter                             # common \
 | (?<!&type=)tracker                  # (&type=tracker is used in sf's project statistics) \
 | adlog\.pl                           # see sf.net \
@@ -597,8 +597,8 @@ s@</head>@\n<style type="text/css">\n\
  /* Style sheet inserted by Privoxy's yahoo filter. */\n\
  \#symadbn, \#ymadbn, .yschbox, .yschhd, .bbox, \#yschsec, \#sec,\
  \#yschanswr, .yschftad, .yschspn, .yschspns, \#ygrp-sponsored-links,\
- \#ks-ypn-ads, .ad, \#ygrp-vital {display: none !important;}\n\
- \#yschpri, \#yschweb, \#pri, \#web {width: 100% !important; max-width: 100% !important;}\n\
+ \#ks-ypn-ads, .ad, \#east, \#ygrp-vital {display: none !important;}\n\
+ \#yschpri, \#yschweb, \#pri, \#web, \#main {width: 100% !important; max-width: 100% !important;}\n\
  \#yschqcon, \#yschtg {width: auto !important; /* No useless horizontal scrollbar please */}\n\
 </style>\n$0@
 
@@ -606,14 +606,13 @@ s@</head>@\n<style type="text/css">\n\
 #
 # msn: CSS-based block for MSN text ads. Also removes tracking URLs
 #      and a width limitation.
-#      XXX: the width limitation part is currently broken.
 #
 #################################################################################
 FILTER: msn CSS-based block for MSN text ads. Also removes tracking URLs and a width limitation.
 
 s@</head>@<style type="text/css">\n\
  /* Style sheet inserted by Privoxy's msn filter. */\n\
- .msn_ads, \#at, \#ar {display: none !important;}\n\
+ .msn_ads, \#at, \#ar, .mktmsg {display: none !important;}\n\
  \#results, .flank, .results_area_flank, .results_area_stroke,\n\
  \#results_area, .SearchSection, .not, .sc_rslth1\n\
 .content, \#sw_foot, \#bf, \#sw_content, \#sidebar, \#pag\n\
@@ -621,6 +620,7 @@ s@</head>@<style type="text/css">\n\
  max-width: 100% !important; /* width:100% sometimes causes horizontal scrollbars */}\n\
  /* Remove "suggestions". They are next to worthless but partly overlap with the search results */\n\
  .suggestion, \#nys_right, \#nys {clear: both; display:none;}\n\
+ \#content {padding-right: 0;}\n\
  </style>\n$0@
 s@(<div[^>]*) id=(["']?)ads_[^\2]*\2@$1 class="msn_ads"@Uig
 s@(<a[^>]*href=\")http://g.msn.com/.*\?(http://.*)(&amp;&amp;DI=.*)(\")@$1$2$4@Ug
@@ -727,7 +727,7 @@ s@^((?:Referer|Host):\s*(?:https?://)?[^/]*)\.[^\./]*?\.exit@$1@i
 SERVER-HEADER-FILTER: less-download-windows Prevent annoying download windows for content types the browser can handle itself.
 
 s@^Content-Disposition:.*filename=(["']?).*\.(png|gif|jpe?g|diff?|d?patch|c|h|pl|shar)\1.*$@@i
-s@^(Content-Type:)\s*(?:message/(?:news|rfc822)|text/x-.*|application/x-sh)\s*@$1 text/plain@i
+s@^(Content-Type:)\s*(?:message/(?:news|rfc822)|text/x-.*|application/x-sh(?:\s|$))\s*@$1 text/plain@i
 
 #################################################################################
 #
@@ -796,12 +796,12 @@ s@^User-Agent:.*@$0@i
 
 #################################################################################
 #
-# content-type: Tags the request with the content type declarded by the server.
+# content-type: Tags the request with the content type declared by the server.
 #
 #################################################################################
-SERVER-HEADER-TAGGER: content-type Tags the request with the content type declarded by the server.
+SERVER-HEADER-TAGGER: content-type Tags the request with the content type declared by the server.
 
-s@^Content-Type:\s*([^;]*).*@$1@i
+s@^Content-Type:\s*([^;]+).*@$1@i
 
 #################################################################################
 #
@@ -830,6 +830,33 @@ s@^X-Privoxy-Control:.*@@i
 #
 #  Revisions   :
 #     $Log: default.filter,v $
+#     Revision 1.60  2008/04/26 10:36:41  fabiankeil
+#     Let the msn filter hide another class.
+#
+#     Revision 1.59  2008/04/23 16:18:18  fabiankeil
+#     s@declarded@declared@
+#
+#     Revision 1.58  2008/02/02 15:27:19  fabiankeil
+#     Yet another yahoo update to get the width limitation removal working again.
+#
+#     Revision 1.57  2008/01/26 15:45:39  fabiankeil
+#     Don't let the less-download-windows filter mess up
+#     "Content-Type: application/x-shockwave-flash" headers.
+#
+#     Revision 1.56  2008/01/25 19:12:40  fabiankeil
+#     - Add yet another new yahoo ad id.
+#     - Don't let the first banners-by-link job punish URLs for merely
+#       containing the pattern "/jump/" when it should really look for
+#       "doubleclick\.net/jump/".
+#
+#     Revision 1.55  2007/12/31 19:53:59  fabiankeil
+#     Let the msn filter remove the width limitation again.
+#
+#     Revision 1.54  2007/12/31 19:11:31  fabiankeil
+#     - Let the yahoo filter remove the width limitation again.
+#     - Teach the blogspot filter to remove useless feed comment
+#       titles that only contain the beginning of the actual comment.
+#
 #     Revision 1.53  2007/12/23 15:48:12  fabiankeil
 #     - Lo and behold, the CSS fix for the MSN buttons is no longer necessary.
 #     - Add some new selectors the msn filter should hide.
@@ -1204,7 +1231,3 @@ s@^X-Privoxy-Control:.*@@i
 #     Revision 1.6  2001/06/09 14:01:57  swa
 #     header. cosmetics. default: no messing ala microsuck.
 #
-#
-# 
-
-