X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=585be2b6eca6dabd2f2d7c77691e8a36d2f43003;hp=7c969074c93e354189145826759ad8e758bdf48f;hb=cf89cd7ace9007341dc8835f4b9c818dfb831666;hpb=c9e5eaf24e57bd3dc0945252af2e4fa45e50ba0e
diff --git a/cgisimple.c b/cgisimple.c
index 7c969074..585be2b6 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.82 2008/05/10 20:01:47 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.91 2009/03/08 14:19:23 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,38 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.82 2008/05/10 20:01:47 fabian
*
* Revisions :
* $Log: cgisimple.c,v $
+ * Revision 1.91 2009/03/08 14:19:23 fabiankeil
+ * Fix justified (but harmless) compiler warnings
+ * on platforms where sizeof(int) < sizeof(long).
+ *
+ * Revision 1.90 2009/03/01 18:43:09 fabiankeil
+ * Fix cparser warnings.
+ *
+ * Revision 1.89 2008/10/11 11:31:14 fabiankeil
+ * Add FEATURE_CONNECTION_KEEP_ALIVE to the list
+ * of conditional defines on the show-status page.
+ *
+ * Revision 1.88 2008/08/30 12:03:07 fabiankeil
+ * Remove FEATURE_COOKIE_JAR.
+ *
+ * Revision 1.87 2008/08/29 15:59:22 fabiankeil
+ * Fix two comments.
+ *
+ * Revision 1.86 2008/06/28 14:19:05 fabiankeil
+ * Protocol detection is done case-insensitive, fix assertion
+ * to do the same. Yay for Privoxy-Regression-Test and zzuf.
+ *
+ * Revision 1.85 2008/05/26 17:30:55 fabiankeil
+ * Provide an OpenSearch Description to access the
+ * show-url-info page through "search engine plugins".
+ *
+ * Revision 1.84 2008/05/26 16:16:55 fabiankeil
+ * Spell error correctly.
+ *
+ * Revision 1.83 2008/05/12 14:51:30 fabiankeil
+ * Don't complain about an invalid URL if show-url-info is requested
+ * without parameters. Regression introduced in 1.81 by yours truly.
+ *
* Revision 1.82 2008/05/10 20:01:47 fabiankeil
* Fix an assertion that could erroneously
* trigger in case of memory shortage.
@@ -473,6 +505,8 @@ jb_err cgi_default(struct client_state *csp,
{
struct map *exports;
+ (void)parameters;
+
assert(csp);
assert(rsp);
@@ -789,6 +823,9 @@ jb_err cgi_transparent_image(struct client_state *csp,
struct http_response *rsp,
const struct map *parameters)
{
+ (void)csp;
+ (void)parameters;
+
rsp->body = bindup(image_blank_data, image_blank_length);
rsp->content_length = image_blank_length;
@@ -847,6 +884,9 @@ jb_err cgi_send_default_favicon(struct client_state *csp,
"\017\000\000";
static const size_t favicon_length = sizeof(default_favicon_data) - 1;
+ (void)csp;
+ (void)parameters;
+
rsp->body = bindup(default_favicon_data, favicon_length);
rsp->content_length = favicon_length;
@@ -905,6 +945,9 @@ jb_err cgi_send_error_favicon(struct client_state *csp,
"\017\000\000";
static const size_t favicon_length = sizeof(error_favicon_data) - 1;
+ (void)csp;
+ (void)parameters;
+
rsp->body = bindup(error_favicon_data, favicon_length);
rsp->content_length = favicon_length;
@@ -952,6 +995,8 @@ jb_err cgi_send_stylesheet(struct client_state *csp,
assert(csp);
assert(rsp);
+ (void)parameters;
+
err = template_load(csp, &rsp->body, "cgi-style.css", 0);
if (err == JB_ERR_FILE)
@@ -974,6 +1019,52 @@ jb_err cgi_send_stylesheet(struct client_state *csp,
return JB_ERR_OK;
}
+
+
+/*********************************************************************
+ *
+ * Function : cgi_send_url_info_osd
+ *
+ * Description : CGI function that sends the OpenSearch Description
+ * template for the show-url-info page. It allows to
+ * access the page through "search engine plugins".
+ *
+ * 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_send_url_info_osd(struct client_state *csp,
+ struct http_response *rsp,
+ const struct map *parameters)
+{
+ jb_err err = JB_ERR_MEMORY;
+ struct map *exports = default_exports(csp, NULL);
+
+ (void)csp;
+ (void)parameters;
+
+ if (NULL != exports)
+ {
+ err = template_fill_for_cgi(csp, "url-info-osd.xml", exports, rsp);
+ if (JB_ERR_OK == err)
+ {
+ err = enlist(rsp->headers,
+ "Content-Type: application/opensearchdescription+xml");
+ }
+ }
+
+ return err;
+
+}
+
+
/*********************************************************************
*
* Function : cgi_send_user_manual
@@ -1237,7 +1328,7 @@ jb_err cgi_show_status(struct client_state *csp,
if (!err) err = string_append(&s, "| ");
if (!err) err = string_join(&s, html_encode(csp->actions_list[i]->filename));
snprintf(buf, sizeof(buf),
- " | View", i);
+ " | View", i);
if (!err) err = string_append(&s, buf);
#ifdef FEATURE_CGI_EDIT_ACTIONS
@@ -1249,7 +1340,7 @@ jb_err cgi_show_status(struct client_state *csp,
if (access(csp->config->actions_file[i], W_OK) == 0)
{
#endif /* def HAVE_ACCESS */
- snprintf(buf, sizeof(buf), " Edit", i);
+ snprintf(buf, sizeof(buf), " Edit", i);
if (!err) err = string_append(&s, buf);
#ifdef HAVE_ACCESS
}
@@ -1284,8 +1375,8 @@ jb_err cgi_show_status(struct client_state *csp,
{
if (!err) err = string_append(&s, " |
| ");
if (!err) err = string_join(&s, html_encode(csp->rlist[i]->filename));
- snprintf(buf, 100,
- " | View", i);
+ snprintf(buf, sizeof(buf),
+ " | View", i);
if (!err) err = string_append(&s, buf);
if (!err) err = string_append(&s, " |
\n");
}
@@ -1484,7 +1575,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
memset(url_to_query, '\0', sizeof(url_to_query));
err = parse_http_url(url_param, url_to_query, REQUIRE_PROTOCOL);
- assert((err != JB_ERR_OK) || (url_to_query->ssl == !strncmp(url_param, "https://", 8)));
+ assert((err != JB_ERR_OK) || (url_to_query->ssl == !strncmpic(url_param, "https://", 8)));
free(url_param);
@@ -1762,6 +1853,9 @@ jb_err cgi_robots_txt(struct client_state *csp,
char buf[100];
jb_err err;
+ (void)csp;
+ (void)parameters;
+
rsp->body = strdup(
"# This is the Privoxy control interface.\n"
"# It isn't very useful to index it, and you're likely to break stuff.\n"
@@ -1812,15 +1906,15 @@ static jb_err show_defines(struct map *exports)
#ifdef FEATURE_CGI_EDIT_ACTIONS
if (!err) err = map_conditional(exports, "FEATURE_CGI_EDIT_ACTIONS", 1);
-#else /* ifndef FEATURE_COOKIE_JAR */
+#else /* ifndef FEATURE_CGI_EDIT_ACTIONS */
if (!err) err = map_conditional(exports, "FEATURE_CGI_EDIT_ACTIONS", 0);
-#endif /* ndef FEATURE_COOKIE_JAR */
+#endif /* ndef FEATURE_CGI_EDIT_ACTIONS */
-#ifdef FEATURE_COOKIE_JAR
- if (!err) err = map_conditional(exports, "FEATURE_COOKIE_JAR", 1);
-#else /* ifndef FEATURE_COOKIE_JAR */
- if (!err) err = map_conditional(exports, "FEATURE_COOKIE_JAR", 0);
-#endif /* ndef FEATURE_COOKIE_JAR */
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ if (!err) err = map_conditional(exports, "FEATURE_CONNECTION_KEEP_ALIVE", 1);
+#else /* ifndef FEATURE_CGI_EDIT_ACTIONS */
+ if (!err) err = map_conditional(exports, "FEATURE_CONNECTION_KEEP_ALIVE", 0);
+#endif /* ndef FEATURE_CONNECTION_KEEP_ALIVE */
#ifdef FEATURE_FAST_REDIRECTS
if (!err) err = map_conditional(exports, "FEATURE_FAST_REDIRECTS", 1);
@@ -1854,6 +1948,12 @@ static jb_err show_defines(struct map *exports)
if (!err) err = map_conditional(exports, "FEATURE_IMAGE_DETECT_MSIE", 0);
#endif /* ndef FEATURE_IMAGE_DETECT_MSIE */
+#ifdef HAVE_RFC2553
+ if (!err) err = map_conditional(exports, "FEATURE_IPV6_SUPPORT", 1);
+#else /* ifndef HAVE_RFC2553 */
+ if (!err) err = map_conditional(exports, "FEATURE_IPV6_SUPPORT", 0);
+#endif /* ndef HAVE_RFC2553 */
+
#ifdef FEATURE_NO_GIFS
if (!err) err = map_conditional(exports, "FEATURE_NO_GIFS", 1);
#else /* ifndef FEATURE_NO_GIFS */
@@ -2138,7 +2238,7 @@ static jb_err cgi_show_file(struct client_state *csp,
static jb_err load_file(const char *filename, char **buffer, size_t *length)
{
FILE *fp;
- int ret;
+ long ret;
jb_err err = JB_ERR_OK;
fp = fopen(filename, "rb");
@@ -2151,7 +2251,7 @@ static jb_err load_file(const char *filename, char **buffer, size_t *length)
if (fseek(fp, 0, SEEK_END))
{
log_error(LOG_LEVEL_FATAL,
- "Unexpected erro while fseek()ing to the end of %s: %E",
+ "Unexpected error while fseek()ing to the end of %s: %E",
filename);
}
ret = ftell(fp);