X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgiedit.c;h=a9e4b0ebfe3eb82cf37a888cb1a8c4758014f89e;hp=750015cf665b0c3354542c61e3302d94998e0c84;hb=dbcfeb9dded9760b3a53fc84e51169110c645250;hpb=5ca53f92bc634c20fed90f338ac41561f87b834c

diff --git a/cgiedit.c b/cgiedit.c
index 750015cf..a9e4b0eb 100644
--- a/cgiedit.c
+++ b/cgiedit.c
@@ -13,7 +13,7 @@
  *                Stick to the short names in this file for consistency.
  *
  * Copyright   :  Written by and Copyright (C) 2001-2014 the
- *                Privoxy team. http://www.privoxy.org/
+ *                Privoxy team. https://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and
@@ -1100,7 +1100,7 @@ jb_err edit_parse_actions_file(struct editable_file * file)
 
    /* alias_list contains the aliases defined in this file.
     * It might be better to use the "file_line.data" fields
-    * in the relavent places instead.
+    * in the relevant places instead.
     */
 
    cur_line = file->lines;
@@ -2750,7 +2750,7 @@ jb_err cgi_edit_actions_for_url(struct client_state *csp,
     * browsers (BR #1570678).
     *
     * The config option split-large-forms works around this browser
-    * bug (HTTP has no URL length limitation) by deviding the action
+    * bug (HTTP has no URL length limitation) by dividing the action
     * list form into multiple smaller ones. It means the URLs are shorter
     * and work in broken browsers as well, but the user can no longer change
     * all actions with one submit.
@@ -2782,6 +2782,9 @@ jb_err cgi_edit_actions_for_url(struct client_state *csp,
 #ifndef FEATURE_EXTERNAL_FILTERS
    if (!err) err = map_block_killer(exports, "external-content-filters");
 #endif
+#ifndef FEATURE_HTTPS_INSPECTION
+   if (!err) err = map_block_killer(exports, "https-inspection");
+#endif
 
    if (err)
    {
@@ -2833,7 +2836,7 @@ jb_err cgi_edit_actions_for_url(struct client_state *csp,
                char number[20];
                struct list_entry *filter_name;
                struct map *line_exports;
-               const int type = filter_group->type;
+               const enum filter_type type = filter_group->type;
                const int multi_action_index = filter_type_info[type].multi_action_index;
 
                assert(type < MAX_FILTER_TYPES);
@@ -3193,8 +3196,8 @@ jb_err cgi_edit_actions_submit(struct client_state *csp,
       return err;
    }
 
-   snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i#l%u",
-            (long) time(NULL), file->identifier, sectionid);
+   snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%u#l%u",
+            (unsigned long) time(NULL), file->identifier, sectionid);
 
    edit_free_file(file);
 
@@ -3314,8 +3317,8 @@ jb_err cgi_edit_actions_url(struct client_state *csp,
       return err;
    }
 
-   snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i#l%u",
-            (long) time(NULL), file->identifier, section_start_line_number);
+   snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%u#l%u",
+            (unsigned long) time(NULL), file->identifier, section_start_line_number);
 
    edit_free_file(file);
 
@@ -3437,8 +3440,8 @@ jb_err cgi_edit_actions_add_url(struct client_state *csp,
       return err;
    }
 
-   snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%i#l%u",
-            (long) time(NULL), file->identifier, sectionid);
+   snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%u#l%u",
+            (unsigned long) time(NULL), file->identifier, sectionid);
 
    edit_free_file(file);
 
@@ -3549,7 +3552,7 @@ jb_err cgi_edit_actions_remove_url(struct client_state *csp,
    }
 
    snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%u#l%u",
-            (long) time(NULL), file->identifier, section_start_line_number);
+            (unsigned long) time(NULL), file->identifier, section_start_line_number);
 
    edit_free_file(file);
 
@@ -3671,7 +3674,7 @@ jb_err cgi_edit_actions_section_remove(struct client_state *csp,
    }
 
    snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%u",
-            (long) time(NULL), file->identifier);
+            (unsigned long) time(NULL), file->identifier);
 
    edit_free_file(file);
 
@@ -3834,7 +3837,7 @@ jb_err cgi_edit_actions_section_add(struct client_state *csp,
    }
 
    snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%u",
-            (long) time(NULL), file->identifier);
+            (unsigned long) time(NULL), file->identifier);
 
    edit_free_file(file);
 
@@ -4023,7 +4026,7 @@ jb_err cgi_edit_actions_section_swap(struct client_state *csp,
    } /* END if (section1 != section2) */
 
    snprintf(target, sizeof(target), CGI_PREFIX "edit-actions-list?foo=%lu&f=%u",
-            (long) time(NULL), file->identifier);
+            (unsigned long) time(NULL), file->identifier);
 
    edit_free_file(file);