X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgi.h;h=650794000a7091487b4a6a10aab00ba9855c2b47;hp=56016bbb3233d30048953246d6bdab98e465ceeb;hb=e35f06fcd3ddae77f971db673e9eca97ce9a0a5f;hpb=4d5562a93fbe978ed96fa679ed32f8936682824a

diff --git a/cgi.h b/cgi.h
index 56016bbb..65079400 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.12 2001/09/13 23:31:25 jongfoster Exp $"
+#define CGI_H_VERSION "$Id: cgi.h,v 1.18 2001/11/16 00:46:31 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgi.h,v $
@@ -38,6 +38,39 @@
  *
  * Revisions   :
  *    $Log: cgi.h,v $
+ *    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.
+ *
+ *    Revision 1.14  2001/09/16 11:38:02  jongfoster
+ *    Splitting fill_template() into 2 functions:
+ *    template_load() loads the file
+ *    template_fill() performs the PCRS regexps.
+ *    This is because the CGI edit interface has a "table row"
+ *    template which is used many times in the page - this
+ *    change means it's only loaded from disk once.
+ *
+ *    Revision 1.13  2001/09/16 11:00:10  jongfoster
+ *    New function alloc_http_response, for symmetry with free_http_response
+ *
  *    Revision 1.12  2001/09/13 23:31:25  jongfoster
  *    Moving image data to cgi.c rather than cgi.h.
  *
@@ -94,27 +127,14 @@ 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);
-
-/*
- * CGI functions
- */
-extern int cgi_show_version(struct client_state *csp, struct http_response *rsp,
-                            struct map *parameters);
-extern int cgi_default(struct client_state *csp, struct http_response *rsp,
-                       struct map *parameters);
-extern int cgi_show_status(struct client_state *csp, struct http_response *rsp,
-                           struct map *parameters);
-extern int cgi_show_url_info(struct client_state *csp, struct http_response *rsp,
-                             struct map *parameters);
-extern int cgi_send_banner(struct client_state *csp, struct http_response *rsp,
-   		                  struct map *parameters);
 
 /* Not exactly a CGI */
-extern struct http_response *error_response(struct client_state *csp, const char *template, int err);
+extern struct http_response * error_response(struct client_state *csp,
+                                             const char *templatename,
+                                             int err);
 
 /*
  * CGI support functions
@@ -125,21 +145,34 @@ extern void free_http_response(struct http_response *rsp);
 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 *map, const char *name);
-extern void map_conditional(struct map *exports, const char *name, int choose_first);
-extern char *fill_template(struct client_state *csp, const char *templatename, struct map *exports);
 
+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);
 
-#ifdef FEATURE_STATISTICS
-extern struct map *add_stats(struct map *exports);
-#endif /* def FEATURE_STATISTICS */
-
 /*
  * Some images.
  */