X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgi.c;h=03ca2fa8515a0739b4b9e94e95ff5e585d4a1bb5;hp=adb44195e171cdeb0f0b29db96ea5afc47932602;hb=7be747be82b4258a11bf14a9297eaffa15f38a27;hpb=46b21455cec9cc16ffceed066cb6dd177ccac3f1
diff --git a/cgi.c b/cgi.c
index adb44195..03ca2fa8 100644
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-const char cgi_rcs[] = "$Id: cgi.c,v 1.46 2002/03/07 03:48:38 oes Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.58 2002/03/29 03:33:13 david__schmidt Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
@@ -12,7 +12,7 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.46 2002/03/07 03:48:38 oes Exp $";
*
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
- * IJBSWA team. http://ijbswa.sourceforge.net
+ * Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
@@ -38,6 +38,46 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.46 2002/03/07 03:48:38 oes Exp $";
*
* Revisions :
* $Log: cgi.c,v $
+ * Revision 1.58 2002/03/29 03:33:13 david__schmidt
+ * Fix Mac OSX compiler warnings
+ *
+ * Revision 1.57 2002/03/26 22:29:54 swa
+ * we have a new homepage!
+ *
+ * Revision 1.56 2002/03/24 17:50:46 jongfoster
+ * Fixing compile error if actions file editor disabled
+ *
+ * Revision 1.55 2002/03/24 16:55:06 oes
+ * Making GIF checkerboard transparent
+ *
+ * Revision 1.54 2002/03/24 16:18:15 jongfoster
+ * Removing old logo
+ *
+ * Revision 1.53 2002/03/24 16:06:00 oes
+ * Correct transparency for checkerboard PNG. Thanks, Magnus!
+ *
+ * Revision 1.52 2002/03/24 15:23:33 jongfoster
+ * Name changes
+ *
+ * Revision 1.51 2002/03/24 13:25:43 swa
+ * name change related issues
+ *
+ * Revision 1.50 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.49 2002/03/13 00:27:04 jongfoster
+ * Killing warnings
+ *
+ * Revision 1.48 2002/03/08 17:47:07 jongfoster
+ * Adding comments
+ *
+ * Revision 1.47 2002/03/08 16:41:33 oes
+ * Added GIF images again
+ *
* Revision 1.46 2002/03/07 03:48:38 oes
* - Changed built-in images from GIF to PNG
* (with regard to Unisys patent issue)
@@ -320,10 +360,21 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.46 2002/03/07 03:48:38 oes Exp $";
const char cgi_h_rcs[] = CGI_H_VERSION;
+/*
+ * List of CGI functions: name, handler, description
+ * Note: Do NOT use single quotes in the description;
+ * this will break the dynamic "blocked" template!
+ */
static const struct cgi_dispatcher cgi_dispatchers[] = {
{ "",
cgi_default,
- "Junkbuster main page" },
+ "Privoxy main page" },
+#ifdef FEATURE_GRACEFUL_TERMINATION
+ { "die",
+ cgi_die,
+ "Shut down - Do not deploy this build in a production environment, "
+ "this is a one click Denial Of Service attack!!!" },
+#endif
{ "show-status",
cgi_show_status,
"Show information about the current configuration" },
@@ -332,14 +383,14 @@ static const struct cgi_dispatcher cgi_dispatchers[] = {
"Show the source code version numbers" },
{ "show-request",
cgi_show_request,
- "Show the client's request headers." },
+ "Show the request headers." },
{ "show-url-info",
cgi_show_url_info,
"Show which actions apply to a URL and why" },
+#ifdef FEATURE_CGI_EDIT_ACTIONS
{ "toggle",
cgi_toggle,
- "Toggle JunkBuster on or off" },
-#ifdef FEATURE_CGI_EDIT_ACTIONS
+ "Toggle Privoxy on or off" },
{ "edit-actions",
cgi_edit_actions,
"Edit the actions list" },
@@ -409,6 +460,9 @@ static const struct cgi_dispatcher cgi_dispatchers[] = {
{ "send-banner",
cgi_send_banner,
NULL /* Send a built-in image */ },
+ { "send-stylesheet",
+ cgi_send_stylesheet,
+ NULL /* Send templates/cgi-style.css */ },
{ "t",
cgi_transparent_image,
NULL /* Send a transparent image (short name) */ },
@@ -426,22 +480,10 @@ static const struct cgi_dispatcher cgi_dispatchers[] = {
*/
#ifdef FEATURE_NO_GIFS
-const char image_logo_data[] =
- "\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104"
- "\122\000\000\000\104\000\000\000\013\001\003\000\000\000\374"
- "\323\271\110\000\000\000\004\147\101\115\101\000\000\261\217"
- "\013\374\141\005\000\000\000\006\120\114\124\105\310\310\310"
- "\000\000\000\062\100\100\345\000\000\000\001\164\122\116\123"
- "\000\100\346\330\146\000\000\000\001\142\113\107\104\000\210"
- "\005\035\110\000\000\000\126\111\104\101\124\170\332\143\140"
- "\200\003\066\006\146\066\006\006\011\124\326\331\315\146\147"
- "\316\333\174\116\000\262\156\247\347\334\234\071\373\001\220"
- "\065\373\130\316\035\311\331\015\020\326\161\311\337\014\014"
- "\151\147\147\247\345\034\236\331\014\144\335\235\155\236\173"
- "\163\366\154\006\006\233\334\331\162\307\316\363\174\106\330"
- "\300\000\000\002\127\040\324\250\204\044\102\000\000\000\000"
- "\111\105\116\104\256\102\140\202";
+/*
+ * Checkerboard pattern, as a PNG.
+ */
const char image_pattern_data[] =
"\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104"
"\122\000\000\000\004\000\000\000\004\010\002\000\000\000\046"
@@ -451,39 +493,40 @@ const char image_pattern_data[] =
"\304\011\006\234\062\000\125\200\052\251\125\174\360\223\000"
"\000\000\000\111\105\116\104\256\102\140\202";
+/*
+ * 1x1 transparant PNG.
+ */
const char image_blank_data[] =
- "\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104"
- "\122\000\000\000\002\000\000\000\002\010\002\000\000\000\375"
- "\324\232\163\000\000\000\006\142\113\107\104\000\310\000\310"
- "\000\310\052\045\225\037\000\000\000\027\111\104\101\124\170"
- "\332\143\374\377\377\377\311\223\047\031\116\234\070\361\377"
- "\377\177\000\112\335\012\257\162\103\306\335\000\000\000\000"
- "\111\105\116\104\256\102\140\202o";
+ "\211\120\116\107\015\012\032\012\000\000\000\015\111\110\104\122"
+ "\000\000\000\004\000\000\000\004\010\006\000\000\000\251\361\236"
+ "\176\000\000\000\007\164\111\115\105\007\322\003\013\020\073\070"
+ "\013\025\036\203\000\000\000\011\160\110\131\163\000\000\013\022"
+ "\000\000\013\022\001\322\335\176\374\000\000\000\004\147\101\115"
+ "\101\000\000\261\217\013\374\141\005\000\000\000\033\111\104\101"
+ "\124\170\332\143\070\161\342\304\207\377\377\377\347\302\150\006"
+ "\144\016\210\146\040\250\002\000\042\305\065\221\270\027\131\110"
+ "\000\000\000\000\111\105\116\104\256\102\140\202";
#else
-const char image_logo_data[] =
- "GIF89aD\000\013\000\360\000\000\000\000\000\377\377\377!"
- "\371\004\001\000\000\001\000,\000\000\000\000D\000\013\000"
- "\000\002a\214\217\251\313\355\277\000\200G&K\025\316hC\037"
- "\200\234\230Y\2309\235S\230\266\206\372J\253<\3131\253\271"
- "\270\215\342\254\013\203\371\202\264\334P\207\332\020o\266"
- "N\215I\332=\211\312\3513\266:\026AK)\364\370\365aobr\305"
- "\372\003S\275\274k2\354\254z\347?\335\274x\306^9\374\276"
- "\037Q\000\000;";
+/*
+ * Checkerboard pattern, as a GIF.
+ */
const char image_pattern_data[] =
"\107\111\106\070\071\141\004\000\004\000\200\000\000\310\310"
- "\310\377\377\377\041\376\025\111\040\165\163\145\144\040\164"
- "\157\040\142\145\040\141\040\142\141\156\156\145\162\000\054"
- "\000\000\000\000\004\000\004\000\000\002\005\104\174\147\270"
- "\005\000\073";
+ "\310\377\377\377\041\376\016\111\040\167\141\163\040\141\040"
+ "\142\141\156\156\145\162\000\041\371\004\001\012\000\001\000"
+ "\054\000\000\000\000\004\000\004\000\000\002\005\104\174\147"
+ "\270\005\000\073";
+/*
+ * 1x1 transparant GIF.
+ */
const char image_blank_data[] =
"GIF89a\001\000\001\000\200\000\000\377\377\377\000\000"
"\000!\371\004\001\000\000\000\000,\000\000\000\000\001"
"\000\001\000\000\002\002D\001\000;";
#endif
-const size_t image_logo_length = sizeof(image_logo_data) - 1;
const size_t image_pattern_length = sizeof(image_pattern_data) - 1;
const size_t image_blank_length = sizeof(image_blank_data) - 1;
@@ -637,7 +680,8 @@ static struct http_response *dispatch_known_cgi(struct client_state * csp,
csp->ip_addr_str, csp->http->cmd);
/* Find and start the right CGI function*/
- for (d = cgi_dispatchers; FOREVER; d++)
+ d = cgi_dispatchers;
+ for (;;)
{
if ((d->name == NULL) || (strcmp(path_copy, d->name) == 0))
{
@@ -660,6 +704,7 @@ static struct http_response *dispatch_known_cgi(struct client_state * csp,
return cgi_error_memory();
}
}
+ d++;
}
}
@@ -747,6 +792,7 @@ struct http_response *error_response(struct client_state *csp,
if (!err) err = map(exports, "hostport", 1, html_encode(csp->http->hostport), 0);
if (!err) err = map(exports, "path", 1, html_encode(csp->http->path), 0);
if (!err) err = map(exports, "error", 1, html_encode_and_free_original(safe_strerror(sys_err)), 0);
+ if (!err) err = map(exports, "protocol", 1, csp->http->ssl ? "https://" : "http://", 1);
if (!err)
{
err = map(exports, "host-ip", 1, html_encode(csp->http->host_ip_addr_str), 0);
@@ -813,15 +859,15 @@ void cgi_init_error_messages(void)
{
memset(cgi_error_memory_response, '\0', sizeof(*cgi_error_memory_response));
cgi_error_memory_response->head =
- "HTTP/1.0 500 Internal JunkBuster Proxy Error\r\n"
+ "HTTP/1.0 500 Internal Privoxy Error\r\n"
"Content-Type: text/html\r\n"
"\r\n";
cgi_error_memory_response->body =
"\r\n"
- "500 Internal JunkBuster Proxy Error\r\n"
+ "500 Internal Privoxy Error\r\n"
"\r\n"
- "500 Internal JunkBuster Proxy Error
\r\n"
- "JunkBuster ran out of memory while processing your request.
\r\n"
+ "500 Internal Privoxy Error
\r\n"
+ "Privoxy ran out of memory while processing your request.
\r\n"
"Please contact your proxy administrator, or try again later
\r\n"
"\r\n"
"\r\n";
@@ -883,13 +929,13 @@ jb_err cgi_error_no_template(struct client_state *csp,
const char *template_name)
{
static const char status[] =
- "500 Internal JunkBuster Proxy Error";
+ "500 Internal Privoxy Error";
static const char body_prefix[] =
"\r\n"
- "500 Internal JunkBuster Proxy Error\r\n"
+ "500 Internal Privoxy Error\r\n"
"\r\n"
- "500 Internal JunkBuster Proxy Error
\r\n"
- "JunkBuster encountered an error while processing your request:
\r\n"
+ "500 Internal Privoxy Error
\r\n"
+ "Privoxy encountered an error while processing your request:
\r\n"
"Could not load template file ";
static const char body_suffix[] =
"
\r\n"
@@ -897,10 +943,10 @@ jb_err cgi_error_no_template(struct client_state *csp,
"If you are the proxy administrator, please put the required file "
"in the (confdir)/templates directory. The "
"location of the (confdir) directory "
- "is specified in the main JunkBuster config "
- "file. (It's typically the JunkBuster install directory"
+ "is specified in the main Privoxy config "
+ "file. (It's typically the Privoxy install directory"
#ifndef _WIN32
- ", or /etc/junkbuster/"
+ ", or /etc/privoxy/"
#endif /* ndef _WIN32 */
").
\r\n"
"\r\n"
@@ -1072,7 +1118,7 @@ struct http_response *finish_http_response(struct http_response *rsp)
}
if (!err)
{
- sprintf(buf, "Content-Length: %d", rsp->content_length);
+ sprintf(buf, "Content-Length: %d", (int)rsp->content_length);
err = enlist(rsp->headers, buf);
}
@@ -1093,7 +1139,7 @@ struct http_response *finish_http_response(struct http_response *rsp)
{
/*
* Set Expires to about 10 min into the future so it'll get reloaded
- * occasionally, e.g. if IJB gets upgraded.
+ * occasionally, e.g. if Privoxy gets upgraded.
*/
if (!err)
@@ -1209,7 +1255,7 @@ void free_http_response(struct http_response *rsp)
* JB_ERR_FILE if the template file cannot be read
*
*********************************************************************/
-jb_err template_load(struct client_state *csp, char ** template_ptr,
+jb_err template_load(struct client_state *csp, char **template_ptr,
const char *templatename)
{
char *templates_dir_path;
@@ -1675,7 +1721,7 @@ char *make_menu(const char *self)
string_append(&result, d->name);
string_append(&result, "\">");
string_append(&result, d->description);
- string_append(&result, "\n");
+ string_append(&result, "");
}
}