X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgisimple.c;h=d210b7aff29d9644377eef26e73fba1345cc8a26;hb=6ad2d9089f50d1124aee5def3a10bccc60f110a8;hp=67d27650ba492018d659406fa6815e606a829dc3;hpb=85075982fad8fb5107a6b2651aeef855ba8bace7;p=privoxy.git

diff --git a/cgisimple.c b/cgisimple.c
index 67d27650..d210b7af 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,16 +1,16 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.16 2002/03/07 03:48:38 oes Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.21 2002/03/24 15:23:33 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
  *
- * Purpose     :  Simple CGIs to get information about JunkBuster's
+ * Purpose     :  Simple CGIs to get information about Privoxy's
  *                status.
  *                
  *                Functions declared include:
  * 
  *
  * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                IJBSWA team.  http://ijbswa.sourceforge.net
+ *                Privoxy team.  http://ijbswa.sourceforge.net
  *
  *                Based on the Internet Junkbuster originally written
  *                by and Copyright (C) 1997 Anonymous Coders and 
@@ -36,6 +36,25 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.16 2002/03/07 03:48:38 oes Ex
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
+ *    Revision 1.21  2002/03/24 15:23:33  jongfoster
+ *    Name changes
+ *
+ *    Revision 1.20  2002/03/24 13:25:43  swa
+ *    name change related issues
+ *
+ *    Revision 1.19  2002/03/16 23:54:06  jongfoster
+ *    Adding graceful termination feature, to help look for memory leaks.
+ *    If you enable this (which, by design, has to be done by hand
+ *    editing config.h) and then go to http://i.j.b/die, then the program
+ *    will exit cleanly after the *next* request.  It should free all the
+ *    memory that was used.
+ *
+ *    Revision 1.18  2002/03/12 01:44:49  oes
+ *    Changed default for "blocked" image from jb logo to checkboard pattern
+ *
+ *    Revision 1.17  2002/03/08 16:43:18  oes
+ *    Added choice beween GIF and PNG built-in images
+ *
  *    Revision 1.16  2002/03/07 03:48:38  oes
  *     - Changed built-in images from GIF to PNG
  *       (with regard to Unisys patent issue)
@@ -239,7 +258,7 @@ jb_err cgi_error_404(struct client_state *csp,
       return JB_ERR_MEMORY;
    }
 
-   rsp->status = strdup("404 JunkBuster configuration page not found");
+   rsp->status = strdup("404 Privoxy configuration page not found");
    if (rsp->status == NULL)
    {
       free_map(exports);
@@ -250,6 +269,48 @@ jb_err cgi_error_404(struct client_state *csp,
 }
 
 
+#ifdef FEATURE_GRACEFUL_TERMINATION
+/*********************************************************************
+ *
+ * Function    :  cgi_die
+ *
+ * Description :  CGI function to shut down Privoxy.
+ *                NOTE: Turning this on in a production build
+ *                would be a BAD idea.  An EXTREMELY BAD idea.
+ *                In short, don't do it.
+ *               
+ * Parameters  :
+ *          1  :  csp = Current client state (buffers, headers, etc...)
+ *          2  :  rsp = http_response data structure for output
+ *          3  :  parameters = map of cgi parameters
+ *
+ * CGI Parameters : none
+ *
+ * Returns     :  JB_ERR_OK on success
+ *                JB_ERR_MEMORY on out-of-memory error.  
+ *
+ *********************************************************************/
+jb_err cgi_die (struct client_state *csp,
+                struct http_response *rsp,
+                const struct map *parameters)
+{
+   assert(csp);
+   assert(rsp);
+   assert(parameters);
+
+   /* quit */
+   g_terminate = 1;
+
+   /*
+    * I don't really care what gets sent back to the browser.
+    * Take the easy option - "out of memory" page.
+    */
+
+   return JB_ERR_MEMORY;
+}
+#endif /* def FEATURE_GRACEFUL_TERMINATION */
+
+
 /*********************************************************************
  *
  * Function    :  cgi_show_request
@@ -343,8 +404,8 @@ jb_err cgi_send_banner(struct client_state *csp,
 
    if (imagetype == 'a') /* auto */
    {
-      /* Default to logo */
-      imagetype = 'l';
+      /* Default to pattern */
+      imagetype = 'p';
 #ifdef FEATURE_IMAGE_BLOCKING
       if ((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0)
       {
@@ -370,16 +431,11 @@ jb_err cgi_send_banner(struct client_state *csp,
       rsp->content_length = image_blank_length;
 
    }
-   else if (imagetype == 'p') /* pattern */
+   else /* pattern */
    {
       rsp->body = bindup(image_pattern_data, image_pattern_length);
       rsp->content_length = image_pattern_length;
    }   
-   else /* logo */
-   {
-      rsp->body = bindup(image_logo_data, image_logo_length);
-      rsp->content_length = image_logo_length;
-   }   
 
    if (rsp->body == NULL)
    {
@@ -444,7 +500,7 @@ jb_err cgi_transparent_image(struct client_state *csp,
  * Function    :  cgi_show_version
  *
  * Description :  CGI function that returns a a web page describing the
- *                file versions of IJB.
+ *                file versions of Privoxy.
  *
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
@@ -487,7 +543,7 @@ jb_err cgi_show_version(struct client_state *csp,
  * Function    :  cgi_show_status
  *
  * Description :  CGI function that returns a a web page describing the
- *                current status of IJB.
+ *                current status of Privoxy.
  *
  * Parameters  :
  *          1  :  csp = Current client state (buffers, headers, etc...)
@@ -707,7 +763,7 @@ jb_err cgi_show_status(struct client_state *csp,
  * Function    :  cgi_show_url_info
  *
  * Description :  CGI function that determines and shows which actions
- *                junkbuster will perform for a given url, and which
+ *                Privoxy will perform for a given url, and which
  *                matches starting from the defaults have lead to that.
  *
  * Parameters  :
@@ -988,7 +1044,7 @@ jb_err cgi_robots_txt(struct client_state *csp,
    jb_err err;
 
    rsp->body = strdup(
-      "# This is the Internet Junkbuster control interface.\n"
+      "# This is the Privoxy control interface.\n"
       "# It isn't very useful to index it, and you're likely to break stuff.\n"
       "# So go away!\n"
       "\n"