want to use these features, you can enable them in
/etc/privoxy/config and do a "/etc/init.d/privoxy restart".
-- A patch was applied to access the local copy of the user manual
- (/usr/share/doc/privoxy/user-manual/*) was applied. With the option
- user-manual /usr/share/doc/privoxy/user-manual
- in /etc/privoxy/config this is activated and the manual can be
- accessed as http://config.privoxy.org/user-manual
-
Roland Rosenfeld <roland@debian.org>
-$Id: README.Debian,v 1.2 2003/04/26 12:45:33 roland Exp $
+$Id$
-privoxy (3.0.2-5) unstable; urgency=low
-
- * Merge corrections from upstream default.action 1.7.
- - demoronizer filter (which caused trouble on non latin1 charsets) is
- now switched off by default (Closes: #202234).
-
- -- Roland Rosenfeld <roland@debian.org> Tue, 9 Sep 2003 21:31:51 +0200
-
-privoxy (3.0.2-4) unstable; urgency=low
-
- * Add a versioned build dependency on htmldoc (>= 1.8.20), because there
- seem to be some options mission in the old 1.8.17 (Closes: #192457).
- * Merge rotation of logfile and jarfile in logrotate script.
- * Test whether /var/run/privoxy.pid is existing and don't bother when no
- privoxy is running in logrotate script (Closes: #191838).
- * Remove /var/run/privoxy.pid on privoxy stop in init.d script.
- * Mention apt-get instead of dpkg in user-manual (Closes: #189239).
- * Remove trailing whitespace from text versions of user-manual,
- developer-manual and faq (Closes: #192566).
-
- -- Roland Rosenfeld <roland@debian.org> Fri, 9 May 2003 08:21:30 +0200
-
-privoxy (3.0.2-3) unstable; urgency=low
-
- * Stop filtering favicon.ico, which may cause trouble (Closes: #188947).
- * Send SIGHUP to privoxy instead of touching /etc/provoxy/config in
- logrotate script to tell privoxy that the logfiles were rotated
- (Closes: #189240).
- * Remove trailing spaces from config file (Closes: #189240).
- * Install man page as privoxy(8) instead of privoxy(1), because this is
- a system binary.
- * Build HTML, text, and PDF versions of the documentation from source.
- * Fix setting of dodk in configure.in.
- * Add option "--linkcolor #0000ff" to htmldoc call in ldp_print to be
- independent of ~/.htmldocrc color setting.
- * Mention PDF and text version of the documentation in doc-base files.
- * Install PDF version of the documentation, too.
- * Install HTML version of the man page, too.
-
- -- Roland Rosenfeld <roland@debian.org> Mon, 21 Apr 2003 11:11:31 +0200
-
-privoxy (3.0.2-2) unstable; urgency=low
-
- * Don't apply any filters to {bugs|lists}.debian.org (Closes: #186537).
- * Prepend "http://config.privoxy.org" before "/user-manual/" to always
- get a correct URL for the local user-manual (also on 404 error pages).
- (Closes SF-719724).
-
- -- Roland Rosenfeld <roland@debian.org> Sun, 13 Apr 2003 12:49:15 +0200
-
privoxy (3.0.2-1) unstable; urgency=low
* New upstream version 3.0.2.
Section: web
Priority: optional
Maintainer: Roland Rosenfeld <roland@debian.org>
-Build-Depends: debhelper (>= 4.0.0), autoconf, libpcre3-dev, jade, docbook-dsssl, w3m, sp, sgmlspl, groff, htmldoc (>= 1.8.20)
+Build-Depends: debhelper (>= 4.0.0), autoconf, libpcre3-dev
Standards-Version: 3.5.9
Package: privoxy
Format: HTML
Index: /usr/share/doc/privoxy/developer-manual/index.html
Files: /usr/share/doc/privoxy/developer-manual/*.html
-
-Format: text
-Files: /usr/share/doc/privoxy/developer-manual.txt.gz
-
-Format: pdf
-Files: /usr/share/doc/privoxy/privoxy-developer-manual.pdf
Format: HTML
Index: /usr/share/doc/privoxy/faq/index.html
Files: /usr/share/doc/privoxy/faq/*.html
-
-Format: text
-Files: /usr/share/doc/privoxy/faq.txt.gz
-
-Format: pdf
-Files: /usr/share/doc/privoxy/privoxy-faq.pdf
Format: HTML
Index: /usr/share/doc/privoxy/user-manual/index.html
Files: /usr/share/doc/privoxy/user-manual/*.html
-
-Format: text
-Files: /usr/share/doc/privoxy/user-manual.txt.gz
-
-Format: pdf
-Files: /usr/share/doc/privoxy/privoxy-user-manual.pdf
doc/webserver/developer-manual
doc/webserver/images
doc/webserver/p_doc.css
-doc/webserver/privoxy-index.html
-doc/webserver/man-page
-doc/pdf/privoxy-developer-manual.pdf
-doc/pdf/privoxy-user-manual.pdf
-doc/pdf/privoxy-faq.pdf
echo -n "Stopping $DESC: "
start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
--exec $DAEMON
- rm -f $PIDFILE
echo "$NAME."
;;
#reload)
-/var/log/privoxy/logfile /var/log/privoxy/jarfile {
+/var/log/privoxy/logfile {
create 0640 privoxy adm
missingok
weekly
rotate 7
compress
- sharedscripts
postrotate
- if [ -f /var/run/privoxy.pid ]
- then
- kill -HUP `cat /var/run/privoxy.pid` > /dev/null
- fi
+ touch /etc/privoxy/config
+ endscript
+}
+
+/var/log/privoxy/jarfile {
+ create 0640 privoxy adm
+ missingok
+ weekly
+ rotate 7
+ compress
+ postrotate
+ touch /etc/privoxy/config
endscript
}
env CFLAGS="$(OPTIMIZE) -g" \
./configure --prefix=/usr --sysconfdir=/etc \
--mandir=/usr/share/man $(WITHDEBUG) \
- --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
+ --with-docbook=no
touch configure-stamp
build-stamp: configure-stamp
dh_testdir
-# backup formatted upstream documentation:
- for x in source text webserver pdf; do \
- if [ ! -d doc/$$x.dist ]; then \
- cp -a doc/$$x doc/$$x.dist; \
- fi; \
- done
- for x in INSTALL README AUTHORS privoxy.1; do \
- if [ ! -f $$x.dist ]; then \
- cp -a $$x $$x.dist; \
- fi; \
- done
-
$(MAKE)
- $(MAKE) dok-pdf
- $(MAKE) dok
-
-# remove trailing whitespaces:
- for x in developer-manual user-manual faq; do \
- sed -e 's/[ ]*$$//' < doc/text/$$x.txt > doc/text/$$x.nws;\
- mv -f doc/text/$$x.nws doc/text/$$x.txt; \
- done
touch build-stamp
-$(MAKE) clean
-$(MAKE) distclean
- rm -f privoxy privoxy.8
+ rm -f privoxy
rm -f configure config.h GNUmakefile
-
- rm -rf obj
- rm -f ActivityConsole.jar
- rm -f src/java/org/privoxy/activityconsole/*.class
-
-# restore formatted upstream documentation:
- for x in source text webserver pdf; do \
- if [ -d doc/$$x.dist ]; then \
- rm -rf doc/$$x; \
- mv doc/$$x.dist doc/$$x; \
- fi; \
- done
- for x in INSTALL README AUTHORS privoxy.1; do \
- if [ -f $$x.dist ]; then \
- rm -f $$x; \
- mv $$x.dist $$x; \
- fi; \
- done
-
rm -f doc/source/ldp.dsl
dh_clean
sed -e 's/^\(\(trust\|proxy\)-info-url\|admin-address\)/#\1/' \
-e 's/^\(enable-\(edit-actions\|remote-toggle\)\)[ ]*1/\1 0/' \
- -e 's#^confdir .*#confdir /etc/privoxy#' \
- -e 's#^logdir .*#logdir /var/log/privoxy#' \
+ -e 's#^confdir \.#confdir /etc/privoxy#' \
+ -e 's#^logdir \.#logdir /var/log/privoxy#' \
-e 's%^#\(user-manual\).*%\1 /usr/share/doc/privoxy/user-manual%' \
-e 's/\(Sample Configuration File for Privoxy\).*/\1/' \
-e 's/Id: config,v.*/Id: config,v $$/' \
- -e 's/ *$$//' \
< config > $(DEBDIR)/etc/privoxy/config
install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
install -m 0644 standard.action $(DEBDIR)/etc/privoxy/standard.action
install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter
install -m 0644 trust $(DEBDIR)/etc/privoxy/trust
- sed -e 's/"1"/"8"/' < privoxy.1 > privoxy.8
-
cp -r templates $(DEBDIR)/etc/privoxy/
rm -f $(DEBDIR)/etc/privoxy/templates/*~
rm -rf $(DEBDIR)/etc/privoxy/templates/CVS
dh_testroot
# dh_installdebconf
dh_installdocs -XCVS
- (cd $(DEBDIR)/usr/share/doc/privoxy/; \
- mv privoxy-index.html index.html)
dh_installexamples
dh_installmenu
dh_installlogrotate
dh_installchangelogs ChangeLog
dh_link
dh_strip
- dh_compress -Xpdf
+ dh_compress
dh_fixperms
# dh_makeshlibs
dh_installdeb
+++ /dev/null
-<?php
-// File : $Source: /cvsroot/ijbswa/current/doc/webserver/submit/confirmad.php,v $
-//
-// Purpose : Confirms ad submission.
-// This file belongs in
-// ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
-//
-// $Id: confirmad.php,v 1.1 2002/03/29 09:38:52 swa Exp $
-//
-// Written by and Copyright (C) 2001 the SourceForge
-// Privoxy team. http://www.privoxy.org/
-//
-// Based on the Internet Junkbuster originally written
-// by and Copyright (C) 1997 Anonymous Coders and
-// Junkbusters Corporation. http://www.junkbusters.com
-//
-// This program 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.
-//
-// The GNU General Public License should be included with
-// this file. If not, you can view it at
-// http://www.gnu.org/copyleft/gpl.html
-// or write to the Free Software Foundation, Inc., 59
-// Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//
-$headers = getallheaders();
-?>
-<html>
- <head>
- <title>Privoxy|Confirm ad submission</title>
- <link rel="stylesheet" type="text/css" href="../p_web.css">
-</head>
-
-<h1>Privoxy Feedback</h1>
-
-<h2>Confirm Ad Submission</h2>
-
-<p>We have detemined that ...</p>
-
-</body>
-</html>
-
-<!--
- $Log: confirmad.php,v $
- Revision 1.1 2002/03/29 09:38:52 swa
- 2nd page
-
--->
\ No newline at end of file
+++ /dev/null
-<?php
-// File : $Source: /cvsroot/ijbswa/current/doc/webserver/submit/index.php,v $
-//
-// Purpose : Submit form for ads and such
-// This file belongs in
-// ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
-//
-// $Id: index.php,v 1.4 2002/03/29 09:55:21 swa Exp $
-//
-// Written by and Copyright (C) 2001 the SourceForge
-// Privoxy team. http://www.privoxy.org/
-//
-// Based on the Internet Junkbuster originally written
-// by and Copyright (C) 1997 Anonymous Coders and
-// Junkbusters Corporation. http://www.junkbusters.com
-//
-// This program 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.
-//
-// The GNU General Public License should be included with
-// this file. If not, you can view it at
-// http://www.gnu.org/copyleft/gpl.html
-// or write to the Free Software Foundation, Inc., 59
-// Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//
-$headers = getallheaders();
-?>
-<html>
- <head>
- <title>Privoxy|Submit</title>
- <link rel="stylesheet" type="text/css" href="../p_web.css">
-</head>
-
-<h1>Privoxy Feedback</h1>
-
-<p>Compared to <a
-href="http://sourceforge.net/tracker/?group_id=11118&atid=111118">bug
-reports</a> or <a
-href="http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse">feature
-requests</a>, this page is intended to optimize the blocking behavior
-of Privoxy. Therefor we need your feedback.</p><p> If you have
-observed and advertisement, that was not blocked or an image that was
-incorrectly blocked, please use the forms below to report this.</p>
-
-<h2>New Advertisement</h2>
-
-<!-- testing mail sending
-// <?
-//$ret_val=mail("stefan@waldherr.org", "Subject", "Message"); echo $ret_val;
-?>
--->
-
-
-<?
-$cfile = "counter-data.inc";
-$localip = "127.0.0.1";
-$serverip = "127.0.0.1";
-# Enter information on the next line, but only after you read
-# the "c-readme.txt" file.
-$browser_id = "";
-if (file_exists ($cfile)) {
- $fp = fopen ($cfile,"r+");
- $data = fgets ($fp,25);
- $ip = chop (substr($data,0,15));
- $count = substr($data,15);
-# Unremark the second "if" statement and remark the first one if
-# your site is on a hosted server and you have a dynamic IP, but
-# only after you read "c-readme.txt" file.
- if ($REMOTE_ADDR == $localip or $REMOTE_ADDR == $serverip)
-# if ($REMOTE_ADDR == substr_count($HTTP_USER_AGENT,$browser_id) > 0)
- $np = $ip;
- else
- $np = $REMOTE_ADDR;
- if ($np != $ip)
- $count += 1;
- rewind ($fp);
- fputs ($fp,substr($np." ",0,15).$count);
- fclose ($fp);
- echo $count;
-}
-else {
- $fp = fopen($cfile,"w");
- $np = $REMOTE_ADDR;
- $count = "1";
- fputs ($fp,substr($np." ",0,15).$count);
- fclose ($fp);
- echo $count;
-}
-?>
-
-
-<p>
-<form action="http://privox.org/submit/confirmad.php" method="post">
-<table border="0" cellpadding="0" cellspacing="4">
-
-<tr>
-<td align="right">Your name:</td>
-<td>
-<input name="submit_name" value="anonymous" type="text" size="30" maxlength="30">
-</td>
-<td>optional</td>
-</tr>
-
-<tr>
-<td align="right">Your email address:</td>
-<td>
-<input name="submit_email" value="anonymous" type="text" size="30" maxlength="30">
-</td>
-<td>optional</td>
-</tr>
-
-<tr>
-<td align="right">Website, where I observed an ad:</td>
-<td>
-<input name="submit_url" value="prefilled" type="text" size="45" maxlength="255">
-</td>
-<td>Please change, if necessary</td>
-</tr>
-
-<tr>
-<td align="right">How annoying is the ad:</td>
-<td>
-<select name="submit_annoy" size="1">
-<option value="A0">Nice, not to have</option>
-<option selected value="A1">Should be removed</option>
-<option value="A2">Must be removed</option>
-</select>
-</td>
-<td>Please select one</td>
-</tr>
-
-<tr>
-<td align="right">Privoxy Version:</td>
-<td>
-<input name="submit_pversion" value="prefilled" readonly type="text" size="30" maxlength="30">
-</td>
-<td>Automatically determined</td>
-</tr>
-
-<tr>
-<td align="right">Action File:</td>
-<td>
-<input name="submit_actionfile" value="prefilled" readonly type="text" size="30" maxlength="30">
-</td>
-<td>Automatically determined</td>
-</tr>
-
-<tr>
-<td align="right">Action File Version:</td>
-<td>
-<input name="submit_actionversion" value="prefilled" readonly type="text" size="30" maxlength="30">
-</td>
-<td>Automatically determined</td>
-</tr>
-
-<tr>
-<td align="right">Remarks:</td>
-<td>
-<textarea name="submit_remarks" cols="35" rows="3">
-None.
-</textarea>
-</td>
-<td>Please change, if necessary</td>
-</tr>
-
-<tr>
-<td align="right"></td>
-<td>
-<input type="hidden" name="submit_targeturl" value="/submit/confirmad.php">
-<input type=submit value="Submit">
-</td>
-<td></td>
-</tr>
-
-</table>
-</form>
-</p>
-
-<h2>Incorrect blocking</h2>
-<p>We soon present a form where you can submit websites, where the
-default action file was too agressive.</p>
-
-<h2>Misc</h2>
-<p>Bla bla bla</p>
-
-</body>
-</html>
-
-<!--
- $Log: index.php,v $
- Revision 1.4 2002/03/29 09:55:21 swa
- .
-
- Revision 1.3 2002/03/29 09:39:48 swa
- added form
-
--->
\ No newline at end of file
-const char filters_rcs[] = "$Id: filters.c,v 1.58.2.5 2003/11/11 13:10:31 oes Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.58.2.4 2003/02/28 12:52:45 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/Attic/filters.c,v $
*
* Revisions :
* $Log: filters.c,v $
- * Revision 1.58.2.5 2003/11/11 13:10:31 oes
- * Fixed bug #839859: "See why" link URL now gets url-encoded.
- *
* Revision 1.58.2.4 2003/02/28 12:52:45 oes
* Fixed a typo
*
*********************************************************************/
struct http_response *block_url(struct client_state *csp)
{
+#ifdef FEATURE_IMAGE_BLOCKING
+ char *p;
+#endif /* def FEATURE_IMAGE_BLOCKING */
struct http_response *rsp;
/*
if (((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0)
&& is_imageurl(csp))
{
- char *p;
/* determine HOW images should be blocked */
p = csp->action->string[ACTION_STRING_IMAGE_BLOCKER];
{
jb_err err;
struct map * exports;
- char *p;
/*
* Workaround for stupid Netscape bug which prevents
projects / privoxy.git / commitdiff