If show-url-info is called with an URL that Privoxy

would reject as invalid, don't show unresolved forwarding
variables, "final matches" or claim the site's secure.

diff --git a/cgisimple.c b/cgisimple.c
index 1ed27e9..075df85 100644 (file)
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.56 2007/05/21 10:50:35 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.57 2007/06/01 16:53:05 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,12 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.56 2007/05/21 10:50:35 fabian
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
+ *    Revision 1.57  2007/06/01 16:53:05  fabiankeil
+ *    Adjust cgi_show_url_info() to show what forward-override{}
+ *    would do with the requested URL (instead of showing how the
+ *    request for the CGI page would be forwarded if it wasn't a
+ *    CGI request).
+ *
  *    Revision 1.56  2007/05/21 10:50:35  fabiankeil
  *    - Use strlcpy() instead of strcpy().
  *    - Stop treating actions files special. Expect a complete file name
@@ -1479,6 +1485,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
 
          err = map(exports, "matches", 1, "<b>[Invalid URL specified!]</b>" , 1);
          if (!err) err = map(exports, "final", 1, lookup(exports, "default"), 1);
+         if (!err) err = map_block_killer(exports, "valid-url");
 
          free_current_action(action);
          free_http_request(url_to_query);
@@ -1493,7 +1500,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
       }
 
       /*
-       * We have a warning about SSL paths.  Hide it for insecure sites.
+       * We have a warning about SSL paths.  Hide it for unencrypted sites.
        */
       if (!url_to_query->ssl)
       {

diff --git a/templates/show-url-info b/templates/show-url-info
index 3fc9f6f..4f77c0b 100644 (file)
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -1,6 +1,6 @@
 ########################################################################
 #
-# File        :  $Source:$
+# File        :  $Source: /cvsroot/ijbswa/current/templates/show-url-info,v $
 #
 # Purpose     :  Template for Privoxy's show-url-info CGI page.
 #
@@ -27,6 +27,10 @@
 #
 # Revisions   :
 #    $Log: show-url-info,v $
+#    Revision 1.19  2007/02/10 16:55:22  fabiankeil
+#    - Show forwarding settings on the show-url-info page
+#    - Fix some HTML syntax errors.
+#
 #
 #########################################################################
 # USING HTML TEMPLATES:
@@ -156,6 +160,7 @@
 <!-- @if-url-given-start -->
     <tr>
       <td class="box">
+<!-- @if-valid-url-start -->
         <h2>Forwarding settings:</h2>
         <p>
           Requests for <a href="@url@">@url@</a> will be <!--
@@ -199,17 +204,19 @@
           part of the URL.</p>
         <p>&nbsp;</p>
 <!-- if-https-end@ -->
+<!-- if-valid-url-end@ -->
         <h2>Matches for <a href="@url@">@url@</a>:</h2>
         @matches@
       </td>
     </tr>
-
+<!-- @if-valid-url-start -->
     <tr>
       <td class="box">
         <h2>Final results:</h2>
         <p><b>@final@</b></p>
       </td>
     </tr>
+<!-- if-valid-url-end@ -->
 <!-- if-url-given-end@ -->
 
 <!-- @if-privoxy-is-toggled-off-start -->