X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgi.c;h=03ca2fa8515a0739b4b9e94e95ff5e585d4a1bb5;hp=85baf63551cbe379d23acddcc7aa9401653b52fa;hb=1d3e6f7cff56e9304ae5eaa4f3950fcb4331b821;hpb=2fd9e77391df631c1c0d3cf52466cd3e94df83d5
diff --git a/cgi.c b/cgi.c
index 85baf635..03ca2fa8 100644
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-const char cgi_rcs[] = "$Id: cgi.c,v 1.53 2002/03/24 16:06:00 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.53 2002/03/24 16:06:00 oes Exp $";
*
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
- * Privoxy 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,21 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.53 2002/03/24 16:06:00 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!
*
@@ -345,6 +360,11 @@ const char cgi_rcs[] = "$Id: cgi.c,v 1.53 2002/03/24 16:06:00 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,
@@ -352,7 +372,8 @@ static const struct cgi_dispatcher cgi_dispatchers[] = {
#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!!!" },
+ "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,
@@ -362,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 Privoxy on or off" },
-#ifdef FEATURE_CGI_EDIT_ACTIONS
{ "edit-actions",
cgi_edit_actions,
"Edit the actions list" },
@@ -439,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) */ },
@@ -489,10 +513,10 @@ const char image_blank_data[] =
*/
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.
@@ -768,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);
@@ -1093,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);
}
@@ -1230,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;
@@ -1696,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, "");
}
}