X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=373cb978c326893e96c706c7339aa7c2316dd447;hp=6b329c6ca5c03213e0f6a8e879c66caa0554c5a1;hb=b372098f33a0ba88171370233a9a63556e3cde1a;hpb=e10fec52a4eeda120e0f145a540d54a3a240c17f

diff --git a/cgisimple.c b/cgisimple.c
index 6b329c6c..373cb978 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.63 2008/02/01 06:04:31 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.68 2008/03/27 18:27:21 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -9,7 +9,7 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.63 2008/02/01 06:04:31 fabian
  *                Functions declared include:
  * 
  *
- * Copyright   :  Written by and Copyright (C) 2001-2007 the SourceForge
+ * Copyright   :  Written by and Copyright (C) 2001-2008 the SourceForge
  *                Privoxy team. http://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
@@ -36,6 +36,23 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.63 2008/02/01 06:04:31 fabian
  *
  * Revisions   :
  *    $Log: cgisimple.c,v $
+ *    Revision 1.68  2008/03/27 18:27:21  fabiankeil
+ *    Remove kill-popups action.
+ *
+ *    Revision 1.67  2008/03/27 17:00:05  fabiankeil
+ *    Turn the favicon blobs into locals.
+ *
+ *    Revision 1.66  2008/02/23 16:57:12  fabiankeil
+ *    Rename url_actions() to get_url_actions() and let it
+ *    use the standard parameter ordering.
+ *
+ *    Revision 1.65  2008/02/23 16:33:43  fabiankeil
+ *    Let forward_url() use the standard parameter ordering
+ *    and mark its second parameter immutable.
+ *
+ *    Revision 1.64  2008/02/03 13:56:07  fabiankeil
+ *    Add SOCKS5 support for show-url-info CGI page.
+ *
  *    Revision 1.63  2008/02/01 06:04:31  fabiankeil
  *    If edit buttons on the show-url-info CGI page are hidden, explain why.
  *
@@ -373,42 +390,6 @@ const char cgisimple_h_rcs[] = CGISIMPLE_H_VERSION;
 static char *show_rcs(void);
 static jb_err show_defines(struct map *exports);
 
-/*
- * 16x16 ico blobs for favicon delivery functions.
- */
-const char default_favicon_data[] =
-   "\000\000\001\000\001\000\020\020\002\000\000\000\000\000\260"
-   "\000\000\000\026\000\000\000\050\000\000\000\020\000\000\000"
-   "\040\000\000\000\001\000\001\000\000\000\000\000\100\000\000"
-   "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000"
-   "\000\000\377\377\377\000\377\000\052\000\017\360\000\000\077"
-   "\374\000\000\161\376\000\000\161\376\000\000\361\377\000\000"
-   "\361\377\000\000\360\017\000\000\360\007\000\000\361\307\000"
-   "\000\361\307\000\000\361\307\000\000\360\007\000\000\160\036"
-   "\000\000\177\376\000\000\077\374\000\000\017\360\000\000\360"
-   "\017\000\000\300\003\000\000\200\001\000\000\200\001\000\000"
-   "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
-   "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
-   "\000\000\200\001\000\000\200\001\000\000\300\003\000\000\360"
-   "\017\000\000";
-const char error_favicon_data[] =
-   "\000\000\001\000\001\000\020\020\002\000\000\000\000\000\260"
-   "\000\000\000\026\000\000\000\050\000\000\000\020\000\000\000"
-   "\040\000\000\000\001\000\001\000\000\000\000\000\100\000\000"
-   "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000"
-   "\000\000\377\377\377\000\000\000\377\000\017\360\000\000\077"
-   "\374\000\000\161\376\000\000\161\376\000\000\361\377\000\000"
-   "\361\377\000\000\360\017\000\000\360\007\000\000\361\307\000"
-   "\000\361\307\000\000\361\307\000\000\360\007\000\000\160\036"
-   "\000\000\177\376\000\000\077\374\000\000\017\360\000\000\360"
-   "\017\000\000\300\003\000\000\200\001\000\000\200\001\000\000"
-   "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
-   "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
-   "\000\000\200\001\000\000\200\001\000\000\300\003\000\000\360"
-   "\017\000\000";
-const size_t default_favicon_length  = sizeof(default_favicon_data) - 1;
-const size_t error_favicon_length  = sizeof(error_favicon_data) - 1;
-
 /*********************************************************************
  *
  * Function    :  cgi_default
@@ -791,8 +772,25 @@ jb_err cgi_send_default_favicon(struct client_state *csp,
                                 struct http_response *rsp,
                                 const struct map *parameters)
 {
-   rsp->body = bindup(default_favicon_data, default_favicon_length);
-   rsp->content_length = default_favicon_length;
+   static const char default_favicon_data[] =
+      "\000\000\001\000\001\000\020\020\002\000\000\000\000\000\260"
+      "\000\000\000\026\000\000\000\050\000\000\000\020\000\000\000"
+      "\040\000\000\000\001\000\001\000\000\000\000\000\100\000\000"
+      "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000"
+      "\000\000\377\377\377\000\377\000\052\000\017\360\000\000\077"
+      "\374\000\000\161\376\000\000\161\376\000\000\361\377\000\000"
+      "\361\377\000\000\360\017\000\000\360\007\000\000\361\307\000"
+      "\000\361\307\000\000\361\307\000\000\360\007\000\000\160\036"
+      "\000\000\177\376\000\000\077\374\000\000\017\360\000\000\360"
+      "\017\000\000\300\003\000\000\200\001\000\000\200\001\000\000"
+      "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
+      "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
+      "\000\000\200\001\000\000\200\001\000\000\300\003\000\000\360"
+      "\017\000\000";
+   static const size_t favicon_length = sizeof(default_favicon_data) - 1;
+
+   rsp->body = bindup(default_favicon_data, favicon_length);
+   rsp->content_length = favicon_length;
 
    if (rsp->body == NULL)
    {
@@ -832,8 +830,25 @@ jb_err cgi_send_error_favicon(struct client_state *csp,
                               struct http_response *rsp,
                               const struct map *parameters)
 {
-   rsp->body = bindup(error_favicon_data, error_favicon_length);
-   rsp->content_length = error_favicon_length;
+   static const char error_favicon_data[] =
+      "\000\000\001\000\001\000\020\020\002\000\000\000\000\000\260"
+      "\000\000\000\026\000\000\000\050\000\000\000\020\000\000\000"
+      "\040\000\000\000\001\000\001\000\000\000\000\000\100\000\000"
+      "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000"
+      "\000\000\377\377\377\000\000\000\377\000\017\360\000\000\077"
+      "\374\000\000\161\376\000\000\161\376\000\000\361\377\000\000"
+      "\361\377\000\000\360\017\000\000\360\007\000\000\361\307\000"
+      "\000\361\307\000\000\361\307\000\000\360\007\000\000\160\036"
+      "\000\000\177\376\000\000\077\374\000\000\017\360\000\000\360"
+      "\017\000\000\300\003\000\000\200\001\000\000\200\001\000\000"
+      "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
+      "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
+      "\000\000\200\001\000\000\200\001\000\000\300\003\000\000\360"
+      "\017\000\000";
+   static const size_t favicon_length = sizeof(error_favicon_data) - 1;
+
+   rsp->body = bindup(error_favicon_data, favicon_length);
+   rsp->content_length = favicon_length;
 
    if (rsp->body == NULL)
    {
@@ -1633,7 +1648,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
        * but luckily it's no longer required later on anyway.
        */
       free_current_action(csp->action);
