From 97110184221edacdb7d4dfc29de0e38d63f4d831 Mon Sep 17 00:00:00 2001 From: swa Date: Tue, 26 Mar 2002 22:29:56 +0000 Subject: [PATCH] we have a new homepage! --- AUTHORS | 3 +- ChangeLog | 2 +- GNUmakefile.in | 9 +- Makefile | 7 +- README | 10 +- acconfig.h | 6 +- actionlist.h | 5 +- actions.c | 7 +- actions.h | 7 +- advanced.action | 6 +- amiga.c | 7 +- amiga.h | 7 +- basic.action | 6 +- cgi.c | 7 +- cgi.h | 7 +- cgiedit.c | 7 +- cgiedit.h | 7 +- cgisimple.c | 7 +- cgisimple.h | 7 +- config.h.win | 5 +- config.h.win32threads.win | 5 +- configure.in | 9 +- contrib.sh | 119 +- cygwin.h | 7 +- deanimate.c | 7 +- deanimate.h | 7 +- default.action | 6 +- default.filter | 5 +- doc/gpl.html | 8 +- doc/source/developer-manual.sgml | 19 +- doc/source/faq.sgml | 23 +- doc/source/user-manual.sgml | 35 +- doc/text/developer-manual.txt | 21 +- doc/text/faq.txt | 1442 ++++----- doc/text/user-manual.txt | 3768 ++++++++++++------------ doc/webserver/README.txt | 5 +- doc/webserver/index.html | 4 +- encode.c | 7 +- encode.h | 7 +- errlog.c | 7 +- errlog.h | 7 +- filters.c | 7 +- filters.h | 7 +- gateway.c | 7 +- gateway.h | 7 +- intermediate.action | 6 +- jbsockets.c | 7 +- jbsockets.h | 7 +- jcc.c | 7 +- jcc.h | 7 +- killpopup.c | 7 +- killpopup.h | 7 +- list.c | 7 +- list.h | 7 +- loadcfg.c | 7 +- loadcfg.h | 7 +- loaders.c | 7 +- loaders.h | 7 +- miscutil.c | 7 +- miscutil.h | 7 +- parsers.c | 7 +- parsers.h | 7 +- privoxy-rh.spec | 12 +- privoxy-suse.spec | 13 +- privoxy.1 | 6 +- privoxy.init | 5 +- privoxy.init.suse | 5 +- privoxy.logrotate | 5 +- privoxy.monthly | 5 +- privoxy.weekly | 5 +- project.h | 7 +- ssplit.c | 7 +- ssplit.h | 7 +- templates/edit-actions-add-url-form | 5 +- templates/edit-actions-for-url | 5 +- templates/edit-actions-list | 5 +- templates/edit-actions-list-section | 5 +- templates/edit-actions-list-url | 5 +- templates/edit-actions-remove-url-form | 5 +- templates/edit-actions-url-form | 5 +- urlmatch.c | 7 +- urlmatch.h | 7 +- 82 files changed, 3120 insertions(+), 2799 deletions(-) diff --git a/AUTHORS b/AUTHORS index b2c1ed35..9bece11a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -47,6 +47,7 @@ or made suggestions. These include (in alphabetical order): If we've missed you off this list, please let us know! +Privoxy team. http://www.privoxy.org/ ijbswa-developers@lists.sourceforge.net -http://ijbswa.sourceforge.net/ + diff --git a/ChangeLog b/ChangeLog index 4f7cf363..e16c454b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -175,7 +175,7 @@ being a mix of "U.S. English", "U.K. English" and "Irish English". ---------------------------------------------------------------------- Copyright : Written by and Copyright (C) 2001 the SourceForge - Privoxy team. http://ijbswa.sourceforge.net + Privoxy team. http://www.privoxy.org/ Based on the Internet Junkbuster originally written by and Copyright (C) 1997 Anonymous Coders and diff --git a/GNUmakefile.in b/GNUmakefile.in index bcb1f414..1e697f26 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,9 +1,9 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.30 2002/03/25 12:52:25 swa Exp $ +# $Id: GNUmakefile.in,v 1.31 2002/03/26 14:00:18 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -524,7 +524,7 @@ $(PROGRAM): $(OBJS) $(W32_FILES) $(LD) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) clean: - $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) + $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) $(PROGRAM) junkbuster clobber: clean $(RM) $(PROGRAM) cscope.* logfile *.pdb *.lib *.exp `find . -name tags` `find . -name TAGS` config.status config.h.in config.log junkbuster.log privoxy.log config.cache *~ *.tar.gz configure @@ -557,6 +557,9 @@ install: all ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.31 2002/03/26 14:00:18 swa +# fixed make tarball, tarball-dist, tarball-clean +# # Revision 1.30 2002/03/25 12:52:25 swa # new targets # diff --git a/Makefile b/Makefile index 3c79429d..c195c8dc 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.1 2001/12/01 11:24:29 jongfoster Exp $ +# $Id: Makefile,v 1.2 2002/03/24 13:25:42 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -26,6 +26,9 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: Makefile,v $ +# Revision 1.2 2002/03/24 13:25:42 swa +# name change related issues +# # Revision 1.1 2001/12/01 11:24:29 jongfoster # Will display a warning if non-GNU make is used # diff --git a/README b/README index d91b496d..d4cd5a6e 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ * Purpose : README file to give a short intro. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,7 +33,7 @@ This README is included with the development version of Privoxy, which will eventually become Privoxy v3.0 (and soon we hope!). See -http://ijbswa.sourceforge.net. +http://www.privoxy.org/. Privoxy is a web proxy with advanced filtering capabilities for protecting privacy, filtering web page content, managing cookies, @@ -61,7 +61,7 @@ WARNING! If upgrading from earlier versions of this project via RPM packages, the new package will delete any previously installed 'Junkbuster' packages. -IMPORTANT! READ! Configuration Change as of 03/04/02: The default +IMPORTANT! READ! Configuration Change as of 3 Apr 2002: The default listening port is now 8118 due to conflicts with port 8000 assignment. You will need to change your browser if upgrading!!! And maybe firewall, etc. @@ -118,7 +118,7 @@ of these included with varying degrees of aggressiveness. On Unix-like systems, these files are installed in /etc/privoxy. On Windows, then wherever the executable itself is installed. There are many significant changes and advances since Junkbuster v2.0.x. The user-manual has a run down of -configuration options, and examples: http://ijbswa.sourceforge.net/user-manual/. +configuration options, and examples: http://www.privoxy.org/user-manual/. Be sure to set your browser(s) for HTTP/HTTPS Proxy at :, or whatever you specify in the config file under 'listen-address'. @@ -177,4 +177,4 @@ here too. ------------------------------------------------------------------------- ijbswa-developers@lists.sourceforge.net -$Id: README,v 1.19 2002/03/24 16:15:18 swa Exp $ +$Id: README,v 1.20 2002/03/24 19:57:28 hal9 Exp $ diff --git a/acconfig.h b/acconfig.h index b90c3db1..bf746a61 100644 --- a/acconfig.h +++ b/acconfig.h @@ -11,7 +11,7 @@ * getting ludicrously long with feature defines. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -37,6 +37,10 @@ * * Revisions : * $Log: acconfig.h,v $ + * Revision 1.21 2002/03/24 14:31:08 swa + * remove more crappy files. set RPM + * release version correctly. + * * Revision 1.20 2002/03/24 13:46:44 swa * name change related issue. * diff --git a/actionlist.h b/actionlist.h index fbf4810f..c2ae6b48 100644 --- a/actionlist.h +++ b/actionlist.h @@ -13,7 +13,7 @@ * DEFINE_ACTION_ALIAS * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -39,6 +39,9 @@ * * Revisions : * $Log: actionlist.h,v $ + * Revision 1.14 2002/03/24 16:32:08 jongfoster + * Removing logo option + * * Revision 1.13 2002/03/24 15:23:33 jongfoster * Name changes * diff --git a/actions.c b/actions.c index 875e1d9e..e0f3fcad 100644 --- a/actions.c +++ b/actions.c @@ -1,4 +1,4 @@ -const char actions_rcs[] = "$Id: actions.c,v 1.24 2002/03/16 23:54:06 jongfoster Exp $"; +const char actions_rcs[] = "$Id: actions.c,v 1.25 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/actions.c,v $ @@ -7,7 +7,7 @@ const char actions_rcs[] = "$Id: actions.c,v 1.24 2002/03/16 23:54:06 jongfoster * Functions declared include: FIXME * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,9 @@ const char actions_rcs[] = "$Id: actions.c,v 1.24 2002/03/16 23:54:06 jongfoster * * Revisions : * $Log: actions.c,v $ + * Revision 1.25 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.24 2002/03/16 23:54:06 jongfoster * Adding graceful termination feature, to help look for memory leaks. * If you enable this (which, by design, has to be done by hand diff --git a/actions.h b/actions.h index 98c3724c..04434e28 100644 --- a/actions.h +++ b/actions.h @@ -1,6 +1,6 @@ #ifndef ACTIONS_H_INCLUDED #define ACTIONS_H_INCLUDED -#define ACTIONS_H_VERSION "$Id: actions.h,v 1.7 2002/03/16 23:54:06 jongfoster Exp $" +#define ACTIONS_H_VERSION "$Id: actions.h,v 1.8 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/actions.h,v $ @@ -9,7 +9,7 @@ * Functions declared include: FIXME * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,9 @@ * * Revisions : * $Log: actions.h,v $ + * Revision 1.8 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.7 2002/03/16 23:54:06 jongfoster * Adding graceful termination feature, to help look for memory leaks. * If you enable this (which, by design, has to be done by hand diff --git a/advanced.action b/advanced.action index 8c6e95a8..391e9884 100644 --- a/advanced.action +++ b/advanced.action @@ -2,10 +2,10 @@ # # File : $Source: /cvsroot/ijbswa/current/advanced.action,v $ # -# $Id: advanced.action,v 1.1 2002/03/24 11:37:39 jongfoster Exp $ +# $Id: advanced.action,v 1.2 2002/03/24 13:02:18 swa Exp $ # # Purpose : Most agressive actions file, see -# http://ijbswa.sourceforge.net/faq/questions.html#CONFIGFILES +# http://www.privoxy.org/faq/questions.html#CONFIGFILES # # We value your feedback. However, to provide you with the best support, # please note: @@ -56,7 +56,7 @@ ###################################################################### # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and diff --git a/amiga.c b/amiga.c index 53daf056..493a00eb 100644 --- a/amiga.c +++ b/amiga.c @@ -1,4 +1,4 @@ -const char amiga_rcs[] = "$Id: amiga.c,v 1.7 2002/03/24 13:25:43 swa Exp $"; +const char amiga_rcs[] = "$Id: amiga.c,v 1.8 2002/03/25 19:32:15 joergs Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/amiga.c,v $ @@ -6,7 +6,7 @@ const char amiga_rcs[] = "$Id: amiga.c,v 1.7 2002/03/24 13:25:43 swa Exp $"; * Purpose : Amiga-specific declarations. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General @@ -28,6 +28,9 @@ const char amiga_rcs[] = "$Id: amiga.c,v 1.7 2002/03/24 13:25:43 swa Exp $"; * * Revisions : * $Log: amiga.c,v $ + * Revision 1.8 2002/03/25 19:32:15 joergs + * Name in version string changed from junkbuster to Privoxy. + * * Revision 1.7 2002/03/24 13:25:43 swa * name change related issues * diff --git a/amiga.h b/amiga.h index 6374ee5d..580dc32d 100644 --- a/amiga.h +++ b/amiga.h @@ -1,7 +1,7 @@ #ifdef AMIGA #ifndef AMIGA_H_INCLUDED #define AMIGA_H_INCLUDED -#define AMIGA_H_VERSION "$Id: amiga.h,v 1.7 2002/03/03 09:18:03 joergs Exp $" +#define AMIGA_H_VERSION "$Id: amiga.h,v 1.8 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/amiga.h,v $ @@ -9,7 +9,7 @@ * Purpose : Amiga-specific declarations. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General @@ -31,6 +31,9 @@ * * Revisions : * $Log: amiga.h,v $ + * Revision 1.8 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.7 2002/03/03 09:18:03 joergs * Made jumbjuster work on AmigaOS again. * diff --git a/basic.action b/basic.action index 2005cd46..322e8041 100644 --- a/basic.action +++ b/basic.action @@ -2,10 +2,10 @@ # # File : $Source: /cvsroot/ijbswa/current/basic.action,v $ # -# $Id: basic.action,v 1.1 2002/03/24 11:37:39 jongfoster Exp $ +# $Id: basic.action,v 1.2 2002/03/24 13:02:18 swa Exp $ # # Purpose : Very basic actions file, see -# http://ijbswa.sourceforge.net/faq/questions.html#CONFIGFILES +# http://www.privoxy.org/faq/questions.html#CONFIGFILES # # We value your feedback. However, to provide you with the best support, # please note: @@ -343,7 +343,7 @@ rstrip.namezero.com ###################################################################### # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and diff --git a/cgi.c b/cgi.c index a40a5c9b..a5694414 100644 --- a/cgi.c +++ b/cgi.c @@ -1,4 +1,4 @@ -const char cgi_rcs[] = "$Id: cgi.c,v 1.55 2002/03/24 16:55:06 oes Exp $"; +const char cgi_rcs[] = "$Id: cgi.c,v 1.56 2002/03/24 17:50:46 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgi.c,v $ @@ -12,7 +12,7 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.55 2002/03/24 16:55:06 oes Exp $"; * * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -38,6 +38,9 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.55 2002/03/24 16:55:06 oes Exp $"; * * Revisions : * $Log: cgi.c,v $ + * Revision 1.56 2002/03/24 17:50:46 jongfoster + * Fixing compile error if actions file editor disabled + * * Revision 1.55 2002/03/24 16:55:06 oes * Making GIF checkerboard transparent * diff --git a/cgi.h b/cgi.h index cc3ba0cf..c7391bc6 100644 --- a/cgi.h +++ b/cgi.h @@ -1,6 +1,6 @@ #ifndef CGI_H_INCLUDED #define CGI_H_INCLUDED -#define CGI_H_VERSION "$Id: cgi.h,v 1.22 2002/03/24 13:25:43 swa Exp $" +#define CGI_H_VERSION "$Id: cgi.h,v 1.23 2002/03/24 16:18:15 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgi.h,v $ @@ -12,7 +12,7 @@ * * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -38,6 +38,9 @@ * * Revisions : * $Log: cgi.h,v $ + * Revision 1.23 2002/03/24 16:18:15 jongfoster + * Removing old logo + * * Revision 1.22 2002/03/24 13:25:43 swa * name change related issues * diff --git a/cgiedit.c b/cgiedit.c index 2766f115..babb761b 100644 --- a/cgiedit.c +++ b/cgiedit.c @@ -1,4 +1,4 @@ -const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.23 2002/03/24 13:32:41 swa Exp $"; +const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.24 2002/03/24 15:23:33 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgiedit.c,v $ @@ -16,7 +16,7 @@ const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.23 2002/03/24 13:32:41 swa Exp $" * Stick to the short names in this file for consistency. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -42,6 +42,9 @@ const char cgiedit_rcs[] = "$Id: cgiedit.c,v 1.23 2002/03/24 13:32:41 swa Exp $" * * Revisions : * $Log: cgiedit.c,v $ + * Revision 1.24 2002/03/24 15:23:33 jongfoster + * Name changes + * * Revision 1.23 2002/03/24 13:32:41 swa * name change related issues * diff --git a/cgiedit.h b/cgiedit.h index b5fedbbd..72721c2b 100644 --- a/cgiedit.h +++ b/cgiedit.h @@ -1,6 +1,6 @@ #ifndef CGIEDIT_H_INCLUDED #define CGIEDIT_H_INCLUDED -#define CGIEDIT_H_VERSION "$Id: cgiedit.h,v 1.5 2002/01/22 23:24:48 jongfoster Exp $" +#define CGIEDIT_H_VERSION "$Id: cgiedit.h,v 1.6 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgiedit.h,v $ @@ -11,7 +11,7 @@ * * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -37,6 +37,9 @@ * * Revisions : * $Log: cgiedit.h,v $ + * Revision 1.6 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.5 2002/01/22 23:24:48 jongfoster * Adding edit-actions-section-swap * diff --git a/cgisimple.c b/cgisimple.c index d210b7af..733c3500 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.21 2002/03/24 15:23:33 jongfoster Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.22 2002/03/24 16:18:15 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -10,7 +10,7 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.21 2002/03/24 15:23:33 jongfo * * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,6 +36,9 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.21 2002/03/24 15:23:33 jongfo * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.22 2002/03/24 16:18:15 jongfoster + * Removing old logo + * * Revision 1.21 2002/03/24 15:23:33 jongfoster * Name changes * diff --git a/cgisimple.h b/cgisimple.h index 87004052..753afcc2 100644 --- a/cgisimple.h +++ b/cgisimple.h @@ -1,6 +1,6 @@ #ifndef CGISIMPLE_H_INCLUDED #define CGISIMPLE_H_INCLUDED -#define CGISIMPLE_H_VERSION "$Id: cgisimple.h,v 1.8 2002/03/16 23:54:06 jongfoster Exp $" +#define CGISIMPLE_H_VERSION "$Id: cgisimple.h,v 1.9 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.h,v $ @@ -12,7 +12,7 @@ * * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -38,6 +38,9 @@ * * Revisions : * $Log: cgisimple.h,v $ + * Revision 1.9 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.8 2002/03/16 23:54:06 jongfoster * Adding graceful termination feature, to help look for memory leaks. * If you enable this (which, by design, has to be done by hand diff --git a/config.h.win b/config.h.win index e52458bb..01411178 100755 --- a/config.h.win +++ b/config.h.win @@ -11,7 +11,7 @@ * getting ludicrously long with feature defines. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -37,6 +37,9 @@ * * Revisions : * $Log: config.h.win,v $ + * Revision 1.18 2002/03/24 17:08:12 jongfoster + * Version number bump + * * Revision 1.17 2002/03/24 13:33:26 swa * name change related issues * diff --git a/config.h.win32threads.win b/config.h.win32threads.win index 6b4cf9e1..ac28b767 100644 --- a/config.h.win32threads.win +++ b/config.h.win32threads.win @@ -11,7 +11,7 @@ * getting ludicrously long with feature defines. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -37,6 +37,9 @@ * * Revisions : * $Log: config.h.win32threads.win,v $ + * Revision 1.13 2002/03/24 17:08:12 jongfoster + * Version number bump + * * Revision 1.12 2002/03/24 13:25:43 swa * name change related issues * diff --git a/configure.in b/configure.in index af62470b..f66ad278 100644 --- a/configure.in +++ b/configure.in @@ -1,9 +1,9 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl $Id: configure.in,v 1.46 2002/03/24 18:55:06 jongfoster Exp $ +dnl $Id: configure.in,v 1.47 2002/03/26 16:41:00 hal9 Exp $ dnl dnl Written by and Copyright (C) 2001 the SourceForge -dnl Privoxy team. http://ijbswa.sourceforge.net +dnl Privoxy team. http://www.privoxy.org/ dnl dnl Based on the Internet Junkbuster originally written dnl by and Copyright (C) 1997 Anonymous Coders and @@ -28,6 +28,9 @@ dnl or write to the Free Software Foundation, Inc., 59 dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl dnl $Log: configure.in,v $ +dnl Revision 1.47 2002/03/26 16:41:00 hal9 +dnl Upped RPM Release to 3 (need to build new RH packages) +dnl dnl Revision 1.46 2002/03/24 18:55:06 jongfoster dnl Making Docbook work under Windows dnl @@ -292,7 +295,7 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.46 $) +AC_REVISION($Revision: 1.47 $) AC_INIT(jcc.c) AC_CONFIG_HEADER(config.h) AC_CANONICAL_HOST diff --git a/contrib.sh b/contrib.sh index 2e22fe7e..74d5b727 100755 --- a/contrib.sh +++ b/contrib.sh @@ -284,7 +284,7 @@ exit 0 #addr_clean.pl:} -#gen_list.c:const char gen_list_rcs[] = "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $"; +#gen_list.c:const char gen_list_rcs[] = "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $"; #gen_list.c:/********************************************************************* #gen_list.c: * #gen_list.c: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -293,7 +293,7 @@ exit 0 #gen_list.c: * list management. #gen_list.c: * #gen_list.c: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#gen_list.c: * Privoxy team. http://ijbswa.sourceforge.net +#gen_list.c: * Privoxy team. http://www.privoxy.org/ #gen_list.c: * #gen_list.c: * This program is free software; you can redistribute it #gen_list.c: * and/or modify it under the terms of the GNU General @@ -318,6 +318,9 @@ exit 0 #gen_list.c: * #gen_list.c: * Revisions : #gen_list.c: * $Log: contrib.sh,v $ +#gen_list.c: * Revision 1.2 2002/03/24 13:25:43 swa +#gen_list.c: * name change related issues +#gen_list.c: * #gen_list.c: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #gen_list.c: * A contribution/recomendation to the IJBSWA group for a generic doubly #gen_list.c: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -1374,7 +1377,7 @@ exit 0 #gen_list.h:#ifndef GEN_LIST_H_INCLUDED #gen_list.h:#define GEN_LIST_H_INCLUDED -#gen_list.h:#define GEN_LIST_H_VERSION "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $" +#gen_list.h:#define GEN_LIST_H_VERSION "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $" #gen_list.h:/********************************************************************* #gen_list.h: * #gen_list.h: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -1383,7 +1386,7 @@ exit 0 #gen_list.h: * list management. #gen_list.h: * #gen_list.h: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#gen_list.h: * Privoxy team. http://ijbswa.sourceforge.net +#gen_list.h: * Privoxy team. http://www.privoxy.org/ #gen_list.h: * #gen_list.h: * This program is free software; you can redistribute it #gen_list.h: * and/or modify it under the terms of the GNU General @@ -1408,6 +1411,9 @@ exit 0 #gen_list.h: * #gen_list.h: * Revisions : #gen_list.h: * $Log: contrib.sh,v $ +#gen_list.h: * Revision 1.2 2002/03/24 13:25:43 swa +#gen_list.h: * name change related issues +#gen_list.h: * #gen_list.h: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #gen_list.h: * A contribution/recomendation to the IJBSWA group for a generic doubly #gen_list.h: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -1516,7 +1522,7 @@ exit 0 #gen_list.h:*/ -#isa.c:const char isa_rcs[] = "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $"; +#isa.c:const char isa_rcs[] = "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $"; #isa.c:/********************************************************************* #isa.c: * #isa.c: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -1528,7 +1534,7 @@ exit 0 #isa.c: * per project. #isa.c: * #isa.c: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#isa.c: * Privoxy team. http://ijbswa.sourceforge.net +#isa.c: * Privoxy team. http://www.privoxy.org/ #isa.c: * #isa.c: * This program is free software; you can redistribute it #isa.c: * and/or modify it under the terms of the GNU General @@ -1553,6 +1559,9 @@ exit 0 #isa.c: * #isa.c: * Revisions : #isa.c: * $Log: contrib.sh,v $ +#isa.c: * Revision 1.2 2002/03/24 13:25:43 swa +#isa.c: * name change related issues +#isa.c: * #isa.c: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #isa.c: * A contribution/recomendation to the IJBSWA group for a generic doubly #isa.c: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -1594,7 +1603,7 @@ exit 0 #isa.h:#ifndef ISA_H_INCLUDED #isa.h:#define ISA_H_INCLUDED -#isa.h:#define ISA_H_VERSION "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $" +#isa.h:#define ISA_H_VERSION "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $" #isa.h:/********************************************************************* #isa.h: * #isa.h: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -1606,7 +1615,7 @@ exit 0 #isa.h: * per project. #isa.h: * #isa.h: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#isa.h: * Privoxy team. http://ijbswa.sourceforge.net +#isa.h: * Privoxy team. http://www.privoxy.org/ #isa.h: * #isa.h: * This program is free software; you can redistribute it #isa.h: * and/or modify it under the terms of the GNU General @@ -1631,6 +1640,9 @@ exit 0 #isa.h: * #isa.h: * Revisions : #isa.h: * $Log: contrib.sh,v $ +#isa.h: * Revision 1.2 2002/03/24 13:25:43 swa +#isa.h: * name change related issues +#isa.h: * #isa.h: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #isa.h: * A contribution/recomendation to the IJBSWA group for a generic doubly #isa.h: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -1677,7 +1689,7 @@ exit 0 #isa.h:*/ -#main.c:const char main_rcs[] = "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $"; +#main.c:const char main_rcs[] = "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $"; #main.c:/********************************************************************* #main.c: * #main.c: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -1685,7 +1697,7 @@ exit 0 #main.c: * Purpose : To test "generic list" creation and manipulation. #main.c: * #main.c: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#main.c: * Privoxy team. http://ijbswa.sourceforge.net +#main.c: * Privoxy team. http://www.privoxy.org/ #main.c: * #main.c: * This program is free software; you can redistribute it #main.c: * and/or modify it under the terms of the GNU General @@ -1717,6 +1729,9 @@ exit 0 #main.c: * #main.c: * Revisions : #main.c: * $Log: contrib.sh,v $ +#main.c: * Revision 1.2 2002/03/24 13:25:43 swa +#main.c: * name change related issues +#main.c: * #main.c: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #main.c: * A contribution/recomendation to the IJBSWA group for a generic doubly #main.c: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -2062,7 +2077,7 @@ exit 0 #main.c:*/ -#malloc_police.c:const char malloc_police_rcs[] = "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $"; +#malloc_police.c:const char malloc_police_rcs[] = "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $"; #malloc_police.c:/********************************************************************* #malloc_police.c: * #malloc_police.c: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -2074,7 +2089,7 @@ exit 0 #malloc_police.c: * be most helpful to developers and debugers. #malloc_police.c: * #malloc_police.c: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#malloc_police.c: * Privoxy team. http://ijbswa.sourceforge.net +#malloc_police.c: * Privoxy team. http://www.privoxy.org/ #malloc_police.c: * #malloc_police.c: * This program is free software; you can redistribute it #malloc_police.c: * and/or modify it under the terms of the GNU General @@ -2099,6 +2114,9 @@ exit 0 #malloc_police.c: * #malloc_police.c: * Revisions : #malloc_police.c: * $Log: contrib.sh,v $ +#malloc_police.c: * Revision 1.2 2002/03/24 13:25:43 swa +#malloc_police.c: * name change related issues +#malloc_police.c: * #malloc_police.c: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #malloc_police.c: * A contribution/recomendation to the IJBSWA group for a generic doubly #malloc_police.c: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -2390,7 +2408,7 @@ exit 0 #malloc_police.h:#ifndef MALLOC_POLICE_H_INCLUDED #malloc_police.h:#define MALLOC_POLICE_H_INCLUDED -#malloc_police.h:#define MALLOC_POLICE_H_VERSION "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $" +#malloc_police.h:#define MALLOC_POLICE_H_VERSION "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $" #malloc_police.h:/********************************************************************* #malloc_police.h: * #malloc_police.h: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -2402,7 +2420,7 @@ exit 0 #malloc_police.h: * be most helpful to developers and debugers. #malloc_police.h: * #malloc_police.h: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#malloc_police.h: * Privoxy team. http://ijbswa.sourceforge.net +#malloc_police.h: * Privoxy team. http://www.privoxy.org/ #malloc_police.h: * #malloc_police.h: * This program is free software; you can redistribute it #malloc_police.h: * and/or modify it under the terms of the GNU General @@ -2427,6 +2445,9 @@ exit 0 #malloc_police.h: * #malloc_police.h: * Revisions : #malloc_police.h: * $Log: contrib.sh,v $ +#malloc_police.h: * Revision 1.2 2002/03/24 13:25:43 swa +#malloc_police.h: * name change related issues +#malloc_police.h: * #malloc_police.h: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #malloc_police.h: * A contribution/recomendation to the IJBSWA group for a generic doubly #malloc_police.h: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -2466,7 +2487,7 @@ exit 0 #malloc_police.h:*/ -#rec_char.c:const char rec_char_rcs[] = "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $"; +#rec_char.c:const char rec_char_rcs[] = "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $"; #rec_char.c:/********************************************************************* #rec_char.c: * #rec_char.c: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -2474,7 +2495,7 @@ exit 0 #rec_char.c: * Purpose : A "derived class" of gen_list_rec. #rec_char.c: * #rec_char.c: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#rec_char.c: * Privoxy team. http://ijbswa.sourceforge.net +#rec_char.c: * Privoxy team. http://www.privoxy.org/ #rec_char.c: * #rec_char.c: * This program is free software; you can redistribute it #rec_char.c: * and/or modify it under the terms of the GNU General @@ -2499,6 +2520,9 @@ exit 0 #rec_char.c: * #rec_char.c: * Revisions : #rec_char.c: * $Log: contrib.sh,v $ +#rec_char.c: * Revision 1.2 2002/03/24 13:25:43 swa +#rec_char.c: * name change related issues +#rec_char.c: * #rec_char.c: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #rec_char.c: * A contribution/recomendation to the IJBSWA group for a generic doubly #rec_char.c: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -2666,7 +2690,7 @@ exit 0 #rec_char.h:#ifndef REC_CHAR_H_INCLUDED #rec_char.h:#define REC_CHAR_H_INCLUDED -#rec_char.h:#define REC_CHAR_H_VERSION "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $" +#rec_char.h:#define REC_CHAR_H_VERSION "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $" #rec_char.h:/********************************************************************* #rec_char.h: * #rec_char.h: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -2674,7 +2698,7 @@ exit 0 #rec_char.h: * Purpose : A "derived class" of gen_list_rec. #rec_char.h: * #rec_char.h: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#rec_char.h: * Privoxy team. http://ijbswa.sourceforge.net +#rec_char.h: * Privoxy team. http://www.privoxy.org/ #rec_char.h: * #rec_char.h: * This program is free software; you can redistribute it #rec_char.h: * and/or modify it under the terms of the GNU General @@ -2699,6 +2723,9 @@ exit 0 #rec_char.h: * #rec_char.h: * Revisions : #rec_char.h: * $Log: contrib.sh,v $ +#rec_char.h: * Revision 1.2 2002/03/24 13:25:43 swa +#rec_char.h: * name change related issues +#rec_char.h: * #rec_char.h: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #rec_char.h: * A contribution/recomendation to the IJBSWA group for a generic doubly #rec_char.h: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -2746,7 +2773,7 @@ exit 0 #rec_char.h:*/ -#rec_charptr.c:const char rec_charptr_rcs[] = "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $"; +#rec_charptr.c:const char rec_charptr_rcs[] = "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $"; #rec_charptr.c:/********************************************************************* #rec_charptr.c: * #rec_charptr.c: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -2754,7 +2781,7 @@ exit 0 #rec_charptr.c: * Purpose : A "derived class" of gen_list_rec. #rec_charptr.c: * #rec_charptr.c: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#rec_charptr.c: * Privoxy team. http://ijbswa.sourceforge.net +#rec_charptr.c: * Privoxy team. http://www.privoxy.org/ #rec_charptr.c: * #rec_charptr.c: * This program is free software; you can redistribute it #rec_charptr.c: * and/or modify it under the terms of the GNU General @@ -2779,6 +2806,9 @@ exit 0 #rec_charptr.c: * #rec_charptr.c: * Revisions : #rec_charptr.c: * $Log: contrib.sh,v $ +#rec_charptr.c: * Revision 1.2 2002/03/24 13:25:43 swa +#rec_charptr.c: * name change related issues +#rec_charptr.c: * #rec_charptr.c: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #rec_charptr.c: * A contribution/recomendation to the IJBSWA group for a generic doubly #rec_charptr.c: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -2958,7 +2988,7 @@ exit 0 #rec_charptr.h:#ifndef REC_CHARPTR_H_INCLUDED #rec_charptr.h:#define REC_CHARPTR_H_INCLUDED -#rec_charptr.h:#define REC_CHARPTR_H_VERSION "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $" +#rec_charptr.h:#define REC_CHARPTR_H_VERSION "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $" #rec_charptr.h:/********************************************************************* #rec_charptr.h: * #rec_charptr.h: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -2966,7 +2996,7 @@ exit 0 #rec_charptr.h: * Purpose : A "derived class" of gen_list_rec. #rec_charptr.h: * #rec_charptr.h: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#rec_charptr.h: * Privoxy team. http://ijbswa.sourceforge.net +#rec_charptr.h: * Privoxy team. http://www.privoxy.org/ #rec_charptr.h: * #rec_charptr.h: * This program is free software; you can redistribute it #rec_charptr.h: * and/or modify it under the terms of the GNU General @@ -2991,6 +3021,9 @@ exit 0 #rec_charptr.h: * #rec_charptr.h: * Revisions : #rec_charptr.h: * $Log: contrib.sh,v $ +#rec_charptr.h: * Revision 1.2 2002/03/24 13:25:43 swa +#rec_charptr.h: * name change related issues +#rec_charptr.h: * #rec_charptr.h: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #rec_charptr.h: * A contribution/recomendation to the IJBSWA group for a generic doubly #rec_charptr.h: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -3038,7 +3071,7 @@ exit 0 #rec_charptr.h:*/ -#rec_double.c:const char rec_double_rcs[] = "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $"; +#rec_double.c:const char rec_double_rcs[] = "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $"; #rec_double.c:/********************************************************************* #rec_double.c: * #rec_double.c: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -3046,7 +3079,7 @@ exit 0 #rec_double.c: * Purpose : A "derived class" of gen_list_rec. #rec_double.c: * #rec_double.c: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#rec_double.c: * Privoxy team. http://ijbswa.sourceforge.net +#rec_double.c: * Privoxy team. http://www.privoxy.org/ #rec_double.c: * #rec_double.c: * This program is free software; you can redistribute it #rec_double.c: * and/or modify it under the terms of the GNU General @@ -3071,6 +3104,9 @@ exit 0 #rec_double.c: * #rec_double.c: * Revisions : #rec_double.c: * $Log: contrib.sh,v $ +#rec_double.c: * Revision 1.2 2002/03/24 13:25:43 swa +#rec_double.c: * name change related issues +#rec_double.c: * #rec_double.c: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #rec_double.c: * A contribution/recomendation to the IJBSWA group for a generic doubly #rec_double.c: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -3238,7 +3274,7 @@ exit 0 #rec_double.h:#ifndef REC_DOUBLE_H_INCLUDED #rec_double.h:#define REC_DOUBLE_H_INCLUDED -#rec_double.h:#define REC_DOUBLE_H_VERSION "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $" +#rec_double.h:#define REC_DOUBLE_H_VERSION "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $" #rec_double.h:/********************************************************************* #rec_double.h: * #rec_double.h: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -3246,7 +3282,7 @@ exit 0 #rec_double.h: * Purpose : gen_A "derived class" of gen_list_rec. #rec_double.h: * #rec_double.h: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#rec_double.h: * Privoxy team. http://ijbswa.sourceforge.net +#rec_double.h: * Privoxy team. http://www.privoxy.org/ #rec_double.h: * #rec_double.h: * This program is free software; you can redistribute it #rec_double.h: * and/or modify it under the terms of the GNU General @@ -3271,6 +3307,9 @@ exit 0 #rec_double.h: * #rec_double.h: * Revisions : #rec_double.h: * $Log: contrib.sh,v $ +#rec_double.h: * Revision 1.2 2002/03/24 13:25:43 swa +#rec_double.h: * name change related issues +#rec_double.h: * #rec_double.h: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #rec_double.h: * A contribution/recomendation to the IJBSWA group for a generic doubly #rec_double.h: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -3318,7 +3357,7 @@ exit 0 #rec_double.h:*/ -#rec_long.c:const char rec_long_rcs[] = "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $"; +#rec_long.c:const char rec_long_rcs[] = "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $"; #rec_long.c:/********************************************************************* #rec_long.c: * #rec_long.c: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -3326,7 +3365,7 @@ exit 0 #rec_long.c: * Purpose : A "derived class" of gen_list_rec. #rec_long.c: * #rec_long.c: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#rec_long.c: * Privoxy team. http://ijbswa.sourceforge.net +#rec_long.c: * Privoxy team. http://www.privoxy.org/ #rec_long.c: * #rec_long.c: * This program is free software; you can redistribute it #rec_long.c: * and/or modify it under the terms of the GNU General @@ -3351,6 +3390,9 @@ exit 0 #rec_long.c: * #rec_long.c: * Revisions : #rec_long.c: * $Log: contrib.sh,v $ +#rec_long.c: * Revision 1.2 2002/03/24 13:25:43 swa +#rec_long.c: * name change related issues +#rec_long.c: * #rec_long.c: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #rec_long.c: * A contribution/recomendation to the IJBSWA group for a generic doubly #rec_long.c: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -3518,7 +3560,7 @@ exit 0 #rec_long.h:#ifndef REC_LONG_H_INCLUDED #rec_long.h:#define REC_LONG_H_INCLUDED -#rec_long.h:#define REC_LONG_H_VERSION "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $" +#rec_long.h:#define REC_LONG_H_VERSION "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $" #rec_long.h:/********************************************************************* #rec_long.h: * #rec_long.h: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -3526,7 +3568,7 @@ exit 0 #rec_long.h: * Purpose : A "derived class" of gen_list_rec. #rec_long.h: * #rec_long.h: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#rec_long.h: * Privoxy team. http://ijbswa.sourceforge.net +#rec_long.h: * Privoxy team. http://www.privoxy.org/ #rec_long.h: * #rec_long.h: * This program is free software; you can redistribute it #rec_long.h: * and/or modify it under the terms of the GNU General @@ -3551,6 +3593,9 @@ exit 0 #rec_long.h: * #rec_long.h: * Revisions : #rec_long.h: * $Log: contrib.sh,v $ +#rec_long.h: * Revision 1.2 2002/03/24 13:25:43 swa +#rec_long.h: * name change related issues +#rec_long.h: * #rec_long.h: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #rec_long.h: * A contribution/recomendation to the IJBSWA group for a generic doubly #rec_long.h: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -3598,7 +3643,7 @@ exit 0 #rec_long.h:*/ -#rec_malloc_police.c:const char rec_malloc_police_rcs[] = "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $"; +#rec_malloc_police.c:const char rec_malloc_police_rcs[] = "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $"; #rec_malloc_police.c:/********************************************************************* #rec_malloc_police.c: * #rec_malloc_police.c: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -3611,7 +3656,7 @@ exit 0 #rec_malloc_police.c: * and debugers. #rec_malloc_police.c: * #rec_malloc_police.c: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#rec_malloc_police.c: * Privoxy team. http://ijbswa.sourceforge.net +#rec_malloc_police.c: * Privoxy team. http://www.privoxy.org/ #rec_malloc_police.c: * #rec_malloc_police.c: * This program is free software; you can redistribute it #rec_malloc_police.c: * and/or modify it under the terms of the GNU General @@ -3636,6 +3681,9 @@ exit 0 #rec_malloc_police.c: * #rec_malloc_police.c: * Revisions : #rec_malloc_police.c: * $Log: contrib.sh,v $ +#rec_malloc_police.c: * Revision 1.2 2002/03/24 13:25:43 swa +#rec_malloc_police.c: * name change related issues +#rec_malloc_police.c: * #rec_malloc_police.c: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #rec_malloc_police.c: * A contribution/recomendation to the IJBSWA group for a generic doubly #rec_malloc_police.c: * linked list. This file is a home brew "bash tar" (I cannot create a @@ -3862,7 +3910,7 @@ exit 0 #rec_malloc_police.h:#ifndef REC_MALLOC_POLICE_H_INCLUDED #rec_malloc_police.h:#define REC_MALLOC_POLICE_H_INCLUDED -#rec_malloc_police.h:#define REC_MALLOC_POLICE_H_VERSION "$Id: contrib.sh,v 1.1 2001/12/07 01:54:50 iwanttokeepanon Exp $" +#rec_malloc_police.h:#define REC_MALLOC_POLICE_H_VERSION "$Id: contrib.sh,v 1.2 2002/03/24 13:25:43 swa Exp $" #rec_malloc_police.h:/********************************************************************* #rec_malloc_police.h: * #rec_malloc_police.h: * File : $Source: /cvsroot/ijbswa/current/contrib.sh,v $ @@ -3875,7 +3923,7 @@ exit 0 #rec_malloc_police.h: * and debugers. #rec_malloc_police.h: * #rec_malloc_police.h: * Copyright : Written by and Copyright (C) 2001 the SourceForge -#rec_malloc_police.h: * Privoxy team. http://ijbswa.sourceforge.net +#rec_malloc_police.h: * Privoxy team. http://www.privoxy.org/ #rec_malloc_police.h: * #rec_malloc_police.h: * This program is free software; you can redistribute it #rec_malloc_police.h: * and/or modify it under the terms of the GNU General @@ -3900,6 +3948,9 @@ exit 0 #rec_malloc_police.h: * #rec_malloc_police.h: * Revisions : #rec_malloc_police.h: * $Log: contrib.sh,v $ +#rec_malloc_police.h: * Revision 1.2 2002/03/24 13:25:43 swa +#rec_malloc_police.h: * name change related issues +#rec_malloc_police.h: * #rec_malloc_police.h: * Revision 1.1 2001/12/07 01:54:50 iwanttokeepanon #rec_malloc_police.h: * A contribution/recomendation to the IJBSWA group for a generic doubly #rec_malloc_police.h: * linked list. This file is a home brew "bash tar" (I cannot create a diff --git a/cygwin.h b/cygwin.h index 11fed397..b28dd6a0 100644 --- a/cygwin.h +++ b/cygwin.h @@ -1,6 +1,6 @@ #ifndef CYGWIN_H_INCLUDED #define CYGWIN_H_INCLUDED -#define CYGWIN_H_VERSION "$Id: cygwin.h,v 1.2 2001/07/29 18:43:08 jongfoster Exp $" +#define CYGWIN_H_VERSION "$Id: cygwin.h,v 1.3 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cygwin.h,v $ @@ -10,7 +10,7 @@ * latest SDK too? Shudder, I think not. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,6 +36,9 @@ * * Revisions : * $Log: cygwin.h,v $ + * Revision 1.3 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.2 2001/07/29 18:43:08 jongfoster * Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to * ANSI C rules. diff --git a/deanimate.c b/deanimate.c index 1a2f16b8..94311d48 100644 --- a/deanimate.c +++ b/deanimate.c @@ -1,4 +1,4 @@ -const char deanimate_rcs[] = "$Id: deanimate.c,v 1.9 2002/03/13 00:27:04 jongfoster Exp $"; +const char deanimate_rcs[] = "$Id: deanimate.c,v 1.10 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/deanimate.c,v $ @@ -10,7 +10,7 @@ const char deanimate_rcs[] = "$Id: deanimate.c,v 1.9 2002/03/13 00:27:04 jongfos * gif_extract_image * * Copyright : Written by and Copyright (C) 2001 by the the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the GIF file format specification (see * http://tronche.com/computer-graphics/gif/gif89a.html) @@ -37,6 +37,9 @@ const char deanimate_rcs[] = "$Id: deanimate.c,v 1.9 2002/03/13 00:27:04 jongfos * * Revisions : * $Log: deanimate.c,v $ + * Revision 1.10 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.9 2002/03/13 00:27:04 jongfoster * Killing warnings * diff --git a/deanimate.h b/deanimate.h index 2199080d..ede98477 100644 --- a/deanimate.h +++ b/deanimate.h @@ -1,6 +1,6 @@ #ifndef DEANIMATE_H_INCLUDED #define DEANIMATE_H_INCLUDED -#define DEANIMATE_H_VERSION "$Id: deanimate.h,v 1.6 2002/03/08 17:46:04 jongfoster Exp $" +#define DEANIMATE_H_VERSION "$Id: deanimate.h,v 1.7 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/deanimate.h,v $ @@ -11,7 +11,7 @@ * * * Copyright : Written by and Copyright (C) 2001 Andreas S. Oesterhelt - * for the SourceForge Privoxy team. http://ijbswa.sourceforge.net + * for the Privoxy team. http://www.privoxy.org/ * * Based on ideas from the Image::DeAnim Perl module by * Ken MacFarlane, @@ -40,6 +40,9 @@ * * Revisions : * $Log: deanimate.h,v $ + * Revision 1.7 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.6 2002/03/08 17:46:04 jongfoster * Fixing int/size_t warnings * diff --git a/default.action b/default.action index a0ce18a2..4d1f1446 100644 --- a/default.action +++ b/default.action @@ -1,12 +1,12 @@ ############################################################################# # Sample actions file for Privoxy # -# For information, see http://ijbswa.sourceforge.net/ +# For information, see http://www.privoxy.org/ # -# $Id: default.action,v 1.2 2002/03/24 13:02:18 swa Exp $ +# $Id: default.action,v 1.3 2002/03/24 16:24:02 jongfoster Exp $ # # Purpose : Default actions file, see -# http://ijbswa.sourceforge.net/faq/questions.html#CONFIGFILES +# http://www.privoxy.org/faq/questions.html#CONFIGFILES # # We value your feedback. However, to provide you with the best support, # please note: diff --git a/default.filter b/default.filter index a2c80906..b4904b83 100644 --- a/default.filter +++ b/default.filter @@ -5,7 +5,7 @@ # Purpose : Rules to process the content of web pages # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # This program is free software; you can redistribute it # and/or modify it under the terms of the GNU General @@ -27,6 +27,9 @@ # # Revisions : # $Log: default.filter,v $ +# Revision 1.3 2002/03/24 16:08:03 jongfoster +# Fixing banners-by-size for new config URLs +# # Revision 1.2 2002/03/24 13:02:18 swa # name change related issues. # diff --git a/doc/gpl.html b/doc/gpl.html index c980e61f..7c252b5b 100644 --- a/doc/gpl.html +++ b/doc/gpl.html @@ -1,5 +1,5 @@ -ource$ @@ -1249,7 +1249,7 @@ const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.9 2002/03/24 11:01:0 * Purpose : (Fill me in with a good description!) * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * PRIVOXY team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -1301,7 +1301,7 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION; #ifndef _FILENAME_H #define _FILENAME_H -#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.9 2002/03/24 11:01:05 swa Exp $" +#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.10 2002/03/24 12:33:01 swa Exp $" /********************************************************************* * * File : $Source$ @@ -1309,7 +1309,7 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION; * Purpose : (Fill me in with a good description!) * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * PRIVOXY team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -1498,6 +1498,9 @@ at sourceforge. Three simple steps: Temple Place - Suite 330, Boston, MA 02111-1307, USA. $Log: developer-manual.sgml,v $ + Revision 1.10 2002/03/24 12:33:01 swa + more additions. + Revision 1.9 2002/03/24 11:01:05 swa name change diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml index b49c2829..16acf38b 100644 --- a/doc/source/faq.sgml +++ b/doc/source/faq.sgml @@ -6,10 +6,10 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: faq.sgml,v 1.29 2002/03/25 05:23:57 hal9 Exp $ + $Id: faq.sgml,v 1.30 2002/03/25 16:39:22 hal9 Exp $ Written by and Copyright (C) 2001 the SourceForge - PRIVOXY team. http://ijbswa.sourceforge.net + Privoxy team. http://www.privoxy.org/ Based on the Internet Junkbuster originally written by and Copyright (C) 1997 Anonymous Coders and @@ -20,7 +20,7 @@ Privoxy Frequently Asked Questions -$Id: faq.sgml,v 1.29 2002/03/25 05:23:57 hal9 Exp $ +$Id: faq.sgml,v 1.30 2002/03/25 16:39:22 hal9 Exp $ @@ -44,9 +44,9 @@ tastes. Privoxy has application for both stand-alone systems and multi-user networks. -You can find the latest version of the document at http://ijbswa.sourceforge.net/faq/. +You can find the latest version of the document at http://www.privoxy.org/faq/. Please see the Contact section in the -user-manual if you want to contact the developers. +user-manual if you want to contact the developers. @@ -371,7 +371,7 @@ repository, and together we'll find a suitable task for you. See the user-manual for + url="http://www.privoxy.org/user-manual/">user-manual for platform specific installation instructions. [FIXME: This is meant for after the name change for 3.0!] @@ -509,7 +509,7 @@ way to do this? The easiest way to do this, is to access Privoxy with your web browser at http://p.p/, and then select - "Edit the actions list" + "Edit the actions list" from the selection list. You can also do this by editing the appropriate file with a text editor. @@ -896,7 +896,7 @@ programmed to handle certain pages specially. With recent versions of Privoxy (version 2.9.x), you can get some information about Privoxy and change some settings by going to -http://p.p/ or, equivalently, http://ijbswa.sourceforge.net/config/ +http://p.p/ or, equivalently, http://www.privoxy.org/config/ (Note that p.p is far easier to type but may not work in some configurations). @@ -908,7 +908,7 @@ handled by a special web server which is built in to Privoxy If you are not running Privoxy, then http://p.p/ will fail, and -http://ijbswa.sourceforge.net/config/ will return a web page telling you +http://www.privoxy.org/config/ will return a web page telling you you're not running Privoxy. @@ -1201,7 +1201,7 @@ still getting through. How? If this doesn't help, you probably have an error in the rule you applied. Try pasting the full URL of the offending ad into http://ijbswa.sourceforge.net/config/show-url-info + url="http://www.privoxy.org/config/show-url-info">http://www.privoxy.org/config/show-url-info and see if any actions match your new rule. @@ -1312,6 +1312,9 @@ This is referenced in the doc header already. HB 03/25/02 Temple Place - Suite 330, Boston, MA 02111-1307, USA. $Log: faq.sgml,v $ +Revision 1.30 2002/03/25 16:39:22 hal9 +A few new sections. Made all links relative to user-manual. + Revision 1.29 2002/03/25 05:23:57 hal9 Moved section, and touch ups. diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml index 3086c9da..7cd5fbc6 100644 --- a/doc/source/user-manual.sgml +++ b/doc/source/user-manual.sgml @@ -6,10 +6,10 @@ This file belongs into ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: user-manual.sgml,v 1.56 2002/03/24 16:17:06 swa Exp $ + $Id: user-manual.sgml,v 1.57 2002/03/24 20:33:30 hal9 Exp $ Written by and Copyright (C) 2001 the SourceForge - Privoxy team. http://ijbswa.sourceforge.net + Privoxy team. http://www.privoxy.org/ Based on the Internet Junkbuster originally written by and Copyright (C) 1997 Anonymous Coders and @@ -28,7 +28,7 @@ Hal Burgiss Privoxy User Manual -$Id: user-manual.sgml,v 1.56 2002/03/24 16:17:06 swa Exp $ +$Id: user-manual.sgml,v 1.57 2002/03/24 20:33:30 hal9 Exp $ @@ -51,7 +51,7 @@ Hal Burgiss stand-alone systems and multi-user networks. -You can find the latest version of the user manual at http://ijbswa.sourceforge.net/user-manual/. +You can find the latest version of the user manual at http://www.privoxy.org/user-manual/. @@ -480,7 +480,7 @@ configuration section below. HB.) Privoxy can be reached by the special URL http://p.p/ (or alternately - http://ijbswa.sourceforge.net/config/), + http://www.privoxy.org/config/), which is an internal page. You will see the following section: @@ -3315,7 +3315,7 @@ For any other issues, feel free to use the http://ijbswa.sourceforge.net/ +   http://www.privoxy.org/ @@ -3619,7 +3619,7 @@ For any other issues, feel free to use the http://ijbswa.sourceforge.net/config/ + http://www.privoxy.org/config/ @@ -3635,7 +3635,7 @@ For any other issues, feel free to use the http://ijbswa.sourceforge.net/config/show-status + http://www.privoxy.org/config/show-status @@ -3646,7 +3646,7 @@ For any other issues, feel free to use the http://ijbswa.sourceforge.net/config/show-version + http://www.privoxy.org/config/show-version @@ -3657,7 +3657,7 @@ For any other issues, feel free to use the http://ijbswa.sourceforge.net/config/show-request + http://www.privoxy.org/config/show-request @@ -3668,7 +3668,7 @@ For any other issues, feel free to use the http://ijbswa.sourceforge.net/config/show-url-info + http://www.privoxy.org/config/show-url-info @@ -3679,7 +3679,7 @@ For any other issues, feel free to use the http://ijbswa.sourceforge.net/config/toggle + http://www.privoxy.org/config/toggle @@ -3687,12 +3687,12 @@ For any other issues, feel free to use the http://ijbswa.sourceforge.net/config/toggle?set=disable + http://www.privoxy.org/config/toggle?set=disable
- http://ijbswa.sourceforge.net/config/toggle?set=enable + http://www.privoxy.org/config/toggle?set=enable
@@ -3703,7 +3703,7 @@ For any other issues, feel free to use the http://ijbswa.sourceforge.net/config/edit-actions + http://www.privoxy.org/config/edit-actions @@ -3733,7 +3733,7 @@ For any other issues, feel free to use the http://ijbswa.sourceforge.net/config/show-url-info + http://www.privoxy.org/config/show-url-info page that can show us very specifically how actions are being applied to any given URL. This is a big help for troubleshooting. @@ -3960,6 +3960,9 @@ For any other issues, feel free to use the ]:". If you leave out the IP address, Privoxy will bind to -all interfaces (addresses) on your machine and may become reachable from the -Internet. In that case, consider using access control lists (acl's) (see -"aclfile" above), or a firewall. - -For example, suppose you are running Privoxy on a machine which has the address -192.168.0.1 on your local private network (192.168.0.0) and has another outside -connection with a different address. You want it to serve requests from inside -only: - - listen-address 192.168.0.1:8118 + The "default.filter" file contains content modification rules that use + "regular expressions". These rules permit powerful changes on the + content of Web pages, e.g., you could disable your favorite JavaScript + annoyances, re-write the actual displayed text, or just have some fun + replacing "Microsoft" with "MicroSuck" wherever it appears on a Web + page. Default: whatever the developers are playing with :-/ - -If you want it to listen on all addresses (including the outside connection): - - listen-address :8118 + Filtering requires buffering the page content, which may appear to + slow down page rendering since nothing is displayed until all content + has passed the filters. (It does not really take longer, but seems + that way since the page is not incrementally displayed.) This effect + will be more noticeable on slower connections. - -If you do this, consider using ACLs (see "aclfile" above). Note: you will need -to point your browser(s) to the address and port that you have configured here. -Default: localhost:8118 (127.0.0.1:8118). - -The debug option sets the level of debugging information to log in the logfile -(and to the console in the Windows version). A debug level of 1 is informative -because it will show you each request as it happens. Higher levels of debug are -probably only of interest to developers. - - debug 1 # GPC = show each GET/POST/CONNECT request - debug 2 # CONN = show each connection status - debug 4 # IO = show I/O status - debug 8 # HDR = show header parsing - debug 16 # LOG = log all data into the logfile - debug 32 # FRC = debug force feature - debug 64 # REF = debug regular expression filter - debug 128 # = debug fast redirects - debug 256 # = debug GIF de-animation - debug 512 # CLF = Common Log Format - debug 1024 # = debug kill pop-ups - debug 4096 # INFO = Startup banner and warnings. - debug 8192 # ERROR = Non-fatal errors - - -It is highly recommended that you enable ERROR reporting (debug 8192), at least -until v3.0 is released. - -The reporting of FATAL errors (i.e. ones which crash Privoxy) is always on and -cannot be disabled. - -If you want to use CLF (Common Log Format), you should set "debug 512" ONLY, do -not enable anything else. - -Multiple "debug" directives, are OK - they're logical-OR'd together. - - debug 15 # same as setting the first 4 listed above + filterfile default.filter - -Default: - - debug 1 # URLs - debug 4096 # Info - debug 8192 # Errors - *we highly recommended enabling this* + The logfile is where all logging and error messages are written. The + logfile can be useful for tracking down a problem with Privoxy (e.g., + it's not blocking an ad you think it should block) but in most cases + you probably will never look at it. - -Privoxy normally uses "multi-threading", a software technique that permits it -to handle many different requests simultaneously. In some cases you may wish to -disable this -- particularly if you're trying to debug a problem. The -"single-threaded" option forces Privoxy to handle requests sequentially. -Default: Multi-threaded mode. - - #single-threaded + Your logfile will grow indefinitely, and you will probably want to + periodically remove it. On Unix systems, you can do this with a cron + job (see "man cron"). For Redhat, a logrotate script has been + included. - -"toggle" allows you to temporarily disable all Privoxy's filtering. Just set -"toggle 0". - -The Windows version of Privoxy puts an icon in the system tray, which also -allows you to change this option. If you right-click on that icon (or select -the "Options" menu), one choice is "Enable". Clicking on enable toggles Privoxy -on and off. This is useful if you want to temporarily disable Privoxy, e.g., to -access a site that requires cookies which you would otherwise have blocked. -This can also be toggled via a web browser at the Privoxy internal address of -http://p.p on any platform. - -"toggle 1" means Privoxy runs normally, "toggle 0" means that Privoxy becomes a -non-anonymizing non-blocking proxy. Default: 1 (on). - - toggle 1 + On SuSE Linux systems, you can place a line like "/var/log/privoxy.* + +1024k 644 nobody.nogroup" in /etc/logfiles, with the effect that + cron.daily will automatically archive, gzip, and empty the log, when + it exceeds 1M size. - -For content filtering, i.e. the "+filter" and "+deanimate-gif" actions, it is -necessary that Privoxy buffers the entire document body. This can be -potentially dangerous, since a server could just keep sending data indefinitely -and wait for your RAM to exhaust. With nasty consequences. - -The buffer-limit option lets you set the maximum size in Kbytes that each -buffer may use. When the documents buffer exceeds this size, it is flushed to -the client unfiltered and no further attempt to filter the rest of it is made. -Remember that there may multiple threads running, which might require -increasing the "buffer-limit" Kbytes each, unless you have enabled -"single-threaded" above. - - buffer-limit 4069 + Default: Log to the a file named logfile. Comment out to disable + logging. - -To enable the web-based default.action file editor set enable-edit-actions to -1, or 0 to disable. Note that you must have compiled Privoxy with support for -this feature, otherwise this option has no effect. This internal page can be -reached at http://p.p. - -Security note: If this is enabled, anyone who can use the proxy can edit the -actions file, and their changes will affect all users. For shared proxies, you -probably want to disable this. Default: enabled. - - enable-edit-actions 1 + logfile logfile - -Allow Privoxy to be toggled on and off remotely, using your web browser. Set -"enable-remote-toggle"to 1 to enable, and 0 to disable. Note that you must have -compiled Privoxy with support for this feature, otherwise this option has no -effect. - -Security note: If this is enabled, anyone who can use the proxy can toggle it -on or off (see http://p.p), and their changes will affect all users. For shared -proxies, you probably want to disable this. Default: enabled. - - enable-remote-toggle 1 + The "jarfile" defines where Privoxy stores the cookies it intercepts. + Note that if you use a "jarfile", it may grow quite large. Default: + Don't store intercepted cookies. + #jarfile jarfile + + If you specify a "trustfile", Privoxy will only allow access to sites + that are named in the trustfile. You can also mark sites as trusted + referrers, with the effect that access to untrusted sites will be + granted, if a link from a trusted referrer was used. The link target + will then be added to the "trustfile". This is a very restrictive + feature that typical users most probably want to leave disabled. + Default: Disabled, don't use the trust mechanism. + + #trustfile trust + + If you use the trust mechanism, it is a good idea to write up some + on-line documentation about your blocking policy and to specify the + URL(s) here. They will appear on the page that your users receive when + they try to access untrusted content. Use multiple times for multiple + URLs. Default: Don't display links on the "untrusted" info page. + + trust-info-url http://www.your-site.com/why_we_block.html + trust-info-url http://www.your-site.com/what_we_allow.html + _________________________________________________________________ + +3.3.2. Other Configuration Options -------------------------------------------------------------------------------- - + This part of the configuration file contains options that control how + Privoxy operates. + + "Admin-address" should be set to the email address of the proxy + administrator. It is used in many of the proxy-generated pages. + Default: fill@me.in.please. + + #admin-address fill@me.in.please + + "Proxy-info-url" can be set to a URL that contains more info about + this Privoxy installation, it's configuration and policies. It is used + in many of the proxy-generated pages and its use is highly recommended + in multi-user installations, since your users will want to know why + certain content is blocked or modified. Default: Don't show a link to + on-line documentation. + + proxy-info-url http://www.your-site.com/proxy.html + + "Listen-address" specifies the address and port where Privoxy will + listen for connections from your Web browser. The default is to listen + on the localhost port 8118, and this is suitable for most users. (In + your web browser, under proxy configuration, list the proxy server as + "localhost" and the port as "8118"). + + If you already have another service running on port 8118, or if you + want to serve requests from other machines (e.g. on your local + network) as well, you will need to override the default. The syntax is + "listen-address []:". If you leave out the IP + address, Privoxy will bind to all interfaces (addresses) on your + machine and may become reachable from the Internet. In that case, + consider using access control lists (acl's) (see "aclfile" above), or + a firewall. + + For example, suppose you are running Privoxy on a machine which has + the address 192.168.0.1 on your local private network (192.168.0.0) + and has another outside connection with a different address. You want + it to serve requests from inside only: + + listen-address 192.168.0.1:8118 + + If you want it to listen on all addresses (including the outside + connection): + + listen-address :8118 + + If you do this, consider using ACLs (see "aclfile" above). Note: you + will need to point your browser(s) to the address and port that you + have configured here. Default: localhost:8118 (127.0.0.1:8118). + + The debug option sets the level of debugging information to log in the + logfile (and to the console in the Windows version). A debug level of + 1 is informative because it will show you each request as it happens. + Higher levels of debug are probably only of interest to developers. + + debug 1 # GPC = show each GET/POST/CONNECT request + debug 2 # CONN = show each connection status + debug 4 # IO = show I/O status + debug 8 # HDR = show header parsing + debug 16 # LOG = log all data into the logfile + debug 32 # FRC = debug force feature + debug 64 # REF = debug regular expression filter + debug 128 # = debug fast redirects + debug 256 # = debug GIF de-animation + debug 512 # CLF = Common Log Format + debug 1024 # = debug kill pop-ups + debug 4096 # INFO = Startup banner and warnings. + debug 8192 # ERROR = Non-fatal errors + + It is highly recommended that you enable ERROR reporting (debug 8192), + at least until v3.0 is released. + + The reporting of FATAL errors (i.e. ones which crash Privoxy) is + always on and cannot be disabled. + + If you want to use CLF (Common Log Format), you should set "debug 512" + ONLY, do not enable anything else. + + Multiple "debug" directives, are OK - they're logical-OR'd together. + + debug 15 # same as setting the first 4 listed above + + Default: + + debug 1 # URLs + debug 4096 # Info + debug 8192 # Errors - *we highly recommended enabling this* + + Privoxy normally uses "multi-threading", a software technique that + permits it to handle many different requests simultaneously. In some + cases you may wish to disable this -- particularly if you're trying to + debug a problem. The "single-threaded" option forces Privoxy to handle + requests sequentially. Default: Multi-threaded mode. + + #single-threaded + + "toggle" allows you to temporarily disable all Privoxy's filtering. + Just set "toggle 0". + + The Windows version of Privoxy puts an icon in the system tray, which + also allows you to change this option. If you right-click on that icon + (or select the "Options" menu), one choice is "Enable". Clicking on + enable toggles Privoxy on and off. This is useful if you want to + temporarily disable Privoxy, e.g., to access a site that requires + cookies which you would otherwise have blocked. This can also be + toggled via a web browser at the Privoxy internal address of + [45]http://p.p on any platform. + + "toggle 1" means Privoxy runs normally, "toggle 0" means that Privoxy + becomes a non-anonymizing non-blocking proxy. Default: 1 (on). + + toggle 1 + + For content filtering, i.e. the "+filter" and "+deanimate-gif" + actions, it is necessary that Privoxy buffers the entire document + body. This can be potentially dangerous, since a server could just + keep sending data indefinitely and wait for your RAM to exhaust. With + nasty consequences. + + The buffer-limit option lets you set the maximum size in Kbytes that + each buffer may use. When the documents buffer exceeds this size, it + is flushed to the client unfiltered and no further attempt to filter + the rest of it is made. Remember that there may multiple threads + running, which might require increasing the "buffer-limit" Kbytes + each, unless you have enabled "single-threaded" above. + + buffer-limit 4069 + + To enable the web-based default.action file editor set + enable-edit-actions to 1, or 0 to disable. Note that you must have + compiled Privoxy with support for this feature, otherwise this option + has no effect. This internal page can be reached at [46]http://p.p. + + Security note: If this is enabled, anyone who can use the proxy can + edit the actions file, and their changes will affect all users. For + shared proxies, you probably want to disable this. Default: enabled. + + enable-edit-actions 1 + + Allow Privoxy to be toggled on and off remotely, using your web + browser. Set "enable-remote-toggle"to 1 to enable, and 0 to disable. + Note that you must have compiled Privoxy with support for this + feature, otherwise this option has no effect. + + Security note: If this is enabled, anyone who can use the proxy can + toggle it on or off (see [47]http://p.p), and their changes will + affect all users. For shared proxies, you probably want to disable + this. Default: enabled. + + enable-remote-toggle 1 + _________________________________________________________________ + 3.3.3. Access Control List (ACL) -Access controls are included at the request of some ISPs and systems -administrators, and are not usually needed by individual users. Please note the -warnings in the FAQ that this proxy is not intended to be a substitute for a -firewall or to encourage anyone to defer addressing basic security weaknesses. - -If no access settings are specified, the proxy talks to anyone that connects. -If any access settings file are specified, then the proxy talks only to IP -addresses permitted somewhere in this file and not denied later in this file. - -Summary -- if using an ACL: - -Client must have permission to receive service. - -LAST match in ACL wins. - -Default behavior is to deny service. - -The syntax for an entry in the Access Control List is: - - ACTION SRC_ADDR[/SRC_MASKLEN] [ DST_ADDR[/DST_MASKLEN] ] + Access controls are included at the request of some ISPs and systems + administrators, and are not usually needed by individual users. Please + note the warnings in the FAQ that this proxy is not intended to be a + substitute for a firewall or to encourage anyone to defer addressing + basic security weaknesses. - -Where the individual fields are: - - ACTION = "permit-access" or "deny-access" - - SRC_ADDR = client hostname or dotted IP address - SRC_MASKLEN = number of bits in the subnet mask for the source - - DST_ADDR = server or forwarder hostname or dotted IP address - DST_MASKLEN = number of bits in the subnet mask for the target + If no access settings are specified, the proxy talks to anyone that + connects. If any access settings file are specified, then the proxy + talks only to IP addresses permitted somewhere in this file and not + denied later in this file. - -The field separator (FS) is whitespace (space or tab). - -IMPORTANT NOTE: If Privoxy is using a forwarder (see below) or a gateway for a -particular destination URL, the DST_ADDR that is examined is the address of the -forwarder or the gateway and NOT the address of the ultimate target. This is -necessary because it may be impossible for the local Privoxy to determine the -address of the ultimate target (that's often what gateways are used for). - -Here are a few examples to show how the ACL features work: - -"localhost" is OK -- no DST_ADDR implies that ALL destination addresses are OK: - - permit-access localhost + Summary -- if using an ACL: - -A silly example to illustrate permitting any host on the class-C subnet with -Privoxy to go anywhere: - - permit-access www.privoxy.com/24 + Client must have permission to receive service. - -Except deny one particular IP address from using it at all: - - deny-access ident.privoxy.com + LAST match in ACL wins. - -You can also specify an explicit network address and subnet mask. Explicit -addresses do not have to be resolved to be used. - - permit-access 207.153.200.0/24 + Default behavior is to deny service. - -A subnet mask of 0 matches anything, so the next line permits everyone. - - permit-access 0.0.0.0/0 + The syntax for an entry in the Access Control List is: - -Note, you cannot say: - - permit-access .org + ACTION SRC_ADDR[/SRC_MASKLEN] [ DST_ADDR[/DST_MASKLEN] ] - -to allow all *.org domains. Every IP address listed must resolve fully. - -An ISP may want to provide a Privoxy that is accessible by "the world" and yet -restrict use of some of their private content to hosts on its internal network -(i.e. its own subscribers). Say, for instance the ISP owns the Class-B IP -address block 123.124.0.0 (a 16 bit netmask). This is how they could do it: - - permit-access 0.0.0.0/0 0.0.0.0/0 # other clients can go anywhere - # with the following exceptions: - - deny-access 0.0.0.0/0 123.124.0.0/16 # block all external requests for - # sites on the ISP's network - - permit 0.0.0.0/0 www.my_isp.com # except for the ISP's main - # web site - - permit 123.124.0.0/16 0.0.0.0/0 # the ISP's clients can go - # anywhere + Where the individual fields are: + + ACTION = "permit-access" or "deny-access" + SRC_ADDR = client hostname or dotted IP address + SRC_MASKLEN = number of bits in the subnet mask for the source + DST_ADDR = server or forwarder hostname or dotted IP address + DST_MASKLEN = number of bits in the subnet mask for the target + + The field separator (FS) is whitespace (space or tab). + + IMPORTANT NOTE: If Privoxy is using a forwarder (see below) or a + gateway for a particular destination URL, the DST_ADDR that is + examined is the address of the forwarder or the gateway and NOT the + address of the ultimate target. This is necessary because it may be + impossible for the local Privoxy to determine the address of the + ultimate target (that's often what gateways are used for). + + Here are a few examples to show how the ACL features work: + + "localhost" is OK -- no DST_ADDR implies that ALL destination + addresses are OK: + + permit-access localhost + + A silly example to illustrate permitting any host on the class-C + subnet with Privoxy to go anywhere: + + permit-access www.privoxy.com/24 + + Except deny one particular IP address from using it at all: + + deny-access ident.privoxy.com + + You can also specify an explicit network address and subnet mask. + Explicit addresses do not have to be resolved to be used. + + permit-access 207.153.200.0/24 + + A subnet mask of 0 matches anything, so the next line permits + everyone. + + permit-access 0.0.0.0/0 + + Note, you cannot say: + + permit-access .org + + to allow all *.org domains. Every IP address listed must resolve + fully. + + An ISP may want to provide a Privoxy that is accessible by "the world" + and yet restrict use of some of their private content to hosts on its + internal network (i.e. its own subscribers). Say, for instance the ISP + owns the Class-B IP address block 123.124.0.0 (a 16 bit netmask). This + is how they could do it: + + permit-access 0.0.0.0/0 0.0.0.0/0 # other clients can go anywhere + # with the following exceptions + : + + deny-access 0.0.0.0/0 123.124.0.0/16 # block all external request + s for + # sites on the ISP's network + permit 0.0.0.0/0 www.my_isp.com # except for the ISP's main + # web site + permit 123.124.0.0/16 0.0.0.0/0 # the ISP's clients can go + # anywhere + + Note that if some hostnames are listed with multiple IP addresses, the + primary value returned by DNS (via gethostbyname()) is used. Default: + Anyone can access the proxy. + _________________________________________________________________ - -Note that if some hostnames are listed with multiple IP addresses, the primary -value returned by DNS (via gethostbyname()) is used. Default: Anyone can access -the proxy. - -------------------------------------------------------------------------------- - 3.3.4. Forwarding -This feature allows chaining of HTTP requests via multiple proxies. It can be -used to better protect privacy and confidentiality when accessing specific -domains by routing requests to those domains to a special purpose filtering -proxy such as lpwa.com. Or to use a caching proxy to speed up browsing. - -It can also be used in an environment with multiple networks to route requests -via multiple gateways allowing transparent access to multiple networks without -having to modify browser configurations. - -Also specified here are SOCKS proxies. Privoxy SOCKS 4 and SOCKS 4A. The -difference is that SOCKS 4A will resolve the target hostname using DNS on the -SOCKS server, not our local DNS client. - -The syntax of each line is: - - forward target_domain[:port] http_proxy_host[:port] - forward-socks4 target_domain[:port] socks_proxy_host[:port] http_proxy_host[: -port] - forward-socks4a target_domain[:port] socks_proxy_host[:port] http_proxy_host[: -port] + This feature allows chaining of HTTP requests via multiple proxies. It + can be used to better protect privacy and confidentiality when + accessing specific domains by routing requests to those domains to a + special purpose filtering proxy such as lpwa.com. Or to use a caching + proxy to speed up browsing. - -If http_proxy_host is ".", then requests are not forwarded to a HTTP proxy but -are made directly to the web servers. - -Lines are checked in sequence, and the last match wins. - -There is an implicit line equivalent to the following, which specifies that -anything not finding a match on the list is to go out without forwarding or -gateway protocol, like so: - - forward .* . # implicit + It can also be used in an environment with multiple networks to route + requests via multiple gateways allowing transparent access to multiple + networks without having to modify browser configurations. - -In the following common configuration, everything goes to Lucent's LPWA, except -SSL on port 443 (which it doesn't handle): - - forward .* lpwa.com:8000 - forward :443 . + Also specified here are SOCKS proxies. Privoxy SOCKS 4 and SOCKS 4A. + The difference is that SOCKS 4A will resolve the target hostname using + DNS on the SOCKS server, not our local DNS client. - -Some users have reported difficulties related to LPWA's use of "." as the last -element of the domain, and have said that this can be fixed with this: - - forward lpwa. lpwa.com:8000 + The syntax of each line is: - -(NOTE: the syntax for specifying target_domain has changed since the previous -paragraph was written -- it will not work now. More information is welcome.) - -In this fictitious example, everything goes via an ISP's caching proxy, except -requests to that ISP: - - forward .* caching.myisp.net:8000 - forward myisp.net . + forward target_domain[:port] http_proxy_host[:port] + forward-socks4 target_domain[:port] socks_proxy_host[:port] + http_proxy_host[:port] + forward-socks4a target_domain[:port] socks_proxy_host[:port] + http_proxy_host[:port] - -For the @home network, we're told the forwarding configuration is this: - - forward .* proxy:8080 + If http_proxy_host is ".", then requests are not forwarded to a HTTP + proxy but are made directly to the web servers. - -Also, we're told they insist on getting cookies and JavaScript, so you should -allow cookies from home.com. We consider JavaScript a potential security risk. -Java need not be enabled. - -In this example direct connections are made to all "internal" domains, but -everything else goes through Lucent's LPWA by way of the company's SOCKS -gateway to the Internet. - - forward-socks4 .* lpwa.com:8000 firewall.my_company.com:1080 - forward my_company.com . + Lines are checked in sequence, and the last match wins. - -This is how you could set up a site that always uses SOCKS but no forwarders: - - forward-socks4a .* . firewall.my_company.com:1080 + There is an implicit line equivalent to the following, which specifies + that anything not finding a match on the list is to go out without + forwarding or gateway protocol, like so: - -An advanced example for network administrators: - -If you have links to multiple ISPs that provide various special content to -their subscribers, you can configure forwarding to pass requests to the -specific host that's connected to that ISP so that everybody can see all of the -content on all of the ISPs. - -This is a bit tricky, but here's an example: - -host-a has a PPP connection to isp-a.com. And host-b has a PPP connection to -isp-b.com. host-a can run a Privoxy proxy with forwarding like this: - - forward .* . - forward isp-b.com host-b:8118 + forward .* . # implicit - -host-b can run a Privoxy proxy with forwarding like this: - - forward .* . - forward isp-a.com host-a:8118 + In the following common configuration, everything goes to Lucent's + LPWA, except SSL on port 443 (which it doesn't handle): - -Now, anyone on the Internet (including users on host-a and host-b) can set -their browser's proxy to either host-a or host-b and be able to browse the -content on isp-a or isp-b. - -Here's another practical example, for University of Kent at Canterbury students -with a network connection in their room, who need to use the University's Squid -web cache. - - forward *. ssbcache.ukc.ac.uk:3128 # Use the proxy, except for: - forward .ukc.ac.uk . # Anything on the same domain as us - forward * . # Host with no domain specified - forward 129.12.*.* . # A dotted IP on our /16 network. - forward 127.*.*.* . # Loopback address - forward localhost.localdomain . # Loopback address - forward www.ukc.mirror.ac.uk . # Specific host + forward .* lpwa.com:8000 + forward :443 . - -If you intend to chain Privoxy and squid locally, then chain as browser -> -squid -> privoxy is the recommended way. - -Your squid configuration could then look like this: - - # Define Privoxy as parent cache - - cache_peer 127.0.0.1 parent 8118 0 no-query - - # Define ACL for protocol FTP - acl FTP proto FTP - - # Do not forward ACL FTP to privoxy - always_direct allow FTP - - # Do not forward ACL CONNECT (https) to privoxy - always_direct allow CONNECT - - # Forward the rest to privoxy - never_direct allow all + Some users have reported difficulties related to LPWA's use of "." as + the last element of the domain, and have said that this can be fixed + with this: + + forward lpwa. lpwa.com:8000 + + (NOTE: the syntax for specifying target_domain has changed since the + previous paragraph was written -- it will not work now. More + information is welcome.) + + In this fictitious example, everything goes via an ISP's caching + proxy, except requests to that ISP: + + forward .* caching.myisp.net:8000 + forward myisp.net . + + For the @home network, we're told the forwarding configuration is + this: + + forward .* proxy:8080 + + Also, we're told they insist on getting cookies and JavaScript, so you + should allow cookies from home.com. We consider JavaScript a potential + security risk. Java need not be enabled. + + In this example direct connections are made to all "internal" domains, + but everything else goes through Lucent's LPWA by way of the company's + SOCKS gateway to the Internet. + + forward-socks4 .* lpwa.com:8000 firewall.my_company.com:1080 + forward my_company.com . + + This is how you could set up a site that always uses SOCKS but no + forwarders: + + forward-socks4a .* . firewall.my_company.com:1080 + + An advanced example for network administrators: + + If you have links to multiple ISPs that provide various special + content to their subscribers, you can configure forwarding to pass + requests to the specific host that's connected to that ISP so that + everybody can see all of the content on all of the ISPs. + + This is a bit tricky, but here's an example: + + host-a has a PPP connection to isp-a.com. And host-b has a PPP + connection to isp-b.com. host-a can run a Privoxy proxy with + forwarding like this: + + forward .* . + forward isp-b.com host-b:8118 + + host-b can run a Privoxy proxy with forwarding like this: + + forward .* . + forward isp-a.com host-a:8118 + + Now, anyone on the Internet (including users on host-a and host-b) can + set their browser's proxy to either host-a or host-b and be able to + browse the content on isp-a or isp-b. + + Here's another practical example, for University of Kent at Canterbury + students with a network connection in their room, who need to use the + University's Squid web cache. + + forward *. ssbcache.ukc.ac.uk:3128 # Use the proxy, except for: + forward .ukc.ac.uk . # Anything on the same domain as us + forward * . # Host with no domain specified + forward 129.12.*.* . # A dotted IP on our /16 network. + forward 127.*.*.* . # Loopback address + forward localhost.localdomain . # Loopback address + forward www.ukc.mirror.ac.uk . # Specific host + + If you intend to chain Privoxy and squid locally, then chain as + browser -> squid -> privoxy is the recommended way. + + Your squid configuration could then look like this: + + # Define Privoxy as parent cache + + cache_peer 127.0.0.1 parent 8118 0 no-query + + # Define ACL for protocol FTP + acl FTP proto FTP + # Do not forward ACL FTP to privoxy + always_direct allow FTP + # Do not forward ACL CONNECT (https) to privoxy + always_direct allow CONNECT + # Forward the rest to privoxy + never_direct allow all + _________________________________________________________________ - -------------------------------------------------------------------------------- - 3.3.5. Windows GUI Options -Privoxy has a number of options specific to the Windows GUI interface: - -If "activity-animation" is set to 1, the Privoxy icon will animate when -"Privoxy" is active. To turn off, set to 0. - - activity-animation 1 + Privoxy has a number of options specific to the Windows GUI interface: - -If "log-messages" is set to 1, Privoxy will log messages to the console window: - - log-messages 1 + If "activity-animation" is set to 1, the Privoxy icon will animate + when "Privoxy" is active. To turn off, set to 0. - -If "log-buffer-size" is set to 1, the size of the log buffer, i.e. the amount -of memory used for the log messages displayed in the console window, will be -limited to "log-max-lines" (see below). - -Warning: Setting this to 0 will result in the buffer to grow infinitely and eat -up all your memory! - - log-buffer-size 1 + activity-animation 1 - -log-max-lines is the maximum number of lines held in the log buffer. See above. - - log-max-lines 200 + If "log-messages" is set to 1, Privoxy will log messages to the + console window: - -If "log-highlight-messages" is set to 1, Privoxy will highlight portions of the -log messages with a bold-faced font: - - log-highlight-messages 1 + log-messages 1 - -The font used in the console window: - - log-font-name Comic Sans MS + If "log-buffer-size" is set to 1, the size of the log buffer, i.e. the + amount of memory used for the log messages displayed in the console + window, will be limited to "log-max-lines" (see below). - -Font size used in the console window: - - log-font-size 8 + Warning: Setting this to 0 will result in the buffer to grow + infinitely and eat up all your memory! - -"show-on-task-bar" controls whether or not Privoxy will appear as a button on -the Task bar when minimized: - - show-on-task-bar 0 + log-buffer-size 1 - -If "close-button-minimizes" is set to 1, the Windows close button will minimize -Privoxy instead of closing the program (close with the exit option on the File -menu). - - close-button-minimizes 1 + log-max-lines is the maximum number of lines held in the log buffer. + See above. - -The "hide-console" option is specific to the MS-Win console version of Privoxy. -If this option is used, Privoxy will disconnect from and hide the command -console. - - #hide-console + log-max-lines 200 - -------------------------------------------------------------------------------- - -3.4. The Actions File - -The "default.action" file (formerly actionsfile or ijb.action) is used to -define what actions Privoxy takes, and thus determines how images, cookies and -various other aspects of HTTP content and transactions are handled. Images can -be anything you want, including ads, banners, or just some obnoxious URL that -you would rather not see. Cookies can be accepted or rejected, or accepted only -during the current browser session (i.e. not written to disk). Changes to -default.action should be immediately visible to Privoxy without the need to -restart. - -The easiest way to edit "actions" file is with a browser by loading http://p.p/ -, and then select "Edit Actions List". A text editor can also be used. - -To determine which actions apply to a request, the URL of the request is -compared to all patterns in this file. Every time it matches, the list of -applicable actions for the URL is incrementally updated. You can trace this -process by visiting http://p.p/show-url-info. - -There are four types of lines in this file: comments (begin with a "#" -character), actions, aliases and patterns, all of which are explained below, as -well as the configuration file syntax that Privoxy understands. - -------------------------------------------------------------------------------- - -3.4.1. URL Domain and Path Syntax - -Generally, a pattern has the form /, where both the and - part are optional. If you only specify a domain part, the "/" can be -left out: - -www.example.com - is a domain only pattern and will match any request to -"www.example.com". - -www.example.com/ - means exactly the same. - -www.example.com/index.html - matches only the single document "/index.html" on -"www.example.com". - -/index.html - matches the document "/index.html", regardless of the domain. - -index.html - matches nothing, since it would be interpreted as a domain name -and there is no top-level domain called ".html". - -The matching of the domain part offers some flexible options: if the domain -starts or ends with a dot, it becomes unanchored at that end. For example: - -.example.com - matches any domain that ENDS in ".example.com". - -www. - matches any domain that STARTS with "www". - -Additionally, there are wild-cards that you can use in the domain names -themselves. They work pretty similar to shell wild-cards: "*" stands for zero -or more arbitrary characters, "?" stands for any single character. And you can -define character classes in square brackets and they can be freely mixed: - -ad*.example.com - matches "adserver.example.com", "ads.example.com", etc but -not "sfads.example.com". - -*ad*.example.com - matches all of the above, and then some. - -.?pix.com - matches "www.ipix.com", "pictures.epix.com", "a.b.c.d.e.upix.com", -etc. - -www[1-9a-ez].example.com - matches "www1.example.com", "www4.example.com", -"wwwd.example.com", "wwwz.example.com", etc., but not "wwww.example.com". - -If Privoxy was compiled with "pcre" support (default), Perl compatible regular -expressions can be used. See the pcre/docs/ directory or "man perlre" (also -available on http://www.perldoc.com/perl5.6/pod/perlre.html) for details. A -brief discussion of regular expressions is in the Appendix. For instance: - -/.*/advert[0-9]+\.jpe?g - would match a URL from any domain, with any path that -includes "advert" followed immediately by one or more digits, then a "." and -ending in either "jpeg" or "jpg". So we match "example.com/ads/advert2.jpg", -and "www.example.com/ads/banners/advert39.jpeg", but not "www.example.com/ads/ -banners/advert39.gif" (no gifs in the example pattern). - -Please note that matching in the path is case INSENSITIVE by default, but you -can switch to case sensitive at any point in the pattern by using the "(?-i)" -switch: - -www.example.com/(?-i)PaTtErN.* - will match only documents whose path starts -with "PaTtErN" in exactly this capitalization. - -------------------------------------------------------------------------------- - -3.4.2. Actions - -Actions are enabled if preceded with a "+", and disabled if preceded with a -"-". Actions are invoked by enclosing the action name in curly braces (e.g. -{+some_action}), followed by a list of URLs to which the action applies. There -are three classes of actions: - - * Boolean (e.g. "+/-block"): + If "log-highlight-messages" is set to 1, Privoxy will highlight + portions of the log messages with a bold-faced font: - {+name} # enable this action - {-name} # disable this action - + log-highlight-messages 1 - * parameterized (e.g. "+/-hide-user-agent"): + The font used in the console window: - {+name{param}} # enable action and set parameter to "param" - {-name} # disable action - + log-font-name Comic Sans MS - * Multi-value (e.g. "{+/-add-header{Name: value}}", "{+/-wafer{name=value}} - "): + Font size used in the console window: - {+name{param}} # enable action and add parameter "param" - {-name{param}} # remove the parameter "param" - {-name} # disable this action totally - + log-font-size 8 -If nothing is specified in this file, no "actions" are taken. So in this case -Privoxy would just be a normal, non-blocking, non-anonymizing proxy. You must -specifically enable the privacy and blocking features you need (although the -provided default default.action file will give a good starting point). - -Later defined actions always over-ride earlier ones. For multi-valued actions, -the actions are applied in the order they are specified. + "show-on-task-bar" controls whether or not Privoxy will appear as a + button on the Task bar when minimized: + + show-on-task-bar 0 + + If "close-button-minimizes" is set to 1, the Windows close button will + minimize Privoxy instead of closing the program (close with the exit + option on the File menu). + + close-button-minimizes 1 + + The "hide-console" option is specific to the MS-Win console version of + Privoxy. If this option is used, Privoxy will disconnect from and hide + the command console. + + #hide-console + _________________________________________________________________ + +3.4. The Actions File -The list of valid Privoxy "actions" are: + The "default.action" file (formerly actionsfile or ijb.action) is used + to define what actions Privoxy takes, and thus determines how images, + cookies and various other aspects of HTTP content and transactions are + handled. Images can be anything you want, including ads, banners, or + just some obnoxious URL that you would rather not see. Cookies can be + accepted or rejected, or accepted only during the current browser + session (i.e. not written to disk). Changes to default.action should + be immediately visible to Privoxy without the need to restart. + + The easiest way to edit "actions" file is with a browser by loading + [48]http://p.p/, and then select "Edit Actions List". A text editor + can also be used. + + To determine which actions apply to a request, the URL of the request + is compared to all patterns in this file. Every time it matches, the + list of applicable actions for the URL is incrementally updated. You + can trace this process by visiting [49]http://p.p/show-url-info. + + There are four types of lines in this file: comments (begin with a "#" + character), actions, aliases and patterns, all of which are explained + below, as well as the configuration file syntax that Privoxy + understands. + _________________________________________________________________ + +3.4.1. URL Domain and Path Syntax - * Add the specified HTTP header, which is not checked for validity. You may - specify this many times to specify many different headers: + Generally, a pattern has the form /, where both the + and part are optional. If you only specify a domain + part, the "/" can be left out: - +add-header{Name: value} - + www.example.com - is a domain only pattern and will match any request + to "www.example.com". - * Block this URL totally. In a default installation, a "blocked" URL will - result in bright red banner that says "BLOCKED", with a reason why it is - being blocked. + www.example.com/ - means exactly the same. - +block - + www.example.com/index.html - matches only the single document + "/index.html" on "www.example.com". - * De-animate all animated GIF images, i.e. reduce them to their last frame. - This will also shrink the images considerably (in bytes, not pixels!). If - the option "first" is given, the first frame of the animation is used as - the replacement. If "last" is given, the last frame of the animation is - used instead, which probably makes more sense for most banner animations, - but also has the risk of not showing the entire last frame (if it is only a - delta to an earlier frame). + /index.html - matches the document "/index.html", regardless of the + domain. - +deanimate-gifs{last} - +deanimate-gifs{first} - + index.html - matches nothing, since it would be interpreted as a + domain name and there is no top-level domain called ".html". - * "+downgrade" will downgrade HTTP/1.1 client requests to HTTP/1.0 and - downgrade the responses as well. Use this action for servers that use HTTP/ - 1.1 protocol features that Privoxy doesn't handle well yet. HTTP/1.1 is - only partially implemented. Default is not to downgrade requests. + The matching of the domain part offers some flexible options: if the + domain starts or ends with a dot, it becomes unanchored at that end. + For example: - +downgrade - + .example.com - matches any domain that ENDS in ".example.com". - * Many sites, like yahoo.com, don't just link to other sites. Instead, they - will link to some script on their own server, giving the destination as a - parameter, which will then redirect you to the final target. URLs resulting - from this scheme typically look like: http://some.place/some_script?http:// - some.where-else. + www. - matches any domain that STARTS with "www". - Sometimes, there are even multiple consecutive redirects encoded in the - URL. These redirections via scripts make your web browsing more traceable, - since the server from which you follow such a link can see where you go to. - Apart from that, valuable bandwidth and time is wasted, while your browser - ask the server for one redirect after the other. Plus, it feeds the - advertisers. + Additionally, there are wild-cards that you can use in the domain + names themselves. They work pretty similar to shell wild-cards: "*" + stands for zero or more arbitrary characters, "?" stands for any + single character. And you can define character classes in square + brackets and they can be freely mixed: - The "+fast-redirects" option enables interception of these requests by - Privoxy, who will cut off all but the last valid URL in the request and - send a local redirect back to your browser without contacting the remote - site. + ad*.example.com - matches "adserver.example.com", "ads.example.com", + etc but not "sfads.example.com". - +fast-redirects - + *ad*.example.com - matches all of the above, and then some. - * Apply the filters in the section_header section of the default.filter file - to the site(s). default.filter sections are grouped according to like - functionality. + .?pix.com - matches "www.ipix.com", "pictures.epix.com", + "a.b.c.d.e.upix.com", etc. - +filter{section_header} - + www[1-9a-ez].example.com - matches "www1.example.com", + "www4.example.com", "wwwd.example.com", "wwwz.example.com", etc., but + not "wwww.example.com". - Filter sections that are pre-defined in the supplied default.filter - include: + If Privoxy was compiled with "pcre" support (default), Perl compatible + regular expressions can be used. See the pcre/docs/ directory or "man + perlre" (also available on + [50]http://www.perldoc.com/perl5.6/pod/perlre.html) for details. A + brief discussion of regular expressions is in the [51]Appendix. For + instance: - html-annoyances: Get rid of particularly annoying HTML abuse. + /.*/advert[0-9]+\.jpe?g - would match a URL from any domain, with any + path that includes "advert" followed immediately by one or more + digits, then a "." and ending in either "jpeg" or "jpg". So we match + "example.com/ads/advert2.jpg", and + "www.example.com/ads/banners/advert39.jpeg", but not + "www.example.com/ads/banners/advert39.gif" (no gifs in the example + pattern). + + Please note that matching in the path is case INSENSITIVE by default, + but you can switch to case sensitive at any point in the pattern by + using the "(?-i)" switch: + + www.example.com/(?-i)PaTtErN.* - will match only documents whose path + starts with "PaTtErN" in exactly this capitalization. + _________________________________________________________________ + +3.4.2. Actions + + Actions are enabled if preceded with a "+", and disabled if preceded + with a "-". Actions are invoked by enclosing the action name in curly + braces (e.g. {+some_action}), followed by a list of URLs to which the + action applies. There are three classes of actions: + + * Boolean (e.g. "+/-block"): + {+name} # enable this action + {-name} # disable this action - js-annoyances: Get rid of particularly annoying JavaScript abuse + * parameterized (e.g. "+/-hide-user-agent"): + {+name{param}} # enable action and set parameter to "param" + {-name} # disable action - no-poups: Kill all popups in JS and HTML + * Multi-value (e.g. "{+/-add-header{Name: value}}", + "{+/-wafer{name=value}}"): + {+name{param}} # enable action and add parameter "param" + {-name{param}} # remove the parameter "param" + {-name} # disable this action totally - frameset-borders: Give frames a border + If nothing is specified in this file, no "actions" are taken. So in + this case Privoxy would just be a normal, non-blocking, + non-anonymizing proxy. You must specifically enable the privacy and + blocking features you need (although the provided default + default.action file will give a good starting point). + + Later defined actions always over-ride earlier ones. For multi-valued + actions, the actions are applied in the order they are specified. + + The list of valid Privoxy "actions" are: + + * Add the specified HTTP header, which is not checked for validity. + You may specify this many times to specify many different headers: + +add-header{Name: value} - webbugs: Squish WebBugs (1x1 invisible GIFs used for user tracking) + * Block this URL totally. In a default installation, a "blocked" URL + will result in bright red banner that says "BLOCKED", with a + reason why it is being blocked. + +block - no-refresh: Automatic refresh sucks on auto-dialup lines + * De-animate all animated GIF images, i.e. reduce them to their last + frame. This will also shrink the images considerably (in bytes, + not pixels!). If the option "first" is given, the first frame of + the animation is used as the replacement. If "last" is given, the + last frame of the animation is used instead, which probably makes + more sense for most banner animations, but also has the risk of + not showing the entire last frame (if it is only a delta to an + earlier frame). + +deanimate-gifs{last} + +deanimate-gifs{first} - fun: Text replacements for subversive browsing fun! + * "+downgrade" will downgrade HTTP/1.1 client requests to HTTP/1.0 + and downgrade the responses as well. Use this action for servers + that use HTTP/1.1 protocol features that Privoxy doesn't handle + well yet. HTTP/1.1 is only partially implemented. Default is not + to downgrade requests. + +downgrade - nimda: Remove (virus) Nimda code. + * Many sites, like yahoo.com, don't just link to other sites. + Instead, they will link to some script on their own server, giving + the destination as a parameter, which will then redirect you to + the final target. URLs resulting from this scheme typically look + like: http://some.place/some_script?http://some.where-else. + Sometimes, there are even multiple consecutive redirects encoded + in the URL. These redirections via scripts make your web browsing + more traceable, since the server from which you follow such a link + can see where you go to. Apart from that, valuable bandwidth and + time is wasted, while your browser ask the server for one redirect + after the other. Plus, it feeds the advertisers. + The "+fast-redirects" option enables interception of these + requests by Privoxy, who will cut off all but the last valid URL + in the request and send a local redirect back to your browser + without contacting the remote site. + +fast-redirects - banners-by-size: Kill banners by size + * Apply the filters in the section_header section of the + default.filter file to the site(s). default.filter sections are + grouped according to like functionality. + +filter{section_header} - crude-parental: Kill all web pages that contain the words "sex" or - "warez" + Filter sections that are pre-defined in the supplied + default.filter include: - * Block any existing X-Forwarded-for header, and do not add a new one: - - +hide-forwarded - - - * If the browser sends a "From:" header containing your e-mail address, this - either completely removes the header ("block"), or changes it to the - specified e-mail address. - - +hide-from{block} - +hide-from{spam@sittingduck.xqq} - - - * Don't send the "Referer:" (sic) header to the web site. You can block it, - forge a URL to the same server as the request (which is preferred because - some sites will not send images otherwise) or set it to a constant string - of your choice. - - +hide-referer{block} - +hide-referer{forge} - +hide-referer{http://nowhere.com} - - - * Alternative spelling of "+hide-referer". It has the same parameters, and - can be freely mixed with, "+hide-referer". ("referrer" is the correct - English spelling, however the HTTP specification has a bug - it requires it - to be spelled "referer".) - - +hide-referrer{...} - - - * Change the "User-Agent:" header so web servers can't tell your browser - type. Warning! This breaks many web sites. Specify the user-agent value you - want. Example, pretend to be using Netscape on Linux: + html-annoyances: Get rid of particularly annoying HTML abuse. - +hide-user-agent{Mozilla (X11; I; Linux 2.0.32 i586)} - + js-annoyances: Get rid of particularly annoying JavaScript abuse - * Treat this URL as an image. This only matters if it's also "+block"ed, in - which case a "blocked" image can be sent rather than a HTML page. See - "+image-blocker{}" below for the control over what is actually sent. If you - want invisible ads, they should be defined as images and blocked. And also, - "image-blocker" should be set to "blank". - - +image - + no-poups: Kill all popups in JS and HTML - * Decides what to do with URLs that end up tagged with "{+block +image}", e.g - an advertizement. There are five options. "-image-blocker" will send a HTML - "blocked" page, usually resulting in a "broken image" icon. "+image-blocker - {blank}" will send a 1x1 transparent GIF image. And finally, - "+image-blocker{http://xyz.com}" will send a HTTP temporary redirect to the - specified image. This has the advantage of the icon being being cached by - the browser, which will speed up the display. "+image-blocker{pattern}" - will send a checkboard type pattern - - +image-blocker{blank} - +image-blocker{pattern} - +image-blocker{http://p.p/send-banner} - - - * By default (i.e. in the absence of a "+limit-connect" action), Privoxy will - only allow CONNECT requests to port 443, which is the standard port for - https as a precaution. - - The CONNECT methods exists in HTTP to allow access to secure websites - (https:// URLs) through proxies. It works very simply: the proxy connects - to the server on the specified port, and then short-circuits its - connections to the client and to the remote proxy. This can be a big - security hole, since CONNECT-enabled proxies can be abused as TCP relays - very easily. - - If you want to allow CONNECT for more ports than this, or want to forbid - CONNECT altogether, you can specify a comma separated list of ports and - port ranges (the latter using dashes, with the minimum defaulting to 0 and - max to 65K): - - +limit-connect{443} # This is the default and need no be specified. - +limit-connect{80,443} # Ports 80 and 443 are OK. - +limit-connect{-3, 7, 20-100, 500-} # Port less than 3, 7, 20 to 100 - #and above 500 are OK. - - - * "+no-compression" prevents the website from compressing the data. Some - websites do this, which can be a problem for Privoxy, since "+filter", - "+no-popup" and "+gif-deanimate" will not work on compressed data. This - will slow down connections to those websites, though. Default is - "nocompression" is turned on. - - +nocompression - - - * If the website sets cookies, "no-cookies-keep" will make sure they are - erased when you exit and restart your web browser. This makes profiling - cookies useless, but won't break sites which require cookies so that you - can log in for transactions. Default: on. - - +no-cookies-keep - - - * Prevent the website from reading cookies: - - +no-cookies-read - - - * Prevent the website from setting cookies: - - +no-cookies-set - - - * Filter the website through a built-in filter to disable those obnoxious - JavaScript pop-up windows via window.open(), etc. The two alternative - spellings are equivalent. - - +no-popup - +no-popups - - - * This action only applies if you are using a jarfile for saving cookies. It - sends a cookie to every site stating that you do not accept any copyright - on cookies sent to you, and asking them not to track you. Of course, this - is a (relatively) unique header they could use to track you. - - +vanilla-wafer - - - * This allows you to add an arbitrary cookie. It can be specified multiple - times in order to add as many cookies as you like. - - +wafer{name=value} - - -The meaning of any of the above is reversed by preceding the action with a "-", -in place of the "+". - -Some examples: - -Turn off cookies by default, then allow a few through for specified sites: - - # Turn off all persistent cookies - { +no-cookies-read } - { +no-cookies-set } - # Allow cookies for this browser session ONLY - { +no-cookies-keep } - - # Exceptions to the above, sites that benefit from persistent cookies - { -no-cookies-read } - { -no-cookies-set } - { -no-cookies-keep } - .javasoft.com - .sun.com - .yahoo.com - .msdn.microsoft.com - .redhat.com - - # Alternative way of saying the same thing - {-no-cookies-set -no-cookies-read -no-cookies-keep} - .sourceforge.net - .sf.net - - -Now turn off "fast redirects", and then we allow two exceptions: - - # Turn them off! - {+fast-redirects} - - # Reverse it for these two sites, which don't work right without it. - {-fast-redirects} - www.ukc.ac.uk/cgi-bin/wac\.cgi\? - login.yahoo.com - - -Turn on page filtering according to rules in the defined sections of -refilterfile, and make one exception for sourceforge: - - # Run everything through the filter file, using only the - # specified sections: - +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}\ - +filter{webbugs} +filter{nimda} +filter{banners-by-size} - - # Then disable filtering of code from sourceforge! - {-filter} - .cvs.sourceforge.net - - -Now some URLs that we want "blocked", ie we won't see them. Many of these use -regular expressions that will expand to match multiple URLs: - - # Blocklist: - {+block} - /.*/(.*[-_.])?ads?[0-9]?(/|[-_.].*|\.(gif|jpe?g)) - /.*/(.*[-_.])?count(er)?(\.cgi|\.dll|\.exe|[?/]) - /.*/(ng)?adclient\.cgi - /.*/(plain|live|rotate)[-_.]?ads?/ - /.*/(sponsor)s?[0-9]?/ - /.*/_?(plain|live)?ads?(-banners)?/ - /.*/abanners/ - /.*/ad(sdna_image|gifs?)/ - /.*/ad(server|stream|juggler)\.(cgi|pl|dll|exe) - /.*/adbanners/ - /.*/adserver - /.*/adstream\.cgi - /.*/adv((er)?ts?|ertis(ing|ements?))?/ - /.*/banner_?ads/ - /.*/banners?/ - /.*/banners?\.cgi/ - /.*/cgi-bin/centralad/getimage - /.*/images/addver\.gif - /.*/images/marketing/.*\.(gif|jpe?g) - /.*/popupads/ - /.*/siteads/ - /.*/sponsor.*\.gif - /.*/sponsors?[0-9]?/ - /.*/advert[0-9]+\.jpg - /Media/Images/Adds/ - /ad_images/ - /adimages/ - /.*/ads/ - /bannerfarm/ - /grafikk/annonse/ - /graphics/defaultAd/ - /image\.ng/AdType - /image\.ng/transactionID - /images/.*/.*_anim\.gif # alvin brattli - /ip_img/.*\.(gif|jpe?g) - /rotateads/ - /rotations/ - /worldnet/ad\.cgi - /cgi-bin/nph-adclick.exe/ - /.*/Image/BannerAdvertising/ - /.*/ad-bin/ - /.*/adlib/server\.cgi - /autoads/ - - -Note that many of these actions have the potential to cause a page to -misbehave, possibly even not to display at all. There are many ways a site -designer may choose to design his site, and what HTTP header content he may -depend on. There is no way to have hard and fast rules for all sites. See the -Appendix for a brief example on troubleshooting actions. - -------------------------------------------------------------------------------- - -3.4.3. Aliases - -Custom "actions", known to Privoxy as "aliases", can be defined by combining -other "actions". These can in turn be invoked just like the built-in "actions". -Currently, an alias can contain any character except space, tab, "=", "{" or "} -". But please use only "a"- "z", "0"-"9", "+", and "-". Alias names are not -case sensitive, and must be defined before anything else in the -default.actionfile ! And there can only be one set of "aliases" defined. - -Now let's define a few aliases: - - # Useful customer aliases we can use later. These must come first! - {{alias}} - +no-cookies = +no-cookies-set +no-cookies-read - -no-cookies = -no-cookies-set -no-cookies-read - fragile = - -block -no-cookies -filter -fast-redirects -hide-referer -no-popups - shop = -no-cookies -filter -fast-redirects - +imageblock = +block +image - - #For people who don't like to type too much: ;-) - c0 = +no-cookies - c1 = -no-cookies - c2 = -no-cookies-set +no-cookies-read - c3 = +no-cookies-set -no-cookies-read - #... etc. Customize to your heart's content. + frameset-borders: Give frames a border - -Some examples using our "shop" and "fragile" aliases from above: - - # These sites are very complex and require - # minimal interference. - {fragile} - .office.microsoft.com - .windowsupdate.microsoft.com - .nytimes.com - - # Shopping sites - still want to block ads. - {shop} - .quietpc.com - .worldpay.com # for quietpc.com - .jungle.com - .scan.co.uk - - # These shops require pop-ups - {shop -no-popups} - .dabs.com - .overclockers.co.uk + webbugs: Squish WebBugs (1x1 invisible GIFs used for user tracking) - -------------------------------------------------------------------------------- - -3.5. The Filter File - -Any web page can be dynamically modified with the filter file. This -modification can be removal, or re-writing, of any web page content, including -tags and non-visible content. The default filter file is default.filter, -located in the config directory. - -The included example file is divided into sections. Each section begins with -the FILTER keyword, followed by the identifier for that section, e.g. "FILTER: -webbugs". Each section performs a similar type of filtering, such as -"html-annoyances". - -This file uses regular expressions to alter or remove any string in the target -page. The expressions can only operate on one line at a time. Some examples -from the included default default.filter: - -Stop web pages from displaying annoying messages in the status bar by deleting -such references: - - FILTER: html-annoyances - - # New browser windows should be resizeable and have a location and status - # bar. Make it so. - # - s/resizable="?(no|0)"?/resizable=1/ig s/noresize/yesresize/ig - s/location="?(no|0)"?/location=1/ig s/status="?(no|0)"?/status=1/ig - s/scrolling="?(no|0|Auto)"?/scrolling=1/ig - s/menubar="?(no|0)"?/menubar=1/ig - - # The tag was a crime! - # - s*|**ig - - # Is this evil? - # - #s/framespacing="?(no|0)"?//ig - #s/margin(height|width)=[0-9]*//gi + no-refresh: Automatic refresh sucks on auto-dialup lines - -Just for kicks, replace any occurrence of "Microsoft" with "MicroSuck", and -have a little fun with topical buzzwords: - - FILTER: fun - - s/microsoft(?!.com)/MicroSuck/ig - - # Buzzword Bingo: - # - s/industry-leading|cutting-edge|award-winning/BINGO!/ig + fun: Text replacements for subversive browsing fun! - -Kill those pesky little web-bugs: - - # webbugs: Squish WebBugs (1x1 invisible GIFs used for user tracking) - FILTER: webbugs - - s/]*?(width|height)\s*=\s*['"]?1\D[^>]*?(width|height)\s*=\s*['"]?1 -(\D[^>]*?)?>//sig + nimda: Remove (virus) Nimda code. + + banners-by-size: Kill banners by size + crude-parental: Kill all web pages that contain the words "sex" or + "warez" + + * Block any existing X-Forwarded-for header, and do not add a new + one: + +hide-forwarded + + * If the browser sends a "From:" header containing your e-mail + address, this either completely removes the header ("block"), or + changes it to the specified e-mail address. + +hide-from{block} + +hide-from{spam@sittingduck.xqq} + + * Don't send the "Referer:" (sic) header to the web site. You can + block it, forge a URL to the same server as the request (which is + preferred because some sites will not send images otherwise) or + set it to a constant string of your choice. + +hide-referer{block} + +hide-referer{forge} + +hide-referer{http://nowhere.com} + + * Alternative spelling of "+hide-referer". It has the same + parameters, and can be freely mixed with, "+hide-referer". + ("referrer" is the correct English spelling, however the HTTP + specification has a bug - it requires it to be spelled "referer".) + +hide-referrer{...} + + * Change the "User-Agent:" header so web servers can't tell your + browser type. Warning! This breaks many web sites. Specify the + user-agent value you want. Example, pretend to be using Netscape + on Linux: + +hide-user-agent{Mozilla (X11; I; Linux 2.0.32 i586)} + + * Treat this URL as an image. This only matters if it's also + "+block"ed, in which case a "blocked" image can be sent rather + than a HTML page. See "+image-blocker{}" below for the control + over what is actually sent. If you want invisible ads, they should + be defined as images and blocked. And also, "image-blocker" should + be set to "blank". + +image + + * Decides what to do with URLs that end up tagged with "{+block + +image}", e.g an advertizement. There are five options. + "-image-blocker" will send a HTML "blocked" page, usually + resulting in a "broken image" icon. "+image-blocker{blank}" will + send a 1x1 transparent GIF image. And finally, + "+image-blocker{http://xyz.com}" will send a HTTP temporary + redirect to the specified image. This has the advantage of the + icon being being cached by the browser, which will speed up the + display. "+image-blocker{pattern}" will send a checkboard type + pattern + +image-blocker{blank} + +image-blocker{pattern} + +image-blocker{http://p.p/send-banner} + + * By default (i.e. in the absence of a "+limit-connect" action), + Privoxy will only allow CONNECT requests to port 443, which is the + standard port for https as a precaution. + The CONNECT methods exists in HTTP to allow access to secure + websites (https:// URLs) through proxies. It works very simply: + the proxy connects to the server on the specified port, and then + short-circuits its connections to the client and to the remote + proxy. This can be a big security hole, since CONNECT-enabled + proxies can be abused as TCP relays very easily. + If you want to allow CONNECT for more ports than this, or want to + forbid CONNECT altogether, you can specify a comma separated list + of ports and port ranges (the latter using dashes, with the + minimum defaulting to 0 and max to 65K): + +limit-connect{443} # This is the default and need no be + specified. + +limit-connect{80,443} # Ports 80 and 443 are OK. + +limit-connect{-3, 7, 20-100, 500-} # Port less than 3, 7, 20 to + 100 + #and above 500 are OK. + + * "+no-compression" prevents the website from compressing the data. + Some websites do this, which can be a problem for Privoxy, since + "+filter", "+no-popup" and "+gif-deanimate" will not work on + compressed data. This will slow down connections to those + websites, though. Default is "nocompression" is turned on. + +nocompression + + * If the website sets cookies, "no-cookies-keep" will make sure they + are erased when you exit and restart your web browser. This makes + profiling cookies useless, but won't break sites which require + cookies so that you can log in for transactions. Default: on. + +no-cookies-keep + + * Prevent the website from reading cookies: + +no-cookies-read + + * Prevent the website from setting cookies: + +no-cookies-set + + * Filter the website through a built-in filter to disable those + obnoxious JavaScript pop-up windows via window.open(), etc. The + two alternative spellings are equivalent. + +no-popup + +no-popups + + * This action only applies if you are using a jarfile for saving + cookies. It sends a cookie to every site stating that you do not + accept any copyright on cookies sent to you, and asking them not + to track you. Of course, this is a (relatively) unique header they + could use to track you. + +vanilla-wafer + + * This allows you to add an arbitrary cookie. It can be specified + multiple times in order to add as many cookies as you like. + +wafer{name=value} + + The meaning of any of the above is reversed by preceding the action + with a "-", in place of the "+". + + Some examples: + + Turn off cookies by default, then allow a few through for specified + sites: + + # Turn off all persistent cookies + { +no-cookies-read } + { +no-cookies-set } + # Allow cookies for this browser session ONLY + { +no-cookies-keep } + # Exceptions to the above, sites that benefit from persistent cookies + { -no-cookies-read } + { -no-cookies-set } + { -no-cookies-keep } + .javasoft.com + .sun.com + .yahoo.com + .msdn.microsoft.com + .redhat.com + # Alternative way of saying the same thing + {-no-cookies-set -no-cookies-read -no-cookies-keep} + .sourceforge.net + .sf.net + + Now turn off "fast redirects", and then we allow two exceptions: + + # Turn them off! + {+fast-redirects} + + # Reverse it for these two sites, which don't work right without it. + {-fast-redirects} + www.ukc.ac.uk/cgi-bin/wac\.cgi\? + login.yahoo.com + + Turn on page filtering according to rules in the defined sections of + refilterfile, and make one exception for sourceforge: + + # Run everything through the filter file, using only the + # specified sections: + +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}\ + +filter{webbugs} +filter{nimda} +filter{banners-by-size} + + # Then disable filtering of code from sourceforge! + {-filter} + .cvs.sourceforge.net + + Now some URLs that we want "blocked", ie we won't see them. Many of + these use regular expressions that will expand to match multiple URLs: + + # Blocklist: + {+block} + /.*/(.*[-_.])?ads?[0-9]?(/|[-_.].*|\.(gif|jpe?g)) + /.*/(.*[-_.])?count(er)?(\.cgi|\.dll|\.exe|[?/]) + /.*/(ng)?adclient\.cgi + /.*/(plain|live|rotate)[-_.]?ads?/ + /.*/(sponsor)s?[0-9]?/ + /.*/_?(plain|live)?ads?(-banners)?/ + /.*/abanners/ + /.*/ad(sdna_image|gifs?)/ + /.*/ad(server|stream|juggler)\.(cgi|pl|dll|exe) + /.*/adbanners/ + /.*/adserver + /.*/adstream\.cgi + /.*/adv((er)?ts?|ertis(ing|ements?))?/ + /.*/banner_?ads/ + /.*/banners?/ + /.*/banners?\.cgi/ + /.*/cgi-bin/centralad/getimage + /.*/images/addver\.gif + /.*/images/marketing/.*\.(gif|jpe?g) + /.*/popupads/ + /.*/siteads/ + /.*/sponsor.*\.gif + /.*/sponsors?[0-9]?/ + /.*/advert[0-9]+\.jpg + /Media/Images/Adds/ + /ad_images/ + /adimages/ + /.*/ads/ + /bannerfarm/ + /grafikk/annonse/ + /graphics/defaultAd/ + /image\.ng/AdType + /image\.ng/transactionID + /images/.*/.*_anim\.gif # alvin brattli + /ip_img/.*\.(gif|jpe?g) + /rotateads/ + /rotations/ + /worldnet/ad\.cgi + /cgi-bin/nph-adclick.exe/ + /.*/Image/BannerAdvertising/ + /.*/ad-bin/ + /.*/adlib/server\.cgi + /autoads/ + + Note that many of these actions have the potential to cause a page to + misbehave, possibly even not to display at all. There are many ways a + site designer may choose to design his site, and what HTTP header + content he may depend on. There is no way to have hard and fast rules + for all sites. See the [52]Appendix for a brief example on + troubleshooting actions. + _________________________________________________________________ + +3.4.3. Aliases -------------------------------------------------------------------------------- + Custom "actions", known to Privoxy as "aliases", can be defined by + combining other "actions". These can in turn be invoked just like the + built-in "actions". Currently, an alias can contain any character + except space, tab, "=", "{" or "}". But please use only "a"- "z", + "0"-"9", "+", and "-". Alias names are not case sensitive, and must be + defined before anything else in the default.actionfile ! And there can + only be one set of "aliases" defined. + + Now let's define a few aliases: + + # Useful customer aliases we can use later. These must come first! + {{alias}} + +no-cookies = +no-cookies-set +no-cookies-read + -no-cookies = -no-cookies-set -no-cookies-read + fragile = -block -no-cookies -filter -fast-redirects -hide-refere + r -no-popups + shop = -no-cookies -filter -fast-redirects + +imageblock = +block +image + #For people who don't like to type too much: ;-) + c0 = +no-cookies + c1 = -no-cookies + c2 = -no-cookies-set +no-cookies-read + c3 = +no-cookies-set -no-cookies-read + #... etc. Customize to your heart's content. + + Some examples using our "shop" and "fragile" aliases from above: + + # These sites are very complex and require + # minimal interference. + {fragile} + .office.microsoft.com + .windowsupdate.microsoft.com + .nytimes.com + # Shopping sites - still want to block ads. + {shop} + .quietpc.com + .worldpay.com # for quietpc.com + .jungle.com + .scan.co.uk + # These shops require pop-ups + {shop -no-popups} + .dabs.com + .overclockers.co.uk + _________________________________________________________________ + +3.5. The Filter File + Any web page can be dynamically modified with the filter file. This + modification can be removal, or re-writing, of any web page content, + including tags and non-visible content. The default filter file is + default.filter, located in the config directory. + + The included example file is divided into sections. Each section + begins with the FILTER keyword, followed by the identifier for that + section, e.g. "FILTER: webbugs". Each section performs a similar type + of filtering, such as "html-annoyances". + + This file uses regular expressions to alter or remove any string in + the target page. The expressions can only operate on one line at a + time. Some examples from the included default default.filter: + + Stop web pages from displaying annoying messages in the status bar by + deleting such references: + + FILTER: html-annoyances + # New browser windows should be resizeable and have a location and st + atus + # bar. Make it so. + # + s/resizable="?(no|0)"?/resizable=1/ig s/noresize/yesresize/ig + s/location="?(no|0)"?/location=1/ig s/status="?(no|0)"?/status=1/ig + s/scrolling="?(no|0|Auto)"?/scrolling=1/ig + s/menubar="?(no|0)"?/menubar=1/ig + # The tag was a crime! + # + s*|**ig + # Is this evil? + # + #s/framespacing="?(no|0)"?//ig + #s/margin(height|width)=[0-9]*//gi + + Just for kicks, replace any occurrence of "Microsoft" with + "MicroSuck", and have a little fun with topical buzzwords: + + FILTER: fun + s/microsoft(?!.com)/MicroSuck/ig + # Buzzword Bingo: + # + s/industry-leading|cutting-edge|award-winning/BING + O!/ig + + Kill those pesky little web-bugs: + + # webbugs: Squish WebBugs (1x1 invisible GIFs used for user tracking) + FILTER: webbugs + s/]*?(width|height)\s*=\s*['"]?1\D[^>]*?(width|height)\s*=\ + s*['"]?1(\D[^>]*?)?>//sig + _________________________________________________________________ + 3.6. Templates -When Privoxy displays one of its internal pages, such as a 404 Not Found error -page, it uses the appropriate template. On Linux, BSD, and Unix, these are -located in /etc/privoxy/templates by default. These may be customized, if -desired. - -------------------------------------------------------------------------------- - + When Privoxy displays one of its internal pages, such as a 404 Not + Found error page, it uses the appropriate template. On Linux, BSD, and + Unix, these are located in /etc/privoxy/templates by default. These + may be customized, if desired. + _________________________________________________________________ + 4. Quickstart to Using Privoxy -Install package, then run and enjoy! Privoxy is typically started by specifying -the main configuration file to be used on the command line. Example Unix -startup command: - - - # /usr/sbin/privoxy /etc/privoxy/config - - - -An init script is provided for SuSE and Redhat. - -For for SuSE: /etc/rc.d/privoxy start - -For RedHat: /etc/rc.d/init.d/privoxy start - -If no configuration file is specified on the command line, Privoxy will look -for a file named config in the current directory. Except on Win32 where it will -try config.txt. If no file is specified on the command line and no default -configuration file can be found, Privoxy will fail to start. - -Be sure your browser is set to use the proxy which is by default at localhost, -port 8118. With Netscape (and Mozilla), this can be set under Edit -> -Preferences -> Advanced -> Proxies -> HTTP Proxy. For Internet Explorer: Tools -> Internet Properties -> Connections -> LAN Setting. Then, check "Use Proxy" -and fill in the appropriate info (Address: localhost, Port: 8118). Include if -HTTPS proxy support too. - -The included default configuration files should give a reasonable starting -point, though may be somewhat aggressive in blocking junk. You will probably -want to keep an eye out for sites that require persistent cookies, and add -these to default.action as needed. By default, most of these will be accepted -only during the current browser session, until you add them to the -configuration. If you want the browser to handle this instead, you will need to -edit default.action and disable this feature. If you use more than one browser, -it would make more sense to let Privoxy handle this. In which case, the browser -(s) should be set to accept all cookies. - -If a particular site shows problems loading properly, try adding it to the -{fragile} section of default.action. This will turn off most actions for this -site. - -Privoxy is HTTP/1.1 compliant, but not all 1.1 features are as yet implemented. -If browsers that support HTTP/1.1 (like Mozilla or recent versions of I.E.) -experience problems, you might try to force HTTP/1.0 compatibility. For -Mozilla, look under Edit -> Preferences -> Debug -> Networking. Or set the -"+downgrade" config option in default.action. - -After running Privoxy for a while, you can start to fine tune the configuration -to suit your personal, or site, preferences and requirements. There are many, -many aspects that can be customized. "Actions" (as specified in default.action) -can be adjusted by pointing your browser to http://p.p/, and then follow the -link to "edit the actions list". (This is an internal page and does not require -Internet access.) - -In fact, various aspects of Privoxy configuration can be viewed from this page, -including current configuration parameters, source code version numbers, the -browser's request headers, and "actions" that apply to a given URL. In addition -to the default.action file editor mentioned above, Privoxy can also be turned -"on" and "off" from this page. - -If you encounter problems, please verify it is a Privoxy bug, by disabling -Privoxy, and then trying the same page. Also, try another browser if possible -to eliminate browser or site problems. Before reporting it as a bug, see if -there is not a configuration option that is enabled that is causing the page -not to load. You can then add an exception for that page or site. If a bug, -please report it to the developers (see below). - -------------------------------------------------------------------------------- - + Install package, then run and enjoy! Privoxy is typically started by + specifying the main configuration file to be used on the command line. + Example Unix startup command: + + + # /usr/sbin/privoxy /etc/privoxy/config + + + An init script is provided for SuSE and Redhat. + + For for SuSE: /etc/rc.d/privoxy start + + For RedHat: /etc/rc.d/init.d/privoxy start + + If no configuration file is specified on the command line, Privoxy + will look for a file named config in the current directory. Except on + Win32 where it will try config.txt. If no file is specified on the + command line and no default configuration file can be found, Privoxy + will fail to start. + + Be sure your browser is set to use the proxy which is by default at + localhost, port 8118. With Netscape (and Mozilla), this can be set + under Edit -> Preferences -> Advanced -> Proxies -> HTTP Proxy. For + Internet Explorer: Tools > Internet Properties -> Connections -> LAN + Setting. Then, check "Use Proxy" and fill in the appropriate info + (Address: localhost, Port: 8118). Include if HTTPS proxy support too. + + The included default configuration files should give a reasonable + starting point, though may be somewhat aggressive in blocking junk. + You will probably want to keep an eye out for sites that require + persistent cookies, and add these to default.action as needed. By + default, most of these will be accepted only during the current + browser session, until you add them to the configuration. If you want + the browser to handle this instead, you will need to edit + default.action and disable this feature. If you use more than one + browser, it would make more sense to let Privoxy handle this. In which + case, the browser(s) should be set to accept all cookies. + + If a particular site shows problems loading properly, try adding it to + the {fragile} section of default.action. This will turn off most + actions for this site. + + Privoxy is HTTP/1.1 compliant, but not all 1.1 features are as yet + implemented. If browsers that support HTTP/1.1 (like Mozilla or recent + versions of I.E.) experience problems, you might try to force HTTP/1.0 + compatibility. For Mozilla, look under Edit -> Preferences -> Debug -> + Networking. Or set the "+downgrade" config option in default.action. + + After running Privoxy for a while, you can start to fine tune the + configuration to suit your personal, or site, preferences and + requirements. There are many, many aspects that can be customized. + "Actions" (as specified in default.action) can be adjusted by pointing + your browser to [53]http://p.p/, and then follow the link to "edit the + actions list". (This is an internal page and does not require Internet + access.) + + In fact, various aspects of Privoxy configuration can be viewed from + this page, including current configuration parameters, source code + version numbers, the browser's request headers, and "actions" that + apply to a given URL. In addition to the default.action file editor + mentioned above, Privoxy can also be turned "on" and "off" from this + page. + + If you encounter problems, please verify it is a Privoxy bug, by + disabling Privoxy, and then trying the same page. Also, try another + browser if possible to eliminate browser or site problems. Before + reporting it as a bug, see if there is not a configuration option that + is enabled that is causing the page not to load. You can then add an + exception for that page or site. If a bug, please report it to the + developers (see below). + _________________________________________________________________ + 4.1. Command Line Options -Privoxy may be invoked with the following command-line options: - - * --version + Privoxy may be invoked with the following command-line options: + + * --version + Print version info and exit, Unix only. + * --help + Print a short usage info and exit, Unix only. + * --no-daemon + Don't become a daemon, i.e. don't fork and become process group + leader, don't detach from controlling tty. Unix only. + * --pidfile FILE + On startup, write the process ID to FILE. Delete the FILE on exit. + Failiure to create or delete the FILE is non-fatal. If no FILE + option is given, no PID file will be used. Unix only. + * --user USER[.GROUP] + After (optionally) writing the PID file, assume the user ID of + USER, and if included the GID of GROUP. Exit if the privileges are + not sufficient to do so. Unix only. + * configfile + If no configfile is included on the command line, Privoxy will + look for a file named "config" in the current directory (except on + Win32 where it will look for "config.txt" instead). Specify full + path to avoid confusion. + _________________________________________________________________ - Print version info and exit, Unix only. - - * --help +5. Contacting the Developers, Bug Reporting and Feature Requests + + We value your feedback. However, to provide you with the best support, + please note: + + * Use the [54]Sourceforge support forum to get help. + * Submit bugs only thru our [55]Sourceforge bug forum. Make sure + that the bug has not already been submitted. Please try to verify + that it is a Privoxy bug, and not a browser or site bug first. If + you are using your own custom configuration, please try the stock + configs to see if the problem is a configuration related bug. And + if not using the latest development snapshot, please try the + latest one. Or even better, CVS sources. + * Submit feature requests only thru our [56]Sourceforge feature + request forum. + + For any other issues, feel free to use the [57]mailing lists. - Print a short usage info and exit, Unix only. + Anyone interested in actively participating in development and related + discussions can join the appropriate mailing list [58]here. Archives + are available here too. + _________________________________________________________________ - * --no-daemon +6. Copyright and History + +6.1. License + + Privoxy is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. - Don't become a daemon, i.e. don't fork and become process group leader, - don't detach from controlling tty. Unix only. + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details, which is available from + [59]the Free Software Foundation, Inc, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + _________________________________________________________________ - * --pidfile FILE +6.2. History + + Privoxy is derived from the Internet Junkbuster, with many improvments + and enhancements over the original. - On startup, write the process ID to FILE. Delete the FILE on exit. Failiure - to create or delete the FILE is non-fatal. If no FILE option is given, no - PID file will be used. Unix only. + Junkbuster was originally written by Anonymous Coders and + [60]Junkbuster's Corporation, and was released as free open-source + software under the GNU GPL. [61]Stefan Waldherr made many + improvements, and started the [62]SourceForge project Privoxy to + rekindle development. There are now several active developers + contributing. The last stable release of Junkbuster was v2.0.2, which + has now grown whiskers ;-). + _________________________________________________________________ - * --user USER[.GROUP] +7. See also + + [63]http://sourceforge.net/projects/ijbswa - After (optionally) writing the PID file, assume the user ID of USER, and if - included the GID of GROUP. Exit if the privileges are not sufficient to do - so. Unix only. + [64]http://www.privoxy.org/ - * configfile + [65]http://p.p/ - If no configfile is included on the command line, Privoxy will look for a - file named "config" in the current directory (except on Win32 where it will - look for "config.txt" instead). Specify full path to avoid confusion. + [66]http://www.junkbusters.com/ht/en/cookies.html -------------------------------------------------------------------------------- - -5. Contacting the Developers, Bug Reporting and Feature Requests - -We value your feedback. However, to provide you with the best support, please -note: - - * Use the Sourceforge support forum to get help. + [67]http://www.waldherr.org/junkbuster/ - * Submit bugs only thru our Sourceforge bug forum. Make sure that the bug has - not already been submitted. Please try to verify that it is a Privoxy bug, - and not a browser or site bug first. If you are using your own custom - configuration, please try the stock configs to see if the problem is a - configuration related bug. And if not using the latest development - snapshot, please try the latest one. Or even better, CVS sources. + [68]http://privacy.net/analyze/ - * Submit feature requests only thru our Sourceforge feature request forum. + [69]http://www.squid-cache.org/ + _________________________________________________________________ - - -For any other issues, feel free to use the mailing lists. - -Anyone interested in actively participating in development and related -discussions can join the appropriate mailing list here. Archives are available -here too. - -------------------------------------------------------------------------------- - -6. Copyright and History - -6.1. License - -Privoxy is free software; you can redistribute it and/or modify it under the -terms of the GNU General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PARTICULAR PURPOSE. See the GNU General Public License for more details, which -is available from the Free Software Foundation, Inc, 59 Temple Place - Suite -330, Boston, MA 02111-1307, USA. - -------------------------------------------------------------------------------- - -6.2. History - -Privoxy is derived from the Internet Junkbuster, with many improvments and -enhancements over the original. - -Junkbuster was originally written by Anonymous Coders and Junkbuster's -Corporation, and was released as free open-source software under the GNU GPL. -Stefan Waldherr made many improvements, and started the SourceForge project -Privoxy to rekindle development. There are now several active developers -contributing. The last stable release of Junkbuster was v2.0.2, which has now -grown whiskers ;-). - -------------------------------------------------------------------------------- - -7. See also - - http://sourceforge.net/projects/ijbswa - - http://ijbswa.sourceforge.net/ - - http://p.p/ - - http://www.junkbusters.com/ht/en/cookies.html - - http://www.waldherr.org/junkbuster/ - - http://privacy.net/analyze/ - - http://www.squid-cache.org/ - - - -------------------------------------------------------------------------------- - 8. Appendix 8.1. Regular Expressions -Privoxy can use "regular expressions" in various config files. Assuming support -for "pcre" (Perl Compatible Regular Expressions) is compiled in, which is the -default. Such configuration directives do not require regular expressions, but -they can be used to increase flexibility by matching a pattern with wild-cards -against URLs. - -If you are reading this, you probably don't understand what "regular -expressions" are, or what they can do. So this will be a very brief -introduction only. A full explanation would require a book ;-) - -"Regular expressions" is a way of matching one character expression against -another to see if it matches or not. One of the "expressions" is a literal -string of readable characters (letter, numbers, etc), and the other is a -complex string of literal characters combined with wild-cards, and other -special characters, called meta-characters. The "meta-characters" have special -meanings and are used to build the complex pattern to be matched against. Perl -Compatible Regular Expressions is an enhanced form of the regular expression -language with backward compatibility. - -To make a simple analogy, we do something similar when we use wild-card -characters when listing files with the dir command in DOS. *.* matches all -filenames. The "special" character here is the asterisk which matches any and -all characters. We can be more specific and use ? to match just individual -characters. So "dir file?.text" would match "file1.txt", "file2.txt", etc. We -are pattern matching, using a similar technique to "regular expressions"! - -Regular expressions do essentially the same thing, but are much, much more -powerful. There are many more "special characters" and ways of building complex -patterns however. Let's look at a few of the common ones, and then some -examples: - -. - Matches any single character, e.g. "a", "A", "4", ":", or "@". - -? - The preceding character or expression is matched ZERO or ONE times. Either/ -or. - -+ - The preceding character or expression is matched ONE or MORE times. - -* - The preceding character or expression is matched ZERO or MORE times. - -\ - The "escape" character denotes that the following character should be taken -literally. This is used where one of the special characters (e.g. ".") needs to -be taken literally and not as a special meta-character. - -[] - Characters enclosed in brackets will be matched if any of the enclosed -characters are encountered. - -() - parentheses are used to group a sub-expression, or multiple -sub-expressions. - -| - The "bar" character works like an "or" conditional statement. A match is -successful if the sub-expression on either side of "|" matches. - -s/string1/string2/g - This is used to rewrite strings of text. "string1" is -replaced by "string2" in this example. - -These are just some of the ones you are likely to use when matching URLs with -Privoxy, and is a long way from a definitive list. This is enough to get us -started with a few simple examples which may be more illuminating: - -/.*/banners/.* - A simple example that uses the common combination of "." and " -*" to denote any character, zero or more times. In other words, any string at -all. So we start with a literal forward slash, then our regular expression -pattern (".*") another literal forward slash, the string "banners", another -forward slash, and lastly another ".*". We are building a directory path here. -This will match any file with the path that has a directory named "banners" in -it. The ".*" matches any characters, and this could conceivably be more forward -slashes, so it might expand into a much longer looking path. For example, this -could match: "/eye/hate/spammers/banners/annoy_me_please.gif", or just "/ -banners/annoying.html", or almost an infinite number of other possible -combinations, just so it has "banners" in the path somewhere. - -A now something a little more complex: - -/.*/adv((er)?ts?|ertis(ing|ements?))?/ - We have several literal forward -slashes again ("/"), so we are building another expression that is a file path -statement. We have another ".*", so we are matching against any conceivable -sub-path, just so it matches our expression. The only true literal that must -match our pattern is adv, together with the forward slashes. What comes after -the "adv" string is the interesting part. - -Remember the "?" means the preceding expression (either a literal character or -anything grouped with "(...)" in this case) can exist or not, since this means -either zero or one match. So "((er)?ts?|ertis(ing|ements?))" is optional, as -are the individual sub-expressions: "(er)", "(ing|ements?)", and the "s". The " -|" means "or". We have two of those. For instance, "(ing|ements?)", can expand -to match either "ing" OR "ements?". What is being done here, is an attempt at -matching as many variations of "advertisement", and similar, as possible. So -this would expand to match just "adv", or "advert", or "adverts", or -"advertising", or "advertisement", or "advertisements". You get the idea. But -it would not match "advertizements" (with a "z"). We could fix that by changing -our regular expression to: "/.*/adv((er)?ts?|erti(s|z)(ing|ements?))?/", which -would then match either spelling. - -/.*/advert[0-9]+\.(gif|jpe?g) - Again another path statement with forward -slashes. Anything in the square brackets "[]" can be matched. This is using -"0-9" as a shorthand expression to mean any digit one through nine. It is the -same as saying "0123456789". So any digit matches. The "+" means one or more of -the preceding expression must be included. The preceding expression here is -what is in the square brackets -- in this case, any digit one through nine. -Then, at the end, we have a grouping: "(gif|jpe?g)". This includes a "|", so -this needs to match the expression on either side of that bar character also. A -simple "gif" on one side, and the other side will in turn match either "jpeg" -or "jpg", since the "?" means the letter "e" is optional and can be matched -once or not at all. So we are building an expression here to match image GIF or -JPEG type image file. It must include the literal string "advert", then one or -more digits, and a "." (which is now a literal, and not a special character, -since it is escaped with "\"), and lastly either "gif", or "jpeg", or "jpg". -Some possible matches would include: "//advert1.jpg", "/nasty/ads/ -advert1234.gif", "/banners/from/hell/advert99.jpg". It would not match -"advert1.gif" (no leading slash), or "/adverts232.jpg" (the expression does not -include an "s"), or "/advert1.jsp" ("jsp" is not in the expression anywhere). - -s/microsoft(?!.com)/MicroSuck/i - This is a substitution. "MicroSuck" will -replace any occurrence of "microsoft". The "i" at the end of the expression -means ignore case. The "(?!.com)" means the match should fail if "microsoft" is -followed by ".com". In other words, this acts like a "NOT" modifier. In case -this is a hyperlink, we don't want to break it ;-). - -We are barely scratching the surface of regular expressions here so that you -can understand the default Privoxy configuration files, and maybe use this -knowledge to customize your own installation. There is much, much more that can -be done with regular expressions. Now that you know enough to get started, you -can learn more on your own :/ - -More reading on Perl Compatible Regular expressions: http://www.perldoc.com/ -perl5.6/pod/perlre.html - -------------------------------------------------------------------------------- - + Privoxy can use "regular expressions" in various config files. + Assuming support for "pcre" (Perl Compatible Regular Expressions) is + compiled in, which is the default. Such configuration directives do + not require regular expressions, but they can be used to increase + flexibility by matching a pattern with wild-cards against URLs. + + If you are reading this, you probably don't understand what "regular + expressions" are, or what they can do. So this will be a very brief + introduction only. A full explanation would require a book ;-) + + "Regular expressions" is a way of matching one character expression + against another to see if it matches or not. One of the "expressions" + is a literal string of readable characters (letter, numbers, etc), and + the other is a complex string of literal characters combined with + wild-cards, and other special characters, called meta-characters. The + "meta-characters" have special meanings and are used to build the + complex pattern to be matched against. Perl Compatible Regular + Expressions is an enhanced form of the regular expression language + with backward compatibility. + + To make a simple analogy, we do something similar when we use + wild-card characters when listing files with the dir command in DOS. + *.* matches all filenames. The "special" character here is the + asterisk which matches any and all characters. We can be more specific + and use ? to match just individual characters. So "dir file?.text" + would match "file1.txt", "file2.txt", etc. We are pattern matching, + using a similar technique to "regular expressions"! + + Regular expressions do essentially the same thing, but are much, much + more powerful. There are many more "special characters" and ways of + building complex patterns however. Let's look at a few of the common + ones, and then some examples: + + . - Matches any single character, e.g. "a", "A", "4", ":", or "@". + + ? - The preceding character or expression is matched ZERO or ONE + times. Either/or. + + + - The preceding character or expression is matched ONE or MORE + times. + + * - The preceding character or expression is matched ZERO or MORE + times. + + \ - The "escape" character denotes that the following character should + be taken literally. This is used where one of the special characters + (e.g. ".") needs to be taken literally and not as a special + meta-character. + + [] - Characters enclosed in brackets will be matched if any of the + enclosed characters are encountered. + + () - parentheses are used to group a sub-expression, or multiple + sub-expressions. + + | - The "bar" character works like an "or" conditional statement. A + match is successful if the sub-expression on either side of "|" + matches. + + s/string1/string2/g - This is used to rewrite strings of text. + "string1" is replaced by "string2" in this example. + + These are just some of the ones you are likely to use when matching + URLs with Privoxy, and is a long way from a definitive list. This is + enough to get us started with a few simple examples which may be more + illuminating: + + /.*/banners/.* - A simple example that uses the common combination of + "." and "*" to denote any character, zero or more times. In other + words, any string at all. So we start with a literal forward slash, + then our regular expression pattern (".*") another literal forward + slash, the string "banners", another forward slash, and lastly another + ".*". We are building a directory path here. This will match any file + with the path that has a directory named "banners" in it. The ".*" + matches any characters, and this could conceivably be more forward + slashes, so it might expand into a much longer looking path. For + example, this could match: + "/eye/hate/spammers/banners/annoy_me_please.gif", or just + "/banners/annoying.html", or almost an infinite number of other + possible combinations, just so it has "banners" in the path somewhere. + + A now something a little more complex: + + /.*/adv((er)?ts?|ertis(ing|ements?))?/ - We have several literal + forward slashes again ("/"), so we are building another expression + that is a file path statement. We have another ".*", so we are + matching against any conceivable sub-path, just so it matches our + expression. The only true literal that must match our pattern is adv, + together with the forward slashes. What comes after the "adv" string + is the interesting part. + + Remember the "?" means the preceding expression (either a literal + character or anything grouped with "(...)" in this case) can exist or + not, since this means either zero or one match. So + "((er)?ts?|ertis(ing|ements?))" is optional, as are the individual + sub-expressions: "(er)", "(ing|ements?)", and the "s". The "|" means + "or". We have two of those. For instance, "(ing|ements?)", can expand + to match either "ing" OR "ements?". What is being done here, is an + attempt at matching as many variations of "advertisement", and + similar, as possible. So this would expand to match just "adv", or + "advert", or "adverts", or "advertising", or "advertisement", or + "advertisements". You get the idea. But it would not match + "advertizements" (with a "z"). We could fix that by changing our + regular expression to: "/.*/adv((er)?ts?|erti(s|z)(ing|ements?))?/", + which would then match either spelling. + + /.*/advert[0-9]+\.(gif|jpe?g) - Again another path statement with + forward slashes. Anything in the square brackets "[]" can be matched. + This is using "0-9" as a shorthand expression to mean any digit one + through nine. It is the same as saying "0123456789". So any digit + matches. The "+" means one or more of the preceding expression must be + included. The preceding expression here is what is in the square + brackets -- in this case, any digit one through nine. Then, at the + end, we have a grouping: "(gif|jpe?g)". This includes a "|", so this + needs to match the expression on either side of that bar character + also. A simple "gif" on one side, and the other side will in turn + match either "jpeg" or "jpg", since the "?" means the letter "e" is + optional and can be matched once or not at all. So we are building an + expression here to match image GIF or JPEG type image file. It must + include the literal string "advert", then one or more digits, and a + "." (which is now a literal, and not a special character, since it is + escaped with "\"), and lastly either "gif", or "jpeg", or "jpg". Some + possible matches would include: "//advert1.jpg", + "/nasty/ads/advert1234.gif", "/banners/from/hell/advert99.jpg". It + would not match "advert1.gif" (no leading slash), or "/adverts232.jpg" + (the expression does not include an "s"), or "/advert1.jsp" ("jsp" is + not in the expression anywhere). + + s/microsoft(?!.com)/MicroSuck/i - This is a substitution. "MicroSuck" + will replace any occurrence of "microsoft". The "i" at the end of the + expression means ignore case. The "(?!.com)" means the match should + fail if "microsoft" is followed by ".com". In other words, this acts + like a "NOT" modifier. In case this is a hyperlink, we don't want to + break it ;-). + + We are barely scratching the surface of regular expressions here so + that you can understand the default Privoxy configuration files, and + maybe use this knowledge to customize your own installation. There is + much, much more that can be done with regular expressions. Now that + you know enough to get started, you can learn more on your own :/ + + More reading on Perl Compatible Regular expressions: + [70]http://www.perldoc.com/perl5.6/pod/perlre.html + _________________________________________________________________ + 8.2. Privoxy's Internal Pages -Since Privoxy proxies each requested web page, it is easy for Privoxy to trap -certain URLs. In this way, we can talk directly to Privoxy, and see how it is -configured, see how our rules are being applied, change these rules and other -configuration options, and even turn Privoxy's filtering off, all with a web -browser. - -The URLs listed below are the special ones that allow direct access to Privoxy. -Of course, Privoxy must be running to access these. If not, you will get a -friendly error message. Internet access is not necessary either. - - * Privoxy main page: - - http://ijbswa.sourceforge.net/config/ - - Alternately, this may be reached at http://p.p/, but this variation may not - work as reliably as the above in some configurations. + Since Privoxy proxies each requested web page, it is easy for Privoxy + to trap certain URLs. In this way, we can talk directly to Privoxy, + and see how it is configured, see how our rules are being applied, + change these rules and other configuration options, and even turn + Privoxy's filtering off, all with a web browser. - * Show information about the current configuration: + The URLs listed below are the special ones that allow direct access to + Privoxy. Of course, Privoxy must be running to access these. If not, + you will get a friendly error message. Internet access is not + necessary either. - http://ijbswa.sourceforge.net/config/show-status + * Privoxy main page: - * Show the source code version numbers: - - http://ijbswa.sourceforge.net/config/show-version + [71]http://www.privoxy.org/config/ + Alternately, this may be reached at [72]http://p.p/, but this + variation may not work as reliably as the above in some + configurations. + * Show information about the current configuration: - * Show the client's request headers: - - http://ijbswa.sourceforge.net/config/show-request + [73]http://www.privoxy.org/config/show-status + * Show the source code version numbers: - * Show which actions apply to a URL and why: - - http://ijbswa.sourceforge.net/config/show-url-info + [74]http://www.privoxy.org/config/show-version + * Show the client's request headers: - * Toggle Privoxy on or off: - - http://ijbswa.sourceforge.net/config/toggle + [75]http://www.privoxy.org/config/show-request + * Show which actions apply to a URL and why: - Short cuts. Turn off, then on: - - http://ijbswa.sourceforge.net/config/toggle?set=disable + [76]http://www.privoxy.org/config/show-url-info + * Toggle Privoxy on or off: - http://ijbswa.sourceforge.net/config/toggle?set=enable + [77]http://www.privoxy.org/config/toggle + Short cuts. Turn off, then on: - * Edit the actions list file: - - http://ijbswa.sourceforge.net/config/edit-actions + [78]http://www.privoxy.org/config/toggle?set=disable -These may be bookmarked for quick reference. - -------------------------------------------------------------------------------- - + [79]http://www.privoxy.org/config/toggle?set=enable + * Edit the actions list file: + + [80]http://www.privoxy.org/config/edit-actions + + These may be bookmarked for quick reference. + _________________________________________________________________ + 8.3. Anatomy of an Action -The way Privoxy applies "actions" to any given URL can be complex, and not -always so easy to understand what is happening. And sometimes we need to be -able to see just what Privoxy is doing. Especially, if something Privoxy is -doing is causing us a problem inadvertantly. It can be a little daunting to -look at the actions files themselves, since they tend to be filled with -"regular expressions" whose consequences are not always so obvious. Privoxy -provides the http://ijbswa.sourceforge.net/config/show-url-info page that can -show us very specifically how actions are being applied to any given URL. This -is a big help for troubleshooting. - -First, enter one URL (or partial URL) at the prompt, and then Privoxy will tell -us how the current configuration will handle it. This will not help with -filtering effects from the default.filter file! It also will not tell you about -any other URLs that may be embedded within the URL you are testing. For -instance, images such as ads are expressed as URLs within the raw page source -of HTML pages. So you will only get info for the actual URL that is pasted into -the prompt area -- not any sub-URLs. If you want to know about embedded URLs -like ads, you will have to dig those out of the HTML source. Use your browser's -"View Page Source" option for this. - -Let's look at an example, google.com, one section at a time: - - System default actions: - - { -add-header -block -deanimate-gifs -downgrade -fast-redirects -filter - -hide-forwarded -hide-from -hide-referer -hide-user-agent -image - -image-blocker -limit-connect -no-compression -no-cookies-keep - -no-cookies-read -no-cookies-set -no-popups -vanilla-wafer -wafer } - - - -This is the top section, and only tells us of the compiled in defaults. This is -basically what Privoxy would do if there were not any "actions" defined, i.e. -it does nothing. Every action is disabled. This is not particularly informative -for our purposes here. OK, next section: - - Matches for http://google.com: - - { -add-header -block +deanimate-gifs -downgrade +fast-redirects - +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups} - +filter{webbugs} +filter{nimda} +filter{banners-by-size} +filter{hal} - +filter{fun} +hide-forwarded +hide-from{block} +hide-referer{forge} - -hide-user-agent -image +image-blocker{blank} +no-compression - +no-cookies-keep -no-cookies-read -no-cookies-set +no-popups - -vanilla-wafer -wafer } - / - - { -no-cookies-keep -no-cookies-read -no-cookies-set } - .google.com - - { -fast-redirects } - .google.com - - - -This is much more informative, and tells us how we have defined our "actions", -and which ones match for our example, "google.com". The first grouping shows -our default settings, which would apply to all URLs. If you look at your -"actions" file, this would be the section just below the "aliases" section near -the top. This applies to all URLs as signified by the single forward slash -- " -/". - -These are the default actions we have enabled. But we can define additional -actions that would be exceptions to these general rules, and then list specific -URLs that these exceptions would apply to. Last match wins. Just below this -then are two explict matches for ".google.com". The first is negating our -various cookie blocking actions (i.e. we will allow cookies here). The second -is allowing "fast-redirects". Note that there is a leading dot here -- -".google.com". This will match any hosts and sub-domains, in the google.com -domain also, such as "www.google.com". So, apparently, we have these actions -defined somewhere in the lower part of our actions file, and "google.com" is -referenced in these sections. - -And now we pull it altogether in the bottom section and summarize how Privoxy -is appying all its "actions" to "google.com": - - Final results: - - -add-header -block -deanimate-gifs -downgrade -fast-redirects - +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups} - +filter{webbugs} +filter{nimda} +filter{banners-by-size} +filter{hal} - +filter{fun} +hide-forwarded +hide-from{block} +hide-referer{forge} - -hide-user-agent -image +image-blocker{blank} -limit-connect +no-compression - -no-cookies-keep -no-cookies-read -no-cookies-set +no-popups -vanilla-wafer - -wafer - - - -Now another example, "ad.doubleclick.net": - - { +block +image } - .ad.doubleclick.net - - { +block +image } - ad*. - - { +block +image } - .doubleclick.net - - - -We'll just show the interesting part here, the explicit matches. It is matched -three different times. Each as an "+block +image", which is the expanded form -of one of our aliases that had been defined as: "+imageblock". ("Aliases" are -defined in the first section of the actions file and typically used to combine -more than one action.) - -Any one of these would have done the trick and blocked this as an unwanted -image. This is unnecessarily redundant since the last case effectively would -also cover the first. No point in taking chances with these guys though ;-) -Note that if you want an ad or obnoxious URL to be invisible, it should be -defined as "ad.doubleclick.net" is done here -- as both a "+block" and an -"+image". The custom alias "+imageblock" does this for us. - -One last example. Let's try "http://www.rhapsodyk.net/adsl/HOWTO/". This one is -giving us problems. We are getting a blank page. Hmmm... - - Matches for http://www.rhapsodyk.net/adsl/HOWTO/: - - { -add-header -block +deanimate-gifs -downgrade +fast-redirects - +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups} - +filter{webbugs} +filter{nimda} +filter{banners-by-size} +filter{hal} - +filter{fun} +hide-forwarded +hide-from{block} +hide-referer{forge} - -hide-user-agent -image +image-blocker{blank} +no-compression - +no-cookies-keep -no-cookies-read -no-cookies-set +no-popups - -vanilla-wafer -wafer } - / - - { +block +image } - /ads - - - -Ooops, the "/adsl/" is matching "/ads"! But we did not want this at all! Now we -see why we get the blank page. We could now add a new action below this that -explictly does not block (-block) pages with "adsl". There are various ways to -handle such exceptions. Example: - - { -block } - /adsl - - - -Now the page displays ;-) - + The way Privoxy applies "actions" to any given URL can be complex, and + not always so easy to understand what is happening. And sometimes we + need to be able to see just what Privoxy is doing. Especially, if + something Privoxy is doing is causing us a problem inadvertantly. It + can be a little daunting to look at the actions files themselves, + since they tend to be filled with "regular expressions" whose + consequences are not always so obvious. Privoxy provides the + [81]http://www.privoxy.org/config/show-url-info page that can show us + very specifically how actions are being applied to any given URL. This + is a big help for troubleshooting. + + First, enter one URL (or partial URL) at the prompt, and then Privoxy + will tell us how the current configuration will handle it. This will + not help with filtering effects from the default.filter file! It also + will not tell you about any other URLs that may be embedded within the + URL you are testing. For instance, images such as ads are expressed as + URLs within the raw page source of HTML pages. So you will only get + info for the actual URL that is pasted into the prompt area -- not any + sub-URLs. If you want to know about embedded URLs like ads, you will + have to dig those out of the HTML source. Use your browser's "View + Page Source" option for this. + + Let's look at an example, [82]google.com, one section at a time: + + System default actions: + + { -add-header -block -deanimate-gifs -downgrade -fast-redirects -filter + -hide-forwarded -hide-from -hide-referer -hide-user-agent -image + -image-blocker -limit-connect -no-compression -no-cookies-keep + -no-cookies-read -no-cookies-set -no-popups -vanilla-wafer -wafer } + + + This is the top section, and only tells us of the compiled in + defaults. This is basically what Privoxy would do if there were not + any "actions" defined, i.e. it does nothing. Every action is disabled. + This is not particularly informative for our purposes here. OK, next + section: + + Matches for http://google.com: + + { -add-header -block +deanimate-gifs -downgrade +fast-redirects + +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups} + +filter{webbugs} +filter{nimda} +filter{banners-by-size} +filter{hal} + +filter{fun} +hide-forwarded +hide-from{block} +hide-referer{forge} + -hide-user-agent -image +image-blocker{blank} +no-compression + +no-cookies-keep -no-cookies-read -no-cookies-set +no-popups + -vanilla-wafer -wafer } + / + + { -no-cookies-keep -no-cookies-read -no-cookies-set } + .google.com + + { -fast-redirects } + .google.com + + + This is much more informative, and tells us how we have defined our + "actions", and which ones match for our example, "google.com". The + first grouping shows our default settings, which would apply to all + URLs. If you look at your "actions" file, this would be the section + just below the "aliases" section near the top. This applies to all + URLs as signified by the single forward slash -- "/". + + These are the default actions we have enabled. But we can define + additional actions that would be exceptions to these general rules, + and then list specific URLs that these exceptions would apply to. Last + match wins. Just below this then are two explict matches for + ".google.com". The first is negating our various cookie blocking + actions (i.e. we will allow cookies here). The second is allowing + "fast-redirects". Note that there is a leading dot here -- + ".google.com". This will match any hosts and sub-domains, in the + google.com domain also, such as "www.google.com". So, apparently, we + have these actions defined somewhere in the lower part of our actions + file, and "google.com" is referenced in these sections. + + And now we pull it altogether in the bottom section and summarize how + Privoxy is appying all its "actions" to "google.com": + + Final results: + + -add-header -block -deanimate-gifs -downgrade -fast-redirects + +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups} + +filter{webbugs} +filter{nimda} +filter{banners-by-size} +filter{hal} + +filter{fun} +hide-forwarded +hide-from{block} +hide-referer{forge} + -hide-user-agent -image +image-blocker{blank} -limit-connect +no-compression + -no-cookies-keep -no-cookies-read -no-cookies-set +no-popups -vanilla-wafer + -wafer + + + Now another example, "ad.doubleclick.net": + + { +block +image } + .ad.doubleclick.net + + { +block +image } + ad*. + + { +block +image } + .doubleclick.net + + + We'll just show the interesting part here, the explicit matches. It is + matched three different times. Each as an "+block +image", which is + the expanded form of one of our aliases that had been defined as: + "+imageblock". ("Aliases" are defined in the first section of the + actions file and typically used to combine more than one action.) + + Any one of these would have done the trick and blocked this as an + unwanted image. This is unnecessarily redundant since the last case + effectively would also cover the first. No point in taking chances + with these guys though ;-) Note that if you want an ad or obnoxious + URL to be invisible, it should be defined as "ad.doubleclick.net" is + done here -- as both a "+block" and an "+image". The custom alias + "+imageblock" does this for us. + + One last example. Let's try "http://www.rhapsodyk.net/adsl/HOWTO/". + This one is giving us problems. We are getting a blank page. Hmmm... + + Matches for http://www.rhapsodyk.net/adsl/HOWTO/: + + { -add-header -block +deanimate-gifs -downgrade +fast-redirects + +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups} + +filter{webbugs} +filter{nimda} +filter{banners-by-size} +filter{hal} + +filter{fun} +hide-forwarded +hide-from{block} +hide-referer{forge} + -hide-user-agent -image +image-blocker{blank} +no-compression + +no-cookies-keep -no-cookies-read -no-cookies-set +no-popups + -vanilla-wafer -wafer } + / + + { +block +image } + /ads + + + Ooops, the "/adsl/" is matching "/ads"! But we did not want this at + all! Now we see why we get the blank page. We could now add a new + action below this that explictly does not block (-block) pages with + "adsl". There are various ways to handle such exceptions. Example: + + { -block } + /adsl + + + Now the page displays ;-) + +References + + Visible links + 1. http://www.privoxy.org/user-manual/ + 2. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#INTRODUCTION + 3. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN31 + 4. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#INSTALLATION + 5. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#INSTALLATION-SOURCE + 6. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#INSTALLATION-RH + 7. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#INSTALLATION-SUSE + 8. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#INSTALLATION-OS2 + 9. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#INSTALLATION-WIN + 10. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#INSTALLATION-OTHER + 11. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#CONFIGURATION + 12. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN150 + 13. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN168 + 14. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN199 + 15. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN232 + 16. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN325 + 17. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN462 + 18. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN550 + 19. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN659 + 20. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#ACTIONSFILE + 21. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN758 + 22. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN832 + 23. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1149 + 24. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#FILTERFILE + 25. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1208 + 26. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#QUICKSTART + 27. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1264 + 28. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#CONTACT + 29. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#COPYRIGHT + 30. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1323 + 31. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1329 + 32. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#SEEALSO + 33. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#APPENDIX + 34. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#REGEX + 35. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1517 + 36. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#ACTIONSANAT + 37. http://p.p/ + 38. http://sourceforge.net/projects/ijbswa/ + 39. http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ijbswa/current/ + 40. http://www.gnu.org/ + 41. http://p.p/ + 42. http://www.privoxy.org/config/ + 43. http://p.p/ + 44. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#ACTIONSFILE + 45. http://p.p/ + 46. http://p.p/ + 47. http://p.p/ + 48. http://p.p/ + 49. http://p.p/show-url-info + 50. http://www.perldoc.com/perl5.6/pod/perlre.html + 51. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#REGEX + 52. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#ACTIONSANAT + 53. http://p.p/ + 54. http://sourceforge.net/tracker/?group_id=11118&atid=211118 + 55. http://sourceforge.net/tracker/?group_id=11118&atid=111118 + 56. http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse + 57. http://sourceforge.net/mail/?group_id=11118 + 58. http://sourceforge.net/mail/?group_id=11118 + 59. http://www.gnu.org/copyleft/gpl.html + 60. http://www.junkbusters.com/ht/en/ijbfaq.html + 61. http://www.waldherr.org/junkbuster/ + 62. http://sourceforge.net/projects/ijbswa/ + 63. http://sourceforge.net/projects/ijbswa + 64. http://www.privoxy.org/ + 65. http://p.p/ + 66. http://www.junkbusters.com/ht/en/cookies.html + 67. http://www.waldherr.org/junkbuster/ + 68. http://privacy.net/analyze/ + 69. http://www.squid-cache.org/ + 70. http://www.perldoc.com/perl5.6/pod/perlre.html + 71. http://www.privoxy.org/config/ + 72. http://p.p/ + 73. http://www.privoxy.org/config/show-status + 74. http://www.privoxy.org/config/show-version + 75. http://www.privoxy.org/config/show-request + 76. http://www.privoxy.org/config/show-url-info + 77. http://www.privoxy.org/config/toggle + 78. http://www.privoxy.org/config/toggle?set=disable + 79. http://www.privoxy.org/config/toggle?set=enable + 80. http://www.privoxy.org/config/edit-actions + 81. http://www.privoxy.org/config/show-url-info + 82. http://google.com/ + + Hidden links: + 83. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1389 + 84. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1397 + 85. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1400 + 86. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1403 + 87. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1406 + 88. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1411 + 89. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1414 + 90. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1417 + 91. file://localhost/home/swa/sf/current-org/doc/source/tmp.html#AEN1423 diff --git a/doc/webserver/README.txt b/doc/webserver/README.txt index 60680f9f..4221e3a8 100644 --- a/doc/webserver/README.txt +++ b/doc/webserver/README.txt @@ -3,6 +3,7 @@ on the project's homepage ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ -which is indeed http://ijbswa.sourceforge.net. +which is indeed http://ijbswa.sourceforge.net +and http://www.privoxy.org/. --Stefan, June 2001 \ No newline at end of file +-Stefan, April 2002 \ No newline at end of file diff --git a/doc/webserver/index.html b/doc/webserver/index.html index 77a336b7..8263916f 100644 --- a/doc/webserver/index.html +++ b/doc/webserver/index.html @@ -7,10 +7,10 @@ This file belongs in ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ - $Id: index.html,v 1.11 2002/03/26 13:13:11 swa Exp $ + $Id: index.html,v 1.12 2002/03/26 13:21:41 swa Exp $ Written by and Copyright (C) 2001 the SourceForge - Privoxy team. http://ijbswa.sourceforge.net + Privoxy team. http://www.privoxy.org/ Based on the Internet Junkbuster originally written by and Copyright (C) 1997 Anonymous Coders and diff --git a/encode.c b/encode.c index 50e67e0c..09c7b5f7 100644 --- a/encode.c +++ b/encode.c @@ -1,4 +1,4 @@ -const char encode_rcs[] = "$Id: encode.c,v 1.6 2002/03/13 00:27:04 jongfoster Exp $"; +const char encode_rcs[] = "$Id: encode.c,v 1.7 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/encode.c,v $ @@ -7,7 +7,7 @@ const char encode_rcs[] = "$Id: encode.c,v 1.6 2002/03/13 00:27:04 jongfoster Ex * encode cookies and HTML text. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,9 @@ const char encode_rcs[] = "$Id: encode.c,v 1.6 2002/03/13 00:27:04 jongfoster Ex * * Revisions : * $Log: encode.c,v $ + * Revision 1.7 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.6 2002/03/13 00:27:04 jongfoster * Killing warnings * diff --git a/encode.h b/encode.h index 2eb19ffb..875b9662 100644 --- a/encode.h +++ b/encode.h @@ -1,6 +1,6 @@ #ifndef ENCODE_H_INCLUDED #define ENCODE_H_INCLUDED -#define ENCODE_H_VERSION "$Id: encode.h,v 1.3 2002/01/22 23:28:07 jongfoster Exp $" +#define ENCODE_H_VERSION "$Id: encode.h,v 1.4 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/encode.h,v $ @@ -9,7 +9,7 @@ * encode cookies and HTML text. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,9 @@ * * Revisions : * $Log: encode.h,v $ + * Revision 1.4 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.3 2002/01/22 23:28:07 jongfoster * Adding convenience function html_encode_and_free_original() * Making all functions accept NULL paramaters - in this case, they diff --git a/errlog.c b/errlog.c index b9ad70c4..7b32addb 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.35 2002/03/24 15:23:33 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -7,7 +7,7 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; * printf-like fashion. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,9 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; * * Revisions : * $Log: errlog.c,v $ + * Revision 1.35 2002/03/24 15:23:33 jongfoster + * Name changes + * * Revision 1.34 2002/03/24 13:25:43 swa * name change related issues * diff --git a/errlog.h b/errlog.h index 80b3decf..c3424dd0 100644 --- a/errlog.h +++ b/errlog.h @@ -1,6 +1,6 @@ #ifndef ERRLOG_H_INCLUDED #define ERRLOG_H_INCLUDED -#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.11 2002/03/06 23:02:57 jongfoster Exp $" +#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.12 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.h,v $ @@ -9,7 +9,7 @@ * printf-like fashion. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,9 @@ * * Revisions : * $Log: errlog.h,v $ + * Revision 1.12 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.11 2002/03/06 23:02:57 jongfoster * Removing tabs * diff --git a/filters.c b/filters.c index 6140bb09..6f16d847 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.51 2002/03/24 15:23:33 jongfoster Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 1.52 2002/03/24 16:35:57 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -12,7 +12,7 @@ const char filters_rcs[] = "$Id: filters.c,v 1.51 2002/03/24 15:23:33 jongfoster * 'ijb_send_banner', and `trust_url' * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -38,6 +38,9 @@ const char filters_rcs[] = "$Id: filters.c,v 1.51 2002/03/24 15:23:33 jongfoster * * Revisions : * $Log: filters.c,v $ + * Revision 1.52 2002/03/24 16:35:57 jongfoster + * Removing logo + * * Revision 1.51 2002/03/24 15:23:33 jongfoster * Name changes * diff --git a/filters.h b/filters.h index 66c1aae6..82b59cef 100644 --- a/filters.h +++ b/filters.h @@ -1,6 +1,6 @@ #ifndef FILTERS_H_INCLUDED #define FILTERS_H_INCLUDED -#define FILTERS_H_VERSION "$Id: filters.h,v 1.17 2002/03/24 13:25:43 swa Exp $" +#define FILTERS_H_VERSION "$Id: filters.h,v 1.18 2002/03/25 22:12:45 oes Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.h,v $ @@ -13,7 +13,7 @@ * `show_proxy_args', and `trust_url' * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -39,6 +39,9 @@ * * Revisions : * $Log: filters.h,v $ + * Revision 1.18 2002/03/25 22:12:45 oes + * Added fix for undefined INADDR_NONE on Solaris by Bart Schelstraete + * * Revision 1.17 2002/03/24 13:25:43 swa * name change related issues * diff --git a/gateway.c b/gateway.c index dbe4f32a..cff71726 100644 --- a/gateway.c +++ b/gateway.c @@ -1,4 +1,4 @@ -const char gateway_rcs[] = "$Id: gateway.c,v 1.13 2002/03/13 00:29:59 jongfoster Exp $"; +const char gateway_rcs[] = "$Id: gateway.c,v 1.14 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.c,v $ @@ -8,7 +8,7 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.13 2002/03/13 00:29:59 jongfoster * proxy). * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -34,6 +34,9 @@ const char gateway_rcs[] = "$Id: gateway.c,v 1.13 2002/03/13 00:29:59 jongfoster * * Revisions : * $Log: gateway.c,v $ + * Revision 1.14 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.13 2002/03/13 00:29:59 jongfoster * Killing warnings * diff --git a/gateway.h b/gateway.h index b36d7a42..d96bc58d 100644 --- a/gateway.h +++ b/gateway.h @@ -1,6 +1,6 @@ #ifndef GATEWAY_H_INCLUDED #define GATEWAY_H_INCLUDED -#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.5 2002/03/24 13:25:43 swa Exp $" +#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.6 2002/03/25 22:12:45 oes Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.h,v $ @@ -10,7 +10,7 @@ * proxy). Also contains the list of gateway types. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,6 +36,9 @@ * * Revisions : * $Log: gateway.h,v $ + * Revision 1.6 2002/03/25 22:12:45 oes + * Added fix for undefined INADDR_NONE on Solaris by Bart Schelstraete + * * Revision 1.5 2002/03/24 13:25:43 swa * name change related issues * diff --git a/intermediate.action b/intermediate.action index b8005d84..80bbc6fe 100644 --- a/intermediate.action +++ b/intermediate.action @@ -2,10 +2,10 @@ # # File : $Source: /cvsroot/ijbswa/current/intermediate.action,v $ # -# $Id: intermediate.action,v 1.1 2002/03/24 11:37:39 jongfoster Exp $ +# $Id: intermediate.action,v 1.2 2002/03/24 13:02:18 swa Exp $ # # Purpose : More agressive actions file, see -# http://ijbswa.sourceforge.net/faq/questions.html#CONFIGFILES +# http://www.privoxy.org/faq/questions.html#CONFIGFILES # # We value your feedback. However, to provide you with the best support, # please note: @@ -56,7 +56,7 @@ ###################################################################### # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and diff --git a/jbsockets.c b/jbsockets.c index c2aa3a49..3edd7f19 100644 --- a/jbsockets.c +++ b/jbsockets.c @@ -1,4 +1,4 @@ -const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.27 2002/03/13 00:27:05 jongfoster Exp $"; +const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.28 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.c,v $ @@ -9,7 +9,7 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.27 2002/03/13 00:27:05 jongfo * on many platforms. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,9 @@ const char jbsockets_rcs[] = "$Id: jbsockets.c,v 1.27 2002/03/13 00:27:05 jongfo * * Revisions : * $Log: jbsockets.c,v $ + * Revision 1.28 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.27 2002/03/13 00:27:05 jongfoster * Killing warnings * diff --git a/jbsockets.h b/jbsockets.h index 1938d379..31393301 100644 --- a/jbsockets.h +++ b/jbsockets.h @@ -1,6 +1,6 @@ #ifndef JBSOCKETS_H_INCLUDED #define JBSOCKETS_H_INCLUDED -#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.6 2002/03/13 00:27:05 jongfoster Exp $" +#define JBSOCKETS_H_VERSION "$Id: jbsockets.h,v 1.7 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jbsockets.h,v $ @@ -11,7 +11,7 @@ * on many platforms. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -37,6 +37,9 @@ * * Revisions : * $Log: jbsockets.h,v $ + * Revision 1.7 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.6 2002/03/13 00:27:05 jongfoster * Killing warnings * diff --git a/jcc.c b/jcc.c index 84a7eb47..be080500 100644 --- a/jcc.c +++ b/jcc.c @@ -1,4 +1,4 @@ -const char jcc_rcs[] = "$Id: jcc.c,v 1.85 2002/03/24 15:23:33 jongfoster Exp $"; +const char jcc_rcs[] = "$Id: jcc.c,v 1.86 2002/03/25 17:04:55 david__schmidt Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.c,v $ @@ -7,7 +7,7 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.85 2002/03/24 15:23:33 jongfoster Exp $"; * the main connection-handling function. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.85 2002/03/24 15:23:33 jongfoster Exp $"; * * Revisions : * $Log: jcc.c,v $ + * Revision 1.86 2002/03/25 17:04:55 david__schmidt + * Workaround for closing the jarfile before load_config() comes around again + * * Revision 1.85 2002/03/24 15:23:33 jongfoster * Name changes * diff --git a/jcc.h b/jcc.h index 014a4c0a..1778f1ea 100644 --- a/jcc.h +++ b/jcc.h @@ -1,6 +1,6 @@ #ifndef JCC_H_INCLUDED #define JCC_H_INCLUDED -#define JCC_H_VERSION "$Id: jcc.h,v 1.10 2002/03/16 23:54:06 jongfoster Exp $" +#define JCC_H_VERSION "$Id: jcc.h,v 1.11 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.h,v $ @@ -9,7 +9,7 @@ * the main connection-handling function. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,9 @@ * * Revisions : * $Log: jcc.h,v $ + * Revision 1.11 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.10 2002/03/16 23:54:06 jongfoster * Adding graceful termination feature, to help look for memory leaks. * If you enable this (which, by design, has to be done by hand diff --git a/killpopup.c b/killpopup.c index 625248fb..34653738 100644 --- a/killpopup.c +++ b/killpopup.c @@ -1,4 +1,4 @@ -const char killpopup_rcs[] = "$Id: killpopup.c,v 1.14 2002/03/07 03:46:53 oes Exp $"; +const char killpopup_rcs[] = "$Id: killpopup.c,v 1.15 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/killpopup.c,v $ @@ -6,7 +6,7 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.14 2002/03/07 03:46:53 oes Ex * Purpose : Handles the filtering of popups. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -32,6 +32,9 @@ const char killpopup_rcs[] = "$Id: killpopup.c,v 1.14 2002/03/07 03:46:53 oes Ex * * Revisions : * $Log: killpopup.c,v $ + * Revision 1.15 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.14 2002/03/07 03:46:53 oes * Fixed compiler warnings etc * diff --git a/killpopup.h b/killpopup.h index 795cf517..7d2eadf6 100644 --- a/killpopup.h +++ b/killpopup.h @@ -1,6 +1,6 @@ #ifndef KILLPOPUP_H_INCLUDED #define KILLPOPUP_H_INCLUDED -#define KILLPOPUP_H_VERSION "$Id: killpopup.h,v 1.6 2001/10/07 15:42:41 oes Exp $" +#define KILLPOPUP_H_VERSION "$Id: killpopup.h,v 1.7 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/killpopup.h,v $ @@ -8,7 +8,7 @@ * Purpose : Handles the filtering of popups. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -34,6 +34,9 @@ * * Revisions : * $Log: killpopup.h,v $ + * Revision 1.7 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.6 2001/10/07 15:42:41 oes * filter_popups now gets a csp pointer so it can raise the new * CSP_FLAG_MODIFIED flag. diff --git a/list.c b/list.c index dcb864d3..6cd7f891 100644 --- a/list.c +++ b/list.c @@ -1,4 +1,4 @@ -const char list_rcs[] = "$Id: list.c,v 1.13 2002/03/07 03:46:17 oes Exp $"; +const char list_rcs[] = "$Id: list.c,v 1.14 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/list.c,v $ @@ -8,7 +8,7 @@ const char list_rcs[] = "$Id: list.c,v 1.13 2002/03/07 03:46:17 oes Exp $"; * `destroy_list', `enlist' and `list_to_text' * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -34,6 +34,9 @@ const char list_rcs[] = "$Id: list.c,v 1.13 2002/03/07 03:46:17 oes Exp $"; * * Revisions : * $Log: list.c,v $ + * Revision 1.14 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.13 2002/03/07 03:46:17 oes * Fixed compiler warnings * diff --git a/list.h b/list.h index 063faf40..afa44238 100644 --- a/list.h +++ b/list.h @@ -1,6 +1,6 @@ #ifndef LIST_H_INCLUDED #define LIST_H_INCLUDED -#define LIST_H_VERSION "$Id: list.h,v 1.10 2002/03/07 03:46:17 oes Exp $" +#define LIST_H_VERSION "$Id: list.h,v 1.11 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/list.h,v $ @@ -10,7 +10,7 @@ * `destroy_list', `enlist' and `list_to_text' * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,6 +36,9 @@ * * Revisions : * $Log: list.h,v $ + * Revision 1.11 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.10 2002/03/07 03:46:17 oes * Fixed compiler warnings * diff --git a/loadcfg.c b/loadcfg.c index 30af0f91..10bba47e 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.38 2002/03/24 13:05:48 jongfoster Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.39 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -9,7 +9,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.38 2002/03/24 13:05:48 jongfoster * variables it writes to. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.38 2002/03/24 13:05:48 jongfoster * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.39 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.38 2002/03/24 13:05:48 jongfoster * Renaming re_filterfile to filterfile * diff --git a/loadcfg.h b/loadcfg.h index 96d9358c..3e71b752 100644 --- a/loadcfg.h +++ b/loadcfg.h @@ -1,6 +1,6 @@ #ifndef LOADCFG_H_INCLUDED #define LOADCFG_H_INCLUDED -#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.9 2002/03/16 23:54:06 jongfoster Exp $" +#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.10 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.h,v $ @@ -11,7 +11,7 @@ * variables it writes to. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -37,6 +37,9 @@ * * Revisions : * $Log: loadcfg.h,v $ + * Revision 1.10 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.9 2002/03/16 23:54:06 jongfoster * Adding graceful termination feature, to help look for memory leaks. * If you enable this (which, by design, has to be done by hand diff --git a/loaders.c b/loaders.c index e6dbf610..f63b9168 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.45 2002/03/16 23:54:06 jongfoster Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.46 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -9,7 +9,7 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.45 2002/03/16 23:54:06 jongfoster * unload files that are no longer in use. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,9 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.45 2002/03/16 23:54:06 jongfoster * * Revisions : * $Log: loaders.c,v $ + * Revision 1.46 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.45 2002/03/16 23:54:06 jongfoster * Adding graceful termination feature, to help look for memory leaks. * If you enable this (which, by design, has to be done by hand diff --git a/loaders.h b/loaders.h index bf9a709e..216c352d 100644 --- a/loaders.h +++ b/loaders.h @@ -1,6 +1,6 @@ #ifndef LOADERS_H_INCLUDED #define LOADERS_H_INCLUDED -#define LOADERS_H_VERSION "$Id: loaders.h,v 1.17 2002/03/16 23:54:06 jongfoster Exp $" +#define LOADERS_H_VERSION "$Id: loaders.h,v 1.18 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.h,v $ @@ -11,7 +11,7 @@ * unload files that are no longer in use. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -37,6 +37,9 @@ * * Revisions : * $Log: loaders.h,v $ + * Revision 1.18 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.17 2002/03/16 23:54:06 jongfoster * Adding graceful termination feature, to help look for memory leaks. * If you enable this (which, by design, has to be done by hand diff --git a/miscutil.c b/miscutil.c index a45d19fd..ec4de4fd 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.33 2002/03/07 03:46:53 oes Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -10,7 +10,7 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.33 2002/03/07 03:46:53 oes Exp * but don't really fit in any other file. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,6 +36,9 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.33 2002/03/07 03:46:53 oes Exp * * Revisions : * $Log: miscutil.c,v $ + * Revision 1.34 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.33 2002/03/07 03:46:53 oes * Fixed compiler warnings etc * diff --git a/miscutil.h b/miscutil.h index a8ab606d..4e0b2646 100644 --- a/miscutil.h +++ b/miscutil.h @@ -1,6 +1,6 @@ #ifndef MISCUTIL_H_INCLUDED #define MISCUTIL_H_INCLUDED -#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.18 2002/03/07 03:46:17 oes Exp $" +#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.19 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $ @@ -11,7 +11,7 @@ * really fit in any other file. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -37,6 +37,9 @@ * * Revisions : * $Log: miscutil.h,v $ + * Revision 1.19 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.18 2002/03/07 03:46:17 oes * Fixed compiler warnings * diff --git a/parsers.c b/parsers.c index e61fc204..6129e0e4 100644 --- a/parsers.c +++ b/parsers.c @@ -1,4 +1,4 @@ -const char parsers_rcs[] = "$Id: parsers.c,v 1.51 2002/03/13 00:27:05 jongfoster Exp $"; +const char parsers_rcs[] = "$Id: parsers.c,v 1.52 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.c,v $ @@ -14,7 +14,7 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.51 2002/03/13 00:27:05 jongfoster * and `server_set_cookie'. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -40,6 +40,9 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.51 2002/03/13 00:27:05 jongfoster * * Revisions : * $Log: parsers.c,v $ + * Revision 1.52 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.51 2002/03/13 00:27:05 jongfoster * Killing warnings * diff --git a/parsers.h b/parsers.h index a5b2ac5e..d7e104b9 100644 --- a/parsers.h +++ b/parsers.h @@ -1,6 +1,6 @@ #ifndef PARSERS_H_INCLUDED #define PARSERS_H_INCLUDED -#define PARSERS_H_VERSION "$Id: parsers.h,v 1.23 2002/03/13 00:27:05 jongfoster Exp $" +#define PARSERS_H_VERSION "$Id: parsers.h,v 1.24 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/parsers.h,v $ @@ -17,7 +17,7 @@ * and `server_set_cookie'. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -43,6 +43,9 @@ * * Revisions : * $Log: parsers.h,v $ + * Revision 1.24 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.23 2002/03/13 00:27:05 jongfoster * Killing warnings * diff --git a/privoxy-rh.spec b/privoxy-rh.spec index 7d625581..ba6cc98a 100644 --- a/privoxy-rh.spec +++ b/privoxy-rh.spec @@ -1,7 +1,7 @@ -# $Id: privoxy-rh.spec,v 1.14 2002/03/26 14:25:15 hal9 Exp $ +# $Id: privoxy-rh.spec,v 1.15 2002/03/26 17:39:54 morcego Exp $ # # Written by and Copyright (C) 2001 the SourceForge -# PRIVOXY team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -39,11 +39,11 @@ Version: 2.9.13 Release: 3 Summary: Privoxy - privacy enhancing proxy License: GPL -Vendor: http://ijbswa.sourceforge.net +Vendor: http://www.privoxy.org Source0: http://www.waldherr.org/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root Group: Networking/Utilities -URL: http://ijbswa.sourceforge.net/ +URL: http://www.privoxy.org/ Obsoletes: junkbuster-raw junkbuster-blank junkbuster # Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service Prereq: shadow-utils, chkconfig, initscripts, sh-utils @@ -541,6 +541,10 @@ fi additional "-r @" flag. # $Log: privoxy-rh.spec,v $ +# Revision 1.15 2002/03/26 17:39:54 morcego +# Adding comment on the specfile to remember the packager to update +# the release number on the configure script +# # Revision 1.14 2002/03/26 14:25:15 hal9 # Added edit-actions-for-url-filter to templates in %%config # diff --git a/privoxy-suse.spec b/privoxy-suse.spec index 918a1516..67f4d8eb 100644 --- a/privoxy-suse.spec +++ b/privoxy-suse.spec @@ -1,7 +1,7 @@ -# $Id: privoxy-suse.spec,v 1.4 2002/03/24 12:56:21 swa Exp $ +# $Id: privoxy-suse.spec,v 1.5 2002/03/25 03:10:50 hal9 Exp $ # # Written by and Copyright (C) 2001 the SourceForge -# PRIVOXY team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -30,7 +30,7 @@ %define ijbconf %{_sysconfdir}/privoxy Summary: Privoxy - privacy enhancing proxy -Vendor: http://ijbswa.sourceforge.net +Vendor: http://www.privoxy.org Name: privoxy-suse Distribution: defineme Version: 2.9.13 @@ -41,7 +41,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Packager: Stefan Waldherr Copyright: GPL Group: Networking/Utilities -URL: http://ijbswa.sourceforge.net/ +URL: http://www.privoxy.org/ Provides: privoxy Obsoletes: privoxy Autoreqprov: on @@ -68,7 +68,7 @@ development. Several other developers are now contributing. Authors: -------- - http://ijbswa.sourceforge.net + http://www.privoxy.org/ SuSE series: n @@ -287,6 +287,9 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true - new package: version 2.0 # $Log: privoxy-suse.spec,v $ +# Revision 1.5 2002/03/25 03:10:50 hal9 +# Added faq to docs. +# # Revision 1.4 2002/03/24 12:56:21 swa # name change related issues. # diff --git a/privoxy.1 b/privoxy.1 index a35c8e16..c6e087f3 100644 --- a/privoxy.1 +++ b/privoxy.1 @@ -111,7 +111,7 @@ itself is changed and much more sophisticated. See the user-manual for a brief explanation of all configuration options. .PP The actions list (ad blocks, etc) can also be configured with your -web browser at \fIhttp://ijbswa.sourceforge.net/config\fP. +web browser at \fIhttp://www.privoxy.org/config\fP. \fBPrivoxy's\fP configuration parameters can also be viewed at the same page. In addition, \fBPrivoxy\fP can be toggled on/off. This is an internal page. @@ -264,9 +264,9 @@ Probably. Please see the user-manual for how and where to report bugs. .SH SEE ALSO .br -http://ijbswa.sourceforge.net/config +http://www.privoxy.org/config .br -http://ijbswa.sourceforge.net/ +http://www.privoxy.org/ .br http://sourceforge.net/projects/ijbswa .br diff --git a/privoxy.init b/privoxy.init index 1224f558..a835405c 100644 --- a/privoxy.init +++ b/privoxy.init @@ -7,7 +7,7 @@ # privoxy. # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# PRIVOXY team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,9 @@ # # Revisions : # $Log: privoxy.init,v $ +# Revision 1.5 2002/03/25 06:14:18 morcego +# Removing the OPRG definition (no longer needed) +# # Revision 1.4 2002/03/25 04:16:48 hal9 # Fix proper config file location. # diff --git a/privoxy.init.suse b/privoxy.init.suse index c51c7afc..7bab6def 100644 --- a/privoxy.init.suse +++ b/privoxy.init.suse @@ -7,7 +7,7 @@ # privoxy. # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# PRIVOXY team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,9 @@ # # Revisions : # $Log: privoxy.init.suse,v $ +# Revision 1.2 2002/03/24 11:40:14 swa +# name change +# # Revision 1.1 2002/03/24 11:23:44 swa # name change # diff --git a/privoxy.logrotate b/privoxy.logrotate index 5b3a8c0b..035112a5 100644 --- a/privoxy.logrotate +++ b/privoxy.logrotate @@ -9,7 +9,7 @@ # # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# PRIVOXY team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,9 @@ # # Revisions : # $Log: privoxy.logrotate,v $ +# Revision 1.3 2002/03/24 15:19:57 swa +# name change related issue. +# # Revision 1.2 2002/03/24 11:40:14 swa # name change # diff --git a/privoxy.monthly b/privoxy.monthly index 63a93cec..15734ddf 100644 --- a/privoxy.monthly +++ b/privoxy.monthly @@ -8,7 +8,7 @@ # to the machine. # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# PRIVOXY team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -34,6 +34,9 @@ # # Revisions : # $Log: privoxy.monthly,v $ +# Revision 1.2 2002/03/24 11:40:14 swa +# name change +# # Revision 1.1 2002/03/24 11:23:44 swa # name change # diff --git a/privoxy.weekly b/privoxy.weekly index 43aa209e..81424f8d 100644 --- a/privoxy.weekly +++ b/privoxy.weekly @@ -8,7 +8,7 @@ # to the machine. # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# PRIVOXY team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -34,6 +34,9 @@ # # Revisions : # $Log: privoxy.weekly,v $ +# Revision 1.2 2002/03/24 11:40:14 swa +# name change +# # Revision 1.1 2002/03/24 11:23:44 swa # name change # diff --git a/project.h b/project.h index 4d1bebd0..13a99c42 100644 --- a/project.h +++ b/project.h @@ -1,6 +1,6 @@ #ifndef PROJECT_H_INCLUDED #define PROJECT_H_INCLUDED -#define PROJECT_H_VERSION "$Id: project.h,v 1.59 2002/03/24 15:23:33 jongfoster Exp $" +#define PROJECT_H_VERSION "$Id: project.h,v 1.60 2002/03/24 15:52:17 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/project.h,v $ @@ -10,7 +10,7 @@ * (though it does declare some macros). * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,6 +36,9 @@ * * Revisions : * $Log: project.h,v $ + * Revision 1.60 2002/03/24 15:52:17 jongfoster + * Changing CGI URL prefixes for new name + * * Revision 1.59 2002/03/24 15:23:33 jongfoster * Name changes * diff --git a/ssplit.c b/ssplit.c index 0efdfc6b..ff362568 100644 --- a/ssplit.c +++ b/ssplit.c @@ -1,4 +1,4 @@ -const char ssplit_rcs[] = "$Id: ssplit.c,v 1.4 2001/11/13 00:16:38 jongfoster Exp $"; +const char ssplit_rcs[] = "$Id: ssplit.c,v 1.5 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/ssplit.c,v $ @@ -6,7 +6,7 @@ const char ssplit_rcs[] = "$Id: ssplit.c,v 1.4 2001/11/13 00:16:38 jongfoster Ex * Purpose : A function to split a string at specified deliminters. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -32,6 +32,9 @@ const char ssplit_rcs[] = "$Id: ssplit.c,v 1.4 2001/11/13 00:16:38 jongfoster Ex * * Revisions : * $Log: ssplit.c,v $ + * Revision 1.5 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.4 2001/11/13 00:16:38 jongfoster * Replacing references to malloc.h with the standard stdlib.h * (See ANSI or K&R 2nd Ed) diff --git a/ssplit.h b/ssplit.h index e7af7aae..397dda2a 100644 --- a/ssplit.h +++ b/ssplit.h @@ -1,6 +1,6 @@ #ifndef SSPLIT_H_INCLUDED #define SSPLIT_H_INCLUDED -#define SSPLIT_H_VERSION "$Id: ssplit.h,v 1.3 2001/07/29 18:43:08 jongfoster Exp $" +#define SSPLIT_H_VERSION "$Id: ssplit.h,v 1.4 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/ssplit.h,v $ @@ -8,7 +8,7 @@ * Purpose : A function to split a string at specified deliminters. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -34,6 +34,9 @@ * * Revisions : * $Log: ssplit.h,v $ + * Revision 1.4 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.3 2001/07/29 18:43:08 jongfoster * Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to * ANSI C rules. diff --git a/templates/edit-actions-add-url-form b/templates/edit-actions-add-url-form index db5a8346..d690c865 100644 --- a/templates/edit-actions-add-url-form +++ b/templates/edit-actions-add-url-form @@ -6,7 +6,7 @@ # # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Original Author: Copyright (C) 2001 Jonathan Foster # http://www.jon-foster.co.uk/ @@ -31,6 +31,9 @@ # # Revisions : # $Log: edit-actions-add-url-form,v $ +# Revision 1.9 2002/03/24 15:23:33 jongfoster +# Name changes +# # Revision 1.8 2002/03/24 11:01:06 swa # name change # diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url index db36a0f7..93cc322a 100644 --- a/templates/edit-actions-for-url +++ b/templates/edit-actions-for-url @@ -7,7 +7,7 @@ # # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Original Author: Copyright (C) 2001 Jonathan Foster # http://www.jon-foster.co.uk/ @@ -32,6 +32,9 @@ # # Revisions : # $Log: edit-actions-for-url,v $ +# Revision 1.18 2002/03/24 16:32:08 jongfoster +# Removing logo option +# # Revision 1.17 2002/03/24 15:23:33 jongfoster # Name changes # diff --git a/templates/edit-actions-list b/templates/edit-actions-list index 5da54052..24d62957 100644 --- a/templates/edit-actions-list +++ b/templates/edit-actions-list @@ -6,7 +6,7 @@ # # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Original Author: Copyright (C) 2001 Jonathan Foster # http://www.jon-foster.co.uk/ @@ -31,6 +31,9 @@ # # Revisions : # $Log: edit-actions-list,v $ +# Revision 1.13 2002/03/24 15:23:33 jongfoster +# Name changes +# # Revision 1.12 2002/03/24 11:01:06 swa # name change # diff --git a/templates/edit-actions-list-section b/templates/edit-actions-list-section index 1ac56271..2de8ce24 100644 --- a/templates/edit-actions-list-section +++ b/templates/edit-actions-list-section @@ -6,7 +6,7 @@ # # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Original Author: Copyright (C) 2001 Jonathan Foster # http://www.jon-foster.co.uk/ @@ -31,6 +31,9 @@ # # Revisions : # $Log: edit-actions-list-section,v $ +# Revision 1.6 2002/03/24 11:01:06 swa +# name change +# # Revision 1.5 2002/01/23 00:26:45 jongfoster # Reducing length of URLs # Where encoded and unencoded versions of a string existed, removing diff --git a/templates/edit-actions-list-url b/templates/edit-actions-list-url index 46a3cb40..fcaa7c4d 100644 --- a/templates/edit-actions-list-url +++ b/templates/edit-actions-list-url @@ -6,7 +6,7 @@ # # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Original Author: Copyright (C) 2001 Jonathan Foster # http://www.jon-foster.co.uk/ @@ -31,6 +31,9 @@ # # Revisions : # $Log: edit-actions-list-url,v $ +# Revision 1.6 2002/03/24 11:01:06 swa +# name change +# # Revision 1.5 2002/01/23 00:26:45 jongfoster # Reducing length of URLs # Where encoded and unencoded versions of a string existed, removing diff --git a/templates/edit-actions-remove-url-form b/templates/edit-actions-remove-url-form index 950c25c8..596391e9 100644 --- a/templates/edit-actions-remove-url-form +++ b/templates/edit-actions-remove-url-form @@ -8,7 +8,7 @@ # # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Original Author: Copyright (C) 2001 Jonathan Foster # http://www.jon-foster.co.uk/ @@ -33,6 +33,9 @@ # # Revisions : # $Log: edit-actions-remove-url-form,v $ +# Revision 1.9 2002/03/24 15:23:33 jongfoster +# Name changes +# # Revision 1.8 2002/03/24 11:01:06 swa # name change # diff --git a/templates/edit-actions-url-form b/templates/edit-actions-url-form index c72eaae6..f3766b43 100644 --- a/templates/edit-actions-url-form +++ b/templates/edit-actions-url-form @@ -6,7 +6,7 @@ # # # Copyright : Written by and Copyright (C) 2001 the SourceForge -# Privoxy team. http://ijbswa.sourceforge.net +# Privoxy team. http://www.privoxy.org/ # # Original Author: Copyright (C) 2001 Jonathan Foster # http://www.jon-foster.co.uk/ @@ -31,6 +31,9 @@ # # Revisions : # $Log: edit-actions-url-form,v $ +# Revision 1.9 2002/03/24 15:23:33 jongfoster +# Name changes +# # Revision 1.8 2002/03/24 11:01:06 swa # name change # diff --git a/urlmatch.c b/urlmatch.c index 32ef5610..772261de 100644 --- a/urlmatch.c +++ b/urlmatch.c @@ -1,4 +1,4 @@ -const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.5 2002/03/13 00:27:05 jongfoster Exp $"; +const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.6 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/urlmatch.c,v $ @@ -7,7 +7,7 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.5 2002/03/13 00:27:05 jongfoste * patterns. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,9 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.5 2002/03/13 00:27:05 jongfoste * * Revisions : * $Log: urlmatch.c,v $ + * Revision 1.6 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.5 2002/03/13 00:27:05 jongfoster * Killing warnings * diff --git a/urlmatch.h b/urlmatch.h index b548d548..09fa6396 100644 --- a/urlmatch.h +++ b/urlmatch.h @@ -1,6 +1,6 @@ #ifndef URLMATCH_H_INCLUDED #define URLMATCH_H_INCLUDED -#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.1 2002/01/17 20:53:46 jongfoster Exp $" +#define URLMATCH_H_VERSION "$Id: urlmatch.h,v 1.2 2002/03/24 13:25:43 swa Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/urlmatch.h,v $ @@ -9,7 +9,7 @@ * patterns. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -35,6 +35,9 @@ * * Revisions : * $Log: urlmatch.h,v $ + * Revision 1.2 2002/03/24 13:25:43 swa + * name change related issues + * * Revision 1.1 2002/01/17 20:53:46 jongfoster * Moving all our URL and URL pattern parsing code to the same file - it * was scattered around in filters.c, loaders.c and parsers.c. -- 2.39.2