Rename HTML block name 'https' to 'https-and-no-https-inspection'

The block is only relevant when compiled without FEATURE_HTTPS_INSPECTION.

Sponsored by: Robert Klemme

diff --git a/cgisimple.c b/cgisimple.c
index 148f061..f962fdf 100644 (file)
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1445,7 +1445,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
       if (!url_to_query->ssl)
 #endif
       {
       if (!url_to_query->ssl)
 #endif
       {

-         if (map_block_killer(exports, "https"))
+         if (map_block_killer(exports, "https-and-no-https-inspection"))

          {
             free_current_action(action);
             free_map(exports);
          {
             free_current_action(action);
             free_map(exports);

diff --git a/templates/show-url-info b/templates/show-url-info
index bb2dc91..0514a4a 100644 (file)
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -190,11 +190,11 @@
     </tr>
     <tr>
       <td class="box">
     </tr>
     <tr>
       <td class="box">

-<!-- @if-https-start -->
+<!-- @if-https-and-no-https-inspection-start -->

         <h2>NOTE:</h2>
         <p>This is a HTTPS URL, so the part after the "/" is ignored
           as Privoxy doesn't see the path for real HTTPS requests either.</p>
         <h2>NOTE:</h2>
         <p>This is a HTTPS URL, so the part after the "/" is ignored
           as Privoxy doesn't see the path for real HTTPS requests either.</p>

-<!-- if-https-end@ -->
+<!-- if-https-and-no-https-inspection-end@ -->

 <!-- if-valid-url-end@ -->
         <h2>Matches for <a href="@url@">@url@</a>:</h2>
         @matches@
 <!-- if-valid-url-end@ -->
         <h2>Matches for <a href="@url@">@url@</a>:</h2>
         @matches@