[privoxy-commits] current ChangeLog,1.31,1.32 config,1.44,1.45 default.action.master,1.7,1.8

[<no...@so...>]

Update of /cvsroot/ijbswa/current
In directory sc8-pr-cvs1:/tmp/cvs-serv18717

Modified Files:
	ChangeLog config default.action.master 
Log Message:
Enable sending a custom 'blocked' image.  Shows up as
"image-blocker-custom-file" parameter in config, and
"+set-image-blocker{custom}" in action files.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/ijbswa/current/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ChangeLog	13 Oct 2002 22:01:59 -0000	1.31
+++ ChangeLog	22 Sep 2003 00:33:01 -0000	1.32
@@ -7,6 +7,8 @@
 - Add an INSTALL file, and remove these instructions from README.
 - Add a demoronizer filter, which fixes MS's abuse of std charsets
   (common cases anyway).
+- Add a 'dashboard' to watch activity in real-time - implemented
+  as a GUI in Java
 
 *** Version 3.0  ***
 

Index: config
===================================================================
RCS file: /cvsroot/ijbswa/current/config,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- config	20 Apr 2003 17:37:28 -0000	1.44
+++ config	22 Sep 2003 00:33:01 -0000	1.45
@@ -326,6 +326,37 @@
 #trustfile trust
 
 #
+#  1.8. image-blocker-custom-file
+#  ==============
+#
+#  Specifies:
+#
+#      The custom image to display for blocked images when
+#      +set-image-blocker{custom} is in effect in an action file
+#
+#  Type of value:
+#
+#      File name, relative to confdir; can be a jpeg, png or gif image
+#
+#  Default value:
+#
+#      Unset
+#
+#  Effect if unset:
+#
+#      If a custom image is called for and it is unset, the "pattern"
+#      built-in image will be sent instead.  I.e. it is as if you had
+#      specified "+set-image-blocker{pattern}" instead of
+#      "+set-image-blocker{custom}".
+#
+#  Notes:
+#
+#      If the specified file signature is not found to be jpeg, png
+#      or gif, the the built-in "pattern" image will be sent instead.
+#
+#image-blocker-custom-file my-custom-image.jpg
+
+#
 #  2. LOCAL SET-UP DOCUMENTATION
 #  =============================
 #

Index: default.action.master
===================================================================
RCS file: /cvsroot/ijbswa/current/default.action.master,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- default.action.master	20 Feb 2003 14:00:55 -0000	1.7
+++ default.action.master	22 Sep 2003 00:33:01 -0000	1.8
@@ -285,15 +285,17 @@
 #
 # +set-image-blocker{blank}
 # +set-image-blocker{pattern}
+# +set-image-blocker{custom}
 # +set-image-blocker{<URL>} with <url> being any valid image URL
 #    Decides what to do with URLs that end up tagged with {+block +handle-as-image}.
-#    There are 4 options:
+#    There are 5 options:
 #      * "-set-image-blocker" will send a HTML "blocked" page, usually
 #         resulting in a "broken image" icon.
 #      * "+set-image-blocker{blank}" will send a 1x1 transparent image
 #      * "+set-image-blocker{pattern}" will send a 4x4 grey/white pattern
-#        which is less intrusive than the logo but easier to recognize
-#        than the transparent one.
+#        which is easier to recognize than the transparent one.
+#      * "+set-image-blocker{custom}" will send an image file as specified
+#        in the config file (see image-blocker-custom-file within config).
 #      * "+set-image-blocker{<URL>}" will send a HTTP temporary redirect
 #        to the specified image URL.
 #