-      url_actions(url_to_query, csp);
+      get_url_actions(csp, url_to_query);
 
       /*
        * Fill in forwarding settings.
@@ -1649,7 +1664,7 @@ jb_err cgi_show_url_info(struct client_state *csp,
        * display the proxy port and an eventual second forwarder.
        */
       {
-         const struct forward_spec * fwd = forward_url(url_to_query, csp);
+         const struct forward_spec *fwd = forward_url(csp, url_to_query);
 
          if ((fwd->gateway_host == NULL) && (fwd->forward_host == NULL))
          {
@@ -1783,7 +1798,7 @@ jb_err cgi_robots_txt(struct client_state *csp,
 
    rsp->is_static = 1;
 
-   get_http_time(7 * 24 * 60 * 60, buf); /* 7 days into future */
+   get_http_time(7 * 24 * 60 * 60, buf, sizeof(buf)); /* 7 days into future */
    if (!err) err = enlist_unique_header(rsp->headers, "Expires", buf);
 
    return (err ? JB_ERR_MEMORY : JB_ERR_OK);
@@ -1858,12 +1873,6 @@ 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 FEATURE_KILL_POPUPS
-   if (!err) err = map_conditional(exports, "FEATURE_KILL_POPUPS", 1);
-#else /* ifndef FEATURE_KILL_POPUPS */
-   if (!err) err = map_conditional(exports, "FEATURE_KILL_POPUPS", 0);
-#endif /* ndef FEATURE_KILL_POPUPS */
-
 #ifdef FEATURE_NO_GIFS
    if (!err) err = map_conditional(exports, "FEATURE_NO_GIFS", 1);
 #else /* ifndef FEATURE_NO_GIFS */
@@ -1976,10 +1985,6 @@ static char *show_rcs(void)
    SHOW_RCS(jbsockets_rcs)
    SHOW_RCS(jcc_h_rcs)
    SHOW_RCS(jcc_rcs)
-#ifdef FEATURE_KILL_POPUPS
-   SHOW_RCS(killpopup_h_rcs)
-   SHOW_RCS(killpopup_rcs)
-#endif /* def FEATURE_KILL_POPUPS */
    SHOW_RCS(list_h_rcs)
    SHOW_RCS(list_rcs)
    SHOW_RCS(loadcfg_h_rcs)