X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=templates%2Fedit-actions-for-url;h=f9f32c682ba4805a76489eca4fb5acd57a0e5a89;hp=9aa4d6767a1bbdb70ce5534487842ad19c2983b5;hb=701f0d2c06084708ab71fe06ded88d4b666dc826;hpb=419734f921ee2b14f90785f4f18529c1730eb1b4

diff --git a/templates/edit-actions-for-url b/templates/edit-actions-for-url
index 9aa4d676..f9f32c68 100644
--- a/templates/edit-actions-for-url
+++ b/templates/edit-actions-for-url
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# File        :  $Source: /cvsroot/ijbswa//current/templates/edit-actions-for-url,v $
+# File        :  $Source: /cvsroot/ijbswa/current/templates/edit-actions-for-url,v $
 #
 # Purpose     :  Template used to edit the actions associated with a
 #                particular section in an actions file.
@@ -32,6 +32,28 @@
 #
 # Revisions   :
 #    $Log: edit-actions-for-url,v $
+#    Revision 1.32  2004/10/05 02:03:19  david__schmidt
+#    Add the ability to check jpeg images for invalid
+#    lengths of comment blocks.  Defensive strategy
+#    against the exploit:
+#    Microsoft Security Bulletin MS04-028
+#       Buffer Overrun in JPEG Processing (GDI+) Could
+#       Allow Code Execution (833987)
+#    Enabled with +inspect-jpegs in actions files.
+#
+#    Revision 1.31  2003/09/22 00:33:01  david__schmidt
+#    Enable sending a custom 'blocked' image.  Shows up as
+#    "image-blocker-custom-file" parameter in config, and
+#    "+set-image-blocker{custom}" in action files.
+#
+#    Revision 1.30  2002/09/05 16:12:02  oes
+#    Synced with stable branch:
+#       Revision 1.29.2.3  2002/08/23 02:22:53  hal9
+#       Fix a perl brain fart with <li> in comments.
+#
+#       Revision 1.29.2.1  2002/08/02 12:51:42  oes
+#       Added top submit button; Consistency with docs: Change default name for action from hide-referer to hide-referrer
+#
 #    Revision 1.29.2.3  2002/08/23 02:22:53  hal9
 #    Fix a perl brain fart with <li> in comments.
 #
@@ -660,6 +682,19 @@ function show_send_wafer_opts(tf)
         <input type="text" name="hide_user_agent_mode" size="40"
         value="@hide-user-agent-param@"></td>
     </tr>
+    <tr class="bg1" align="left" valign="top">
+      <td class="en1" align="center" valign="middle"><input type="radio"
+        name="inspect_jpegs" value="Y" @inspect-jpegs-y@
+        ></td>
+      <td class="dis1" align="center" valign="middle"><input type="radio"
+        name="inspect_jpegs" value="N" @inspect-jpegs-n@
+        ></td>
+      <td class="noc1" align="center" valign="middle"><input type="radio"
+        name="inspect_jpegs" value="X" @inspect-jpegs-x@
+        ></td>
+      <td class="action"><a href="@user-manual@@actions-help-prefix@INSPECT-JPEGS">inspect-jpegs</a></td>
+      <td>Checks jpeg images for malicious content.</td>
+    </tr>
     <tr class="bg1" align="left" valign="top">
       <td class="en1" align="center" valign="middle"><input type="radio"
         name="kill_popups" value="Y" @kill-popups-y@
@@ -797,7 +832,11 @@ function show_send_wafer_opts(tf)
         <input type="radio" name="set_image_blocker_mode" value="blank"
         onclick="set_image_blocker_param_disable(true)"
         id="set_image_blocker_mode_blank" @set-image-blocker-param-blank@><label 
-        for="set_image_blocker_mode_blank">Send a 1x1 transparent GIF</label><br>
+        for="set_image_blocker_mode_blank">Send a 1x1 transparent image</label><br>
+        <input type="radio" name="set_image_blocker_mode" value="custom"
+        onclick="set_image_blocker_param_disable(true)"
+        id="set_image_blocker_mode_custom" @set-image-blocker-param-custom@><label 
+        for="set_image_blocker_mode_custom">Send a custom image</label><br>
         <input type="radio" name="set_image_blocker_mode" value="CUSTOM"
         onclick="set_image_blocker_param_disable(false)"
         id="set_image_blocker_mode_set" @set-image-blocker-param-custom@><label