X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=3d184ec86aa24ecc96946df3d8da2d362f64b391;hp=08ec46f0c80199da708a50ba18dcc1d17a93be00;hb=5033abe001885b8f206fcf9d03ebe3b227958357;hpb=cb2756f19168af61ff455f9edfa2a15eea7cd038 diff --git a/cgisimple.c b/cgisimple.c index 08ec46f0..3d184ec8 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.75 2008/04/27 13:52:52 fabiankeil Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.90 2009/03/01 18:43:09 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -36,6 +36,62 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.75 2008/04/27 13:52:52 fabian * * Revisions : * $Log: cgisimple.c,v $ + * 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. + * + * Revision 1.81 2008/05/05 09:54:39 fabiankeil + * In cgi_show_url_info(), make sure ftp URLs are + * declared invalid. Also simplify the code that adds + * "http://" if no protocol has been specified. + * + * Revision 1.80 2008/05/04 16:18:32 fabiankeil + * Provide parse_http_url() with a third parameter to specify + * whether or not URLs without protocol are acceptable. + * + * Revision 1.79 2008/05/04 13:30:56 fabiankeil + * Streamline parse_http_url()'s prototype. + * + * Revision 1.78 2008/05/03 16:50:11 fabiankeil + * Leverage content_filters_enabled() in cgi_show_url_info(). + * + * Revision 1.77 2008/05/02 09:47:48 fabiankeil + * In cgi_show_url_info, pass an initialized http structure + * to parse_http_url() as that will be required soonish and + * assert that https URLs are recognized correctly. + * + * Revision 1.76 2008/04/28 09:13:30 fabiankeil + * In load_file(), remember the error reason and fclose() + * and return later on instead of right away. + * * Revision 1.75 2008/04/27 13:52:52 fabiankeil * Move CGI file loading code into load_file() and * add checks for unexpected errors. @@ -445,6 +501,8 @@ jb_err cgi_default(struct client_state *csp, { struct map *exports; + (void)parameters; + assert(csp); assert(rsp); @@ -761,6 +819,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; @@ -819,6 +880,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; @@ -877,6 +941,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; @@ -924,6 +991,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) @@ -946,6 +1015,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 @@ -1209,7 +1324,7 @@ jb_err cgi_show_status(struct client_state *csp, if (!err) err = string_append(&s, "