X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgi.h;h=97f7200e109e781cf4a05c0d67aa187440a9988f;hp=064c8b8949f64f9e8e80bfdd8c2bec6bb304882f;hb=edc688f333d5b347a69a2102708e41ea0aaa3482;hpb=83a36343155a2f17d29ff1c706809bf56382a9ec

diff --git a/cgi.h b/cgi.h
index 064c8b89..97f7200e 100644
--- a/cgi.h
+++ b/cgi.h
@@ -1,6 +1,6 @@
 #ifndef CGI_H_INCLUDED
 #define CGI_H_INCLUDED
-#define CGI_H_VERSION "$Id: cgi.h,v 1.15 2001/09/16 15:02:35 jongfoster Exp $"
+#define CGI_H_VERSION "$Id: cgi.h,v 1.20 2002/03/04 17:53:22 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.h,v $
@@ -38,6 +38,30 @@
  *
  * Revisions   :
  *    $Log: cgi.h,v $
+ *    Revision 1.20  2002/03/04 17:53:22  oes
+ *    Fixed compiled warning
+ *
+ *    Revision 1.19  2002/01/21 00:33:52  jongfoster
+ *    Adding map_block_keep() to save a few bytes in the edit-actions-list HTML.
+ *
+ *    Revision 1.18  2001/11/16 00:46:31  jongfoster
+ *    Fixing compiler warnings
+ *
+ *    Revision 1.17  2001/10/23 21:48:19  jongfoster
+ *    Cleaning up error handling in CGI functions - they now send back
+ *    a HTML error page and should never cause a FATAL error.  (Fixes one
+ *    potential source of "denial of service" attacks).
+ *
+ *    CGI actions file editor that works and is actually useful.
+ *
+ *    Ability to toggle JunkBuster remotely using a CGI call.
+ *
+ *    You can turn off both the above features in the main configuration
+ *    file, e.g. if you are running a multi-user proxy.
+ *
+ *    Revision 1.16  2001/09/16 17:08:54  jongfoster
+ *    Moving simple CGI functions from cgi.c to new file cgisimple.c
+ *
  *    Revision 1.15  2001/09/16 15:02:35  jongfoster
  *    Adding i.j.b/robots.txt.
  *    Inlining add_stats() since it's only ever called from one place.
@@ -109,10 +133,9 @@ extern "C" {
 #endif
 
 /*
- * Dispatch & parameter parsing functions
+ * Main dispatch function
  */
 extern struct http_response *dispatch_cgi(struct client_state *csp);
-extern struct map *parse_cgi_parameters(char *argstring);
 
 /* Not exactly a CGI */
 extern struct http_response * error_response(struct client_state *csp,
@@ -129,28 +152,42 @@ extern struct http_response *finish_http_response(struct http_response *rsp);
 
 extern struct map * default_exports(const struct client_state *csp, const char *caller);
 
-extern void map_block_killer (struct map *exports, const char *name);
-extern void map_conditional  (struct map *exports, const char *name, int choose_first);
-
-extern char *template_load(struct client_state *csp, const char *templatename);
-extern void template_fill(char ** template_ptr, struct map *exports);
-
-extern void get_http_time(int time_offset, char * buf);
+extern jb_err map_block_killer (struct map *exports, const char *name);
+extern jb_err map_block_keep   (struct map *exports, const char *name);
+extern jb_err map_conditional  (struct map *exports, const char *name, int choose_first);
+
+extern jb_err template_load(struct client_state *csp, char ** template_ptr, 
+                            const char *templatename);
+extern jb_err template_fill(char ** template_ptr, const struct map *exports);
+extern jb_err template_fill_for_cgi(struct client_state *csp,
+                                    const char *templatename,
+                                    struct map *exports,
+                                    struct http_response *rsp);
+
+extern void cgi_init_error_messages(void);
+extern struct http_response *cgi_error_memory(void);
+extern jb_err cgi_error_no_template(struct client_state *csp,
+                                    struct http_response *rsp,
+                                    const char *template_name);
+extern jb_err cgi_error_bad_param(struct client_state *csp,
+                                  struct http_response *rsp);
 
 /*
  * Text generators
  */
+extern void get_http_time(int time_offset, char * buf);
 extern char *make_menu(const char *self);
-extern char *dump_map(const struct map *map);
+extern char *dump_map(const struct map *the_map);
 
 /*
- * Some images.
+ * Ad replacement images.
  */
-extern const char image_junkbuster_gif_data[];
-extern const int  image_junkbuster_gif_length;
-extern const char image_blank_gif_data[];
-extern const int  image_blank_gif_length;
-
+extern const char image_logo_data[];
+extern const size_t  image_logo_length;
+extern const char image_pattern_data[];
+extern const size_t  image_pattern_length;
+extern const char image_blank_data[];
+extern const size_t  image_blank_length;
 
 /* Revision control strings from this header and associated .c file */
 extern const char cgi_rcs[